Improve tests, replace psr7 implementation

Bridges/HttpKernel.php

@@ -9,7 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UploadedFileInterface;
-use RingCentral\Psr7;
+use GuzzleHttp\Psr7;
 use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\File\UploadedFile as SymfonyFile;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;

composer.json

@@ -3,12 +3,14 @@
     "license": "MIT",
     "require": {
         "php-pm/php-pm": "^1.0.5",
-        "symfony/http-foundation": "^2.6|^3.0|^4",
-        "symfony/http-kernel": "^2.6|^3.0|^4",
-        "ringcentral/psr7": "^1.2"
+        "symfony/http-foundation": "^3.4|^4",
+        "symfony/http-kernel": "^3.4|^4",
+        "guzzlehttp/psr7": "^1.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^5.7",
+        "symfony/framework-bundle": "^3.4|^4",
+        "doctrine/annotations": "^1.6"
     },
     "autoload": {
         "psr-4": {

tests/Fixtures/ProcessSlaveDouble.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace PHPPM\Tests\Fixtures;
+
+class ProcessSlaveDouble
+{
+    private $watchedFiles = [];
+
+    public function registerFile($file)
+    {
+        $this->watchedFiles[] = $file;
+    }
+}

tests/Fixtures/Symfony/Controller/GetController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace PHPPM\Tests\Fixtures\Symfony\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+
+class GetController extends Controller
+{
+    /**
+     * @Route("/get")
+     */
+    public function __invoke()
+    {
+        return new Response('Success', 200);
+    }
+}

tests/Fixtures/Symfony/Controller/PostJsonController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace PHPPM\Tests\Fixtures\Symfony\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+
+class PostJsonController extends Controller
+{
+    /**
+     * @Route("/json", methods={"POST"})
+     */
+    public function __invoke(Request $request)
+    {
+        $body = json_decode($request->getContent(), true);
+        if ($request->getContent() == null || !$body) {
+            throw new \Exception('Invalid JSON body');
+        }
+
+        return new Response('Received JSON: '.$request->getContent(), 201);
+    }
+}

tests/Fixtures/Symfony/Controller/StreamedController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace PHPPM\Tests\Fixtures\Symfony\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\Routing\Annotation\Route;
+
+class StreamedController extends Controller
+{
+    /**
+     * @Route("/streamed")
+     */
+    public function __invoke()
+    {
+        return new StreamedResponse(function () {
+            echo 'streamed data';
+        }, 200);
+    }
+}

tests/Fixtures/Symfony/Controller/UploadController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace PHPPM\Tests\Fixtures\Symfony\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+
+class UploadController extends Controller
+{
+    /**
+     * @Route("/upload", methods={"POST"})
+     */
+    public function __invoke(Request $request)
+    {
+        $mappedFileNames = array_map(function ($f) {
+            if (!isset($f)) {
+                return 'NULL';
+            }
+            return $f->getClientOriginalName();
+        }, $request->files->all());
+
+        return new Response('Uploaded files: '.implode(',', $mappedFileNames), 201);
+    }
+}

tests/Fixtures/Symfony/Kernel.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace PHPPM\Tests\Fixtures\Symfony;
+
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Routing\RouteCollectionBuilder;
+
+class Kernel extends \Symfony\Component\HttpKernel\Kernel
+{
+    use MicroKernelTrait;
+
+    const CONFIG_EXTS = '.{php,xml,yaml,yml}';
+
+    public function registerBundles()
+    {
+        $contents = require $this->getProjectDir() . '/config/bundles.php';
+        foreach ($contents as $class => $envs) {
+            if (isset($envs['all']) || isset($envs[$this->environment])) {
+                yield new $class();
+            }
+        }
+    }
+
+    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader)
+    {
+        $container->addResource(new FileResource($this->getProjectDir() . '/config/bundles.php'));
+        // Feel free to remove the "container.autowiring.strict_mode" parameter
+        // if you are using symfony/dependency-injection 4.0+ as it's the default behavior
+        $container->setParameter('container.autowiring.strict_mode', true);
+        $container->setParameter('container.dumper.inline_class_loader', true);
+        $confDir = $this->getProjectDir() . '/config';
+
+        $loader->load($confDir . '/{services}' . self::CONFIG_EXTS, 'glob');
+    }
+
+    protected function configureRoutes(RouteCollectionBuilder $routes)
+    {
+        $confDir = $this->getProjectDir() . '/config';
+
+        $routes->import($confDir . '/{routes}' . self::CONFIG_EXTS, '/', 'glob');
+    }
+
+    public function getProjectDir()
+    {
+        return __DIR__;
+    }
+}

tests/Fixtures/Symfony/config/bundles.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
+];

tests/Fixtures/Symfony/config/routes.yaml

@@ -0,0 +1,3 @@
+controllers:
+    resource: '../Controller/'
+    type: annotation

tests/Fixtures/Symfony/config/services.yaml

@@ -0,0 +1,3 @@
+services:
+framework:
+  secret: foobar

tests/SymfonyBootstrapTest.php

@@ -2,60 +2,61 @@
 
 namespace PHPPM\Tests;
 
+use PHPPM\ProcessSlave;
+use PHPPM\Tests\Fixtures\ProcessSlaveDouble;
 use PHPUnit\Framework\TestCase;
 use PHPPM\Bridges\HttpKernel;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\UploadedFileInterface;
+use GuzzleHttp\Psr7\ServerRequest;
+use GuzzleHttp\Psr7\UploadedFile;
+use Symfony\Component\Filesystem\Filesystem;
 
 class SymfonyBootstrapTest extends TestCase
 {
+    public function setUp()
+    {
+        ProcessSlave::$slave = new ProcessSlaveDouble();
+    }
+
+    public static function tearDownAfterClass()
+    {
+        $fs = new Filesystem();
+        $fs->remove(__DIR__.'/Fixtures/Symfony/var');
+    }
 
     /**
      * @runInSeparateProcess
      */
     public function testGetRequest()
     {
-        putenv('APP_KERNEL_NAMESPACE=PHPPM\\Tests\\SymfonyMocks\\');
+        putenv('APP_KERNEL_NAMESPACE=PHPPM\\Tests\\Fixtures\\Symfony\\');
         $bridge = new HttpKernel();
         $bridge->bootstrap('Symfony', 'test', true);
 
-        $request = $this->getMockBuilder(ServerRequestInterface::class)->getMock();
-        $request->method('getHeader')->with('Cookie')->willReturn([]);
-        $request->method('getQueryParams')->willReturn([]);
-        $request->method('getUploadedFiles')->willReturn([]);
-        $request->method('getMethod')->willReturn('GET');
+        $request = new ServerRequest('GET', '/get');
+        $_SERVER['REQUEST_URI'] = (string) $request->getUri();
 
         $response = $bridge->handle($request);
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertEquals('Success', (string)$response->getBody());
+        $this->assertEquals('Success', (string) $response->getBody());
     }
 
     /**
      * @runInSeparateProcess
      */
     public function testFileUpload()
     {
-        putenv('APP_KERNEL_NAMESPACE=PHPPM\\Tests\\SymfonyMocks\\');
+        putenv('APP_KERNEL_NAMESPACE=PHPPM\\Tests\\Fixtures\\Symfony\\');
         $bridge = new HttpKernel();
         $bridge->bootstrap('Symfony', 'test', true);
 
-        $fileOK = $this->getMockBuilder(UploadedFileInterface::class)->getMock();
-        $fileOK->method('getClientFilename')->willReturn('testOK.pdf');
-        $fileOK->method('getClientMediaType')->willReturn('pdf');
-        $fileOK->method('getSize')->willReturn(1000);
-        $fileOK->method('getError')->willReturn(UPLOAD_ERR_OK);
-
-        $fileErr = $this->getMockBuilder(UploadedFileInterface::class)->getMock();
-        $fileErr->method('getClientFilename')->willReturn('testErr.pdf');
-        $fileErr->method('getClientMediaType')->willReturn('pdf');
-        $fileErr->method('getSize')->willReturn(0);
-        $fileErr->method('getError')->willReturn(UPLOAD_ERR_NO_FILE);
-
-        $request = $this->getMockBuilder(ServerRequestInterface::class)->getMock();
-        $request->method('getHeader')->with('Cookie')->willReturn([]);
-        $request->method('getQueryParams')->willReturn([]);
-        $request->method('getUploadedFiles')->willReturn([$fileOK, $fileErr]);
-        $request->method('getMethod')->willReturn('POST');
+        $request = new ServerRequest('POST', '/upload');
+        $dummyStream = fopen('data:text/plain,dummy', 'r');
+        $uploadedFiles = [
+            new UploadedFile($dummyStream, 1000, UPLOAD_ERR_OK, 'testOK.pdf', 'pdf'),
+            new UploadedFile($dummyStream, 0, UPLOAD_ERR_NO_FILE, 'testErr.pdf', 'pdf'),
+        ];
+        $request = $request->withUploadedFiles($uploadedFiles);
+        $_SERVER['REQUEST_URI'] = (string) $request->getUri();
 
         $response = $bridge->handle($request);
         $this->assertEquals(201, $response->getStatusCode());
@@ -67,17 +68,14 @@ public function testFileUpload()
      */
     public function testPostJSON()
     {
-        putenv('APP_KERNEL_NAMESPACE=PHPPM\\Tests\\SymfonyMocks\\');
+        putenv('APP_KERNEL_NAMESPACE=PHPPM\\Tests\\Fixtures\\Symfony\\');
         $bridge = new HttpKernel();
         $bridge->bootstrap('Symfony', 'test', true);
 
-        $_SERVER["CONTENT_TYPE"] = 'application/json';
-        $request = $this->getMockBuilder(ServerRequestInterface::class)->getMock();
-        $request->method('getHeader')->with('Cookie')->willReturn([]);
-        $request->method('getQueryParams')->willReturn([]);
-        $request->method('getUploadedFiles')->willReturn([]);
-        $request->method('getBody')->willReturn('{"some_json_array":[{"map1":"value1"},{"map2":"value2"}]}');
-        $request->method('getMethod')->willReturn('POST');
+        $request = new ServerRequest('POST', '/json', [
+            'CONTENT_TYPE' => 'application/json',
+        ], '{"some_json_array":[{"map1":"value1"},{"map2":"value2"}]}');
+        $_SERVER['REQUEST_URI'] = (string) $request->getUri();
 
         $response = $bridge->handle($request);
         $this->assertEquals(201, $response->getStatusCode());
@@ -89,17 +87,12 @@ public function testPostJSON()
      */
     public function testStreamedResponse()
     {
-        putenv('APP_KERNEL_NAMESPACE=PHPPM\\Tests\\SymfonyMocks\\');
+        putenv('APP_KERNEL_NAMESPACE=PHPPM\\Tests\\Fixtures\\Symfony\\');
         $bridge = new HttpKernel();
         $bridge->bootstrap('Symfony', 'test', true);
 
-        $request = $this->getMockBuilder(ServerRequestInterface::class)->getMock();
-        $request->method('getHeader')->with('Cookie')->willReturn([]);
-        $request->method('getQueryParams')->willReturn([]);
-        $request->method('getUploadedFiles')->willReturn([]);
-        $request->method('getMethod')->willReturn('GET');
-
-        $_SERVER['REQUEST_URI'] = '/streamed';
+        $request = new ServerRequest('GET', '/streamed');
+        $_SERVER['REQUEST_URI'] = (string) $request->getUri();
 
         $response = $bridge->handle($request);
         $this->assertEquals(200, $response->getStatusCode());