- removal of PHP code

11 files changed, 2 insertions, 785 deletions

diff --git a/tests/composer.json b/tests/composer.json
index 24702c37..d4f32be5 100644
--- a/tests/composer.json
+++ b/tests/composer.json
@@ -2,7 +2,8 @@
   "minimum-stability": "beta",
   "require": {
     "nyholm/psr7": "^1.3",
-    "spiral/goridge": "^3.0@beta"
+    "spiral/roadrunner": "^2.0",
+    "spiral/roadrunner-http": "^2.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/tests/src/Environment.php b/tests/src/Environment.php
deleted file mode 100644
index 9b306063..00000000
--- a/tests/src/Environment.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * High-performance PHP process supervisor and load balancer written in Go.
- *
- * @author Wolfy-J
- */
-
-declare(strict_types=1);
-
-namespace Spiral\RoadRunner;
-
-use Spiral\RoadRunner\Exception\EnvironmentException;
-
-class Environment implements EnvironmentInterface
-{
-    /** @var array */
-    private array $env;
-
-    /**
-     * @param array $env
-     */
-    public function __construct(array $env)
-    {
-        $this->env = $env;
-    }
-
-    /**
-     * Returns worker mode assigned to the PHP process.
-     *
-     * @return string
-     * @throws EnvironmentException
-     */
-    public function getMode(): string
-    {
-        return $this->getValue('RR_MODE');
-    }
-
-    /**
-     * Address worker should be connected to (or pipes).
-     *
-     * @return string
-     * @throws EnvironmentException
-     */
-    public function getRelayAddress(): string
-    {
-        return $this->getValue('RR_RELAY');
-    }
-
-    /**
-     * RPC address.
-     *
-     * @return string
-     * @throws EnvironmentException
-     */
-    public function getRPCAddress(): string
-    {
-        return $this->getValue('RR_RPC');
-    }
-
-    /**
-     * @param string $name
-     * @return string
-     * @throws EnvironmentException
-     */
-    private function getValue(string $name): string
-    {
-        if (!isset($this->env[$name])) {
-            throw new EnvironmentException(sprintf("Missing environment value `%s`", $name));
-        }
-
-        return (string) $this->env[$name];
-    }
-
-    /**
-     * @return EnvironmentInterface
-     */
-    public static function fromGlobals(): EnvironmentInterface
-    {
-        return new static(array_merge($_SERVER, $_ENV));
-    }
-}
diff --git a/tests/src/EnvironmentInterface.php b/tests/src/EnvironmentInterface.php
deleted file mode 100644
index bc0ae043..00000000
--- a/tests/src/EnvironmentInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * High-performance PHP process supervisor and load balancer written in Go.
- *
- * @author Wolfy-J
- */
-
-declare(strict_types=1);
-
-namespace Spiral\RoadRunner;
-
-use Spiral\RoadRunner\Exception\EnvironmentException;
-
-/**
- * Provides base values to configure roadrunner worker.
- */
-interface EnvironmentInterface
-{
-    /**
-     * Returns worker mode assigned to the PHP process.
-     *
-     * @return string
-     * @throws EnvironmentException
-     */
-    public function getMode(): string;
-
-    /**
-     * Address worker should be connected to (or pipes).
-     *
-     * @return string
-     * @throws EnvironmentException
-     */
-    public function getRelayAddress(): string;
-
-    /**
-     * RPC address.
-     *
-     * @return string
-     * @throws EnvironmentException
-     */
-    public function getRPCAddress(): string;
-}
diff --git a/tests/src/Exception/EnvironmentException.php b/tests/src/Exception/EnvironmentException.php
deleted file mode 100644
index 227507c5..00000000
--- a/tests/src/Exception/EnvironmentException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * High-performance PHP process supervisor and load balancer written in Go.
- *
- * @author Wolfy-J
- */
-
-declare(strict_types=1);
-
-namespace Spiral\RoadRunner\Exception;
-
-class EnvironmentException extends RoadRunnerException
-{
-
-}
diff --git a/tests/src/Exception/RoadRunnerException.php b/tests/src/Exception/RoadRunnerException.php
deleted file mode 100644
index 2329370c..00000000
--- a/tests/src/Exception/RoadRunnerException.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * High-performance PHP process supervisor and load balancer written in Go.
- *
- * @author Wolfy-J
- */
-
-declare(strict_types=1);
-
-namespace Spiral\RoadRunner\Exception;
-
-class RoadRunnerException extends \RuntimeException
-{
-}
diff --git a/tests/src/Http/HttpWorker.php b/tests/src/Http/HttpWorker.php
deleted file mode 100644
index ba045d87..00000000
--- a/tests/src/Http/HttpWorker.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/**
- * High-performance PHP process supervisor and load balancer written in Go
- *
- * @author Alex Bond
- */
-declare(strict_types=1);
-
-namespace Spiral\RoadRunner\Http;
-
-use Spiral\RoadRunner\WorkerInterface;
-
-class HttpWorker
-{
-    /** @var WorkerInterface */
-    private WorkerInterface $worker;
-
-    /**
-     * @param WorkerInterface $worker
-     */
-    public function __construct(WorkerInterface $worker)
-    {
-        $this->worker = $worker;
-    }
-
-    /**
-     * @return WorkerInterface
-     */
-    public function getWorker(): WorkerInterface
-    {
-        return $this->worker;
-    }
-
-    /**
-     * Wait for incoming http request.
-     *
-     * @return Request|null
-     */
-    public function waitRequest(): ?Request
-    {
-        $payload = $this->getWorker()->waitPayload();
-        if (empty($payload->body) && empty($payload->header)) {
-            // termination request
-            return null;
-        }
-
-        $request = new Request();
-        $request->body = $payload->body;
-
-        $context = json_decode($payload->header, true);
-        if ($context === null) {
-            // invalid context
-            return null;
-        }
-
-        $this->hydrateRequest($request, $context);
-
-        return $request;
-    }
-
-    /**
-     * Send response to the application server.
-     *
-     * @param int        $status  Http status code
-     * @param string     $body    Body of response
-     * @param string[][] $headers An associative array of the message's headers. Each
-     *                            key MUST be a header name, and each value MUST be an array of strings
-     *                            for that header.
-     */
-    public function respond(int $status, string $body, array $headers = []): void
-    {
-        if ($headers === []) {
-            // this is required to represent empty header set as map and not as array
-            $headers = new \stdClass();
-        }
-
-        $this->getWorker()->send(
-            $body,
-            (string) json_encode(['status' => $status, 'headers' => $headers])
-        );
-    }
-
-    /**
-     * @param Request $request
-     * @param array   $context
-     */
-    private function hydrateRequest(Request $request, array $context): void
-    {
-        $request->remoteAddr = $context['remoteAddr'];
-        $request->protocol = $context['protocol'];
-        $request->method = $context['method'];
-        $request->uri = $context['uri'];
-        $request->attributes = $context['attributes'] ?? [];
-        $request->headers = $context['headers'];
-        $request->cookies = $context['cookies'] ?? [];
-        $request->uploads = $context['uploads'] ?? [];
-
-        $request->query = [];
-        parse_str($context['rawQuery'], $request->query);
-
-        // indicates that body was parsed
-        $request->parsed = $context['parsed'];
-    }
-}
diff --git a/tests/src/Http/PSR7Worker.php b/tests/src/Http/PSR7Worker.php
deleted file mode 100644
index f16c4847..00000000
--- a/tests/src/Http/PSR7Worker.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-/**
- * High-performance PHP process supervisor and load balancer written in Go
- *
- * @author Wolfy-J
- */
-declare(strict_types=1);
-
-namespace Spiral\RoadRunner\Http;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestFactoryInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\StreamFactoryInterface;
-use Psr\Http\Message\UploadedFileFactoryInterface;
-use Psr\Http\Message\UploadedFileInterface;
-use Spiral\RoadRunner\WorkerInterface;
-
-/**
- * Manages PSR-7 request and response.
- */
-class PSR7Worker
-{
-    private HttpWorker                    $httpWorker;
-    private ServerRequestFactoryInterface $requestFactory;
-    private StreamFactoryInterface        $streamFactory;
-    private UploadedFileFactoryInterface  $uploadsFactory;
-
-    /** @var mixed[] */
-    private array $originalServer = [];
-
-    /** @var string[] Valid values for HTTP protocol version */
-    private static array $allowedVersions = ['1.0', '1.1', '2',];
-
-    /**
-     * @param WorkerInterface               $worker
-     * @param ServerRequestFactoryInterface $requestFactory
-     * @param StreamFactoryInterface        $streamFactory
-     * @param UploadedFileFactoryInterface  $uploadsFactory
-     */
-    public function __construct(
-        WorkerInterface $worker,
-        ServerRequestFactoryInterface $requestFactory,
-        StreamFactoryInterface $streamFactory,
-        UploadedFileFactoryInterface $uploadsFactory
-    ) {
-        $this->httpWorker = new HttpWorker($worker);
-        $this->requestFactory = $requestFactory;
-        $this->streamFactory = $streamFactory;
-        $this->uploadsFactory = $uploadsFactory;
-        $this->originalServer = $_SERVER;
-    }
-
-    /**
-     * @return WorkerInterface
-     */
-    public function getWorker(): WorkerInterface
-    {
-        return $this->httpWorker->getWorker();
-    }
-
-    /**
-     * @return ServerRequestInterface|null
-     */
-    public function waitRequest(): ?ServerRequestInterface
-    {
-        $httpRequest = $this->httpWorker->waitRequest();
-        if ($httpRequest === null) {
-            return null;
-        }
-
-        $_SERVER = $this->configureServer($httpRequest);
-
-        return $this->mapRequest($httpRequest, $_SERVER);
-    }
-
-    /**
-     * Send response to the application server.
-     *
-     * @param ResponseInterface $response
-     */
-    public function respond(ResponseInterface $response): void
-    {
-        $this->httpWorker->respond(
-            $response->getStatusCode(),
-            $response->getBody()->__toString(),
-            $response->getHeaders()
-        );
-    }
-
-    /**
-     * Returns altered copy of _SERVER variable. Sets ip-address,
-     * request-time and other values.
-     *
-     * @param Request $request
-     * @return mixed[]
-     */
-    protected function configureServer(Request $request): array
-    {
-        $server = $this->originalServer;
-
-        $server['REQUEST_URI'] = $request->uri;
-        $server['REQUEST_TIME'] = time();
-        $server['REQUEST_TIME_FLOAT'] = microtime(true);
-        $server['REMOTE_ADDR'] = $request->getRemoteAddr();
-        $server['REQUEST_METHOD'] = $request->method;
-
-        $server['HTTP_USER_AGENT'] = '';
-        foreach ($request->headers as $key => $value) {
-            $key = strtoupper(str_replace('-', '_', $key));
-            if (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
-                $server[$key] = implode(', ', $value);
-            } else {
-                $server['HTTP_' . $key] = implode(', ', $value);
-            }
-        }
-
-        return $server;
-    }
-
-    /**
-     * @param Request $httpRequest
-     * @param array   $server
-     * @return ServerRequestInterface
-     */
-    protected function mapRequest(Request $httpRequest, array $server): ServerRequestInterface
-    {
-        $request = $this->requestFactory->createServerRequest(
-            $httpRequest->method,
-            $httpRequest->uri,
-            $_SERVER
-        );
-
-
-        $request = $request
-            ->withProtocolVersion(static::fetchProtocolVersion($httpRequest->protocol))
-            ->withCookieParams($httpRequest->cookies)
-            ->withQueryParams($httpRequest->query)
-            ->withUploadedFiles($this->wrapUploads($httpRequest->uploads));
-
-        foreach ($httpRequest->attributes as $name => $value) {
-            $request = $request->withAttribute($name, $value);
-        }
-
-        foreach ($httpRequest->headers as $name => $value) {
-            $request = $request->withHeader($name, $value);
-        }
-
-        if ($httpRequest->parsed) {
-            return $request->withParsedBody($httpRequest->getParsedBody());
-        }
-
-        if ($httpRequest->body !== null) {
-            return $request->withBody($this->streamFactory->createStream($httpRequest->body));
-        }
-
-        return $request;
-    }
-
-    /**
-     * Wraps all uploaded files with UploadedFile.
-     *
-     * @param array[] $files
-     * @return UploadedFileInterface[]|mixed[]
-     */
-    protected function wrapUploads(array $files): array
-    {
-        $result = [];
-        foreach ($files as $index => $f) {
-            if (!isset($f['name'])) {
-                $result[$index] = $this->wrapUploads($f);
-                continue;
-            }
-
-            if (UPLOAD_ERR_OK === $f['error']) {
-                $stream = $this->streamFactory->createStreamFromFile($f['tmpName']);
-            } else {
-                $stream = $this->streamFactory->createStream();
-            }
-
-            $result[$index] = $this->uploadsFactory->createUploadedFile(
-                $stream,
-                $f['size'],
-                $f['error'],
-                $f['name'],
-                $f['mime']
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * Normalize HTTP protocol version to valid values
-     *
-     * @param string $version
-     * @return string
-     */
-    private static function fetchProtocolVersion(string $version): string
-    {
-        $v = substr($version, 5);
-
-        if ($v === '2.0') {
-            return '2';
-        }
-
-        // Fallback for values outside of valid protocol versions
-        if (!in_array($v, static::$allowedVersions, true)) {
-            return '1.1';
-        }
-
-        return $v;
-    }
-}
diff --git a/tests/src/Http/Request.php b/tests/src/Http/Request.php
deleted file mode 100644
index ef67e28d..00000000
--- a/tests/src/Http/Request.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
-declare(strict_types=1);
-
-namespace Spiral\RoadRunner\Http;
-
-final class Request
-{
-
-    public string   $remoteAddr;
-    public string   $protocol;
-    public string   $method;
-    public string   $uri;
-    public array    $headers;
-    public array    $cookies;
-    public array    $uploads;
-    public array    $attributes;
-    public array    $query;
-    public ?string  $body;
-    public bool     $parsed;
-
-    /**
-     * @return string
-     */
-    public function getRemoteAddr(): string
-    {
-        return $this->attributes['ipAddress'] ?? $this->remoteAddr ?? '127.0.0.1';
-    }
-
-    /**
-     * @return array|null
-     */
-    public function getParsedBody(): ?array
-    {
-        if ($this->parsed) {
-            return json_decode($this->body, true);
-        }
-
-        return null;
-    }
-}
diff --git a/tests/src/Payload.php b/tests/src/Payload.php
deleted file mode 100644
index c9b8c198..00000000
--- a/tests/src/Payload.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * High-performance PHP process supervisor and load balancer written in Go.
- *
- * @author Wolfy-J
- */
-
-declare(strict_types=1);
-
-namespace Spiral\RoadRunner;
-
-/**
- * Class Payload
- *
- * @package Spiral\RoadRunner
- */
-final class Payload
-{
-    /**
-     * Execution payload (binary).
-     *
-     * @var string|null
-     */
-    public ?string $body;
-
-    /**
-     * Execution context (binary).
-     *
-     * @var string|null
-     */
-    public ?string $header;
-
-    /**
-     * @param string|null $body
-     * @param string|null $header
-     */
-    public function __construct(?string $body, ?string $header = null)
-    {
-        $this->body = $body;
-        $this->header = $header;
-    }
-}
diff --git a/tests/src/Worker.php b/tests/src/Worker.php
deleted file mode 100644
index 53cf6cef..00000000
--- a/tests/src/Worker.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * High-performance PHP process supervisor and load balancer written in Go.
- *
- * @author Wolfy-J
- */
-
-declare(strict_types=1);
-
-namespace Spiral\RoadRunner;
-
-use Spiral\Goridge\Exception\GoridgeException;
-use Spiral\Goridge\Frame;
-use Spiral\Goridge\RelayInterface as Relay;
-use Spiral\RoadRunner\Exception\EnvironmentException;
-use Spiral\RoadRunner\Exception\RoadRunnerException;
-
-/**
- * Accepts connection from RoadRunner server over given Goridge relay.
- *
- * $worker = Worker::create();
- * while ($p = $worker->waitPayload()) {
- *      $worker->send(new Payload("DONE", json_encode($context)));
- * }
- */
-class Worker implements WorkerInterface
-{
-    // Request graceful worker termination.
-    private const STOP_REQUEST = '{"stop":true}';
-
-    private Relay $relay;
-
-    /**
-     * @param Relay $relay
-     */
-    public function __construct(Relay $relay)
-    {
-        $this->relay = $relay;
-    }
-
-    /**
-     * Wait for incoming payload from the server. Must return null when worker stopped.
-     *
-     * @return Payload|null
-     * @throws GoridgeException
-     * @throws RoadRunnerException
-     */
-    public function waitPayload(): ?Payload
-    {
-        $frame = $this->relay->waitFrame();
-
-        if ($frame->hasFlag(Frame::CONTROL)) {
-            $continue = $this->handleControl($frame->payload);
-
-            if ($continue) {
-                return $this->waitPayload();
-            } else {
-                return null;
-            }
-        }
-
-        return new Payload(
-            substr($frame->payload, $frame->options[0]),
-            substr($frame->payload, 0, $frame->options[0])
-        );
-    }
-
-    /**
-     * Respond to the server with the processing result.
-     *
-     * @param Payload $payload
-     * @throws GoridgeException
-     */
-    public function respond(Payload $payload): void
-    {
-        $this->send($payload->body, $payload->header);
-    }
-
-    /**
-     * Respond to the server with an error. Error must be treated as TaskError and might not cause
-     * worker destruction.
-     *
-     * Example:
-     *
-     * $worker->error("invalid payload");
-     *
-     * @param string $message
-     */
-    public function error(string $message): void
-    {
-        $this->relay->send(new Frame($message, [], Frame::ERROR));
-    }
-
-    /**
-     * Terminate the process. Server must automatically pass task to the next available process.
-     * Worker will receive StopCommand context after calling this method.
-     *
-     * Attention, you MUST use continue; after invoking this method to let rr to properly
-     * stop worker.
-     *
-     * @throws GoridgeException
-     */
-    public function stop(): void
-    {
-        $this->send("", self::STOP_REQUEST);
-    }
-
-    /**
-     * @param string      $body
-     * @param string|null $context
-     * @throws GoridgeException
-     */
-    public function send(string $body, string $context = null): void
-    {
-        $this->relay->send(new Frame(
-            (string) $context . $body,
-            [strlen((string) $context)]
-        ));
-    }
-
-    /**
-     * Return true if continue.
-     *
-     * @param string $header
-     * @return bool
-     *
-     * @throws RoadRunnerException
-     */
-    private function handleControl(string $header): bool
-    {
-        $command = json_decode($header, true);
-        if ($command === false) {
-            throw new RoadRunnerException('Invalid task header, JSON payload is expected');
-        }
-
-        switch (true) {
-            case !empty($command['pid']):
-                $this->relay->send(new Frame(sprintf('{"pid":%s}', getmypid()), [], Frame::CONTROL));
-                return true;
-
-            case !empty($command['stop']):
-                return false;
-
-            default:
-                throw new RoadRunnerException('Invalid task header, undefined control package');
-        }
-    }
-
-    /**
-     * Create Worker using global environment configuration.
-     *
-     * @return WorkerInterface
-     * @throws EnvironmentException
-     */
-    public static function create(): WorkerInterface
-    {
-        $env = Environment::fromGlobals();
-
-        return new static(\Spiral\Goridge\Relay::create($env->getRelayAddress()));
-    }
-}
diff --git a/tests/src/WorkerInterface.php b/tests/src/WorkerInterface.php
deleted file mode 100644
index bf0b6e06..00000000
--- a/tests/src/WorkerInterface.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * High-performance PHP process supervisor and load balancer written in Go.
- *
- * @author Wolfy-J
- */
-
-declare(strict_types=1);
-
-namespace Spiral\RoadRunner;
-
-use Spiral\Goridge\Exception\GoridgeException;
-use Spiral\RoadRunner\Exception\RoadRunnerException;
-
-interface WorkerInterface
-{
-    /**
-     * Wait for incoming payload from the server. Must return null when worker stopped.
-     *
-     * @return Payload|null
-     * @throws GoridgeException
-     * @throws RoadRunnerException
-     */
-    public function waitPayload(): ?Payload;
-
-    /**
-     * Respond to the server with the processing result.
-     *
-     * @param Payload $payload
-     * @throws GoridgeException
-     */
-    public function respond(Payload $payload): void;
-
-    /**
-     * Respond to the server with an error. Error must be treated as TaskError and might not cause
-     * worker destruction.
-     *
-     * Example:
-     *
-     * $worker->error("invalid payload");
-     *
-     * @param string $error
-     * @throws GoridgeException
-     */
-    public function error(string $error): void;
-
-    /**
-     * Terminate the process. Server must automatically pass task to the next available process.
-     * Worker will receive stop command after calling this method.
-     *
-     * Attention, you MUST use continue; after invoking this method to let rr to properly stop worker.
-     */
-    public function stop(): void;
-}