Minor requirements updates

.gitignore

@@ -4,3 +4,5 @@ composer.lock
 state/*-*
 build/*
 phpunit.xml
+.php_cs.cache
+.php_cs.result.cache

.php_cs.dist

@@ -0,0 +1,19 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__ . '/src')
+    ->in(__DIR__ . '/tests');
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'combine_consecutive_unsets' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'return_type_declaration' => ['space_before' => 'one'],
+        'no_unreachable_default_argument_value' => false,
+        'yoda_style' => false,
+        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
+        'pre_increment' => false,
+    ])
+    ->setFinder($finder);

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 7.1
   - 7.2
   - 7.3
 
@@ -11,5 +10,5 @@ before_script:
 sudo: false
 
 script:
-  - ./vendor/bin/phpcs --standard=vendor/internations/kodierungsregelwerksammlung/ruleset.xml ./src/
+  - composer lint:check
   - ./vendor/bin/phpunit

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "internations/http-mock",
-    "description": "Mock HTTP requests on the server side in your PHP unit tests",
+    "description": "Mock HTTP requests on the server side in your PHP unit tests, PSR/7 Fork of internations version",
     "license": "MIT",
     "authors": [
         {
@@ -10,18 +10,23 @@
         {
             "name": "Max Beutel",
             "email": "max.beutel@internations.org"
+        },
+        {
+            "name": "Joshua Eichorn",
+            "email": "joshua.eichorn@pagely.com"
         }
     ],
      "require": {
-         "php": "~7.1",
-        "silex/silex": "~2.0",
-        "guzzle/guzzle": ">=3.8",
-        "symfony/process": "~3|~4",
+        "php": "~7.2",
+        "symfony/process": "~3|~4|~5",
         "jeremeamia/superclosure": "~2",
-        "lstrojny/hmmmath": ">=0.5.0"
+        "lstrojny/hmmmath": ">=0.5.0",
+        "guzzlehttp/guzzle": "^6.3",
+        "slim/slim": "^3.12",
+        "friendsofphp/php-cs-fixer": "^2.16",
+        "sensiolabs/security-checker": "^6.0"
     },
     "require-dev": {
-        "internations/kodierungsregelwerksammlung": "~0.23.0",
         "internations/testing-component": "1.0.1",
         "phpunit/phpunit": "^7"
     },
@@ -30,5 +35,25 @@
     },
     "autoload-dev": {
         "psr-4": {"InterNations\\Component\\HttpMock\\Tests\\": "tests/"}
+    },
+    "scripts": {
+        "auto-scripts": [
+            "@security-check"
+        ],
+        "post-install-cmd": [
+            "@auto-scripts"
+        ],
+        "post-update-cmd": [
+            "@auto-scripts"
+        ],
+        "lint": [
+            "php-cs-fixer fix --ansi --verbose --show-progress=estimating"
+        ],
+        "lint:check": [
+            "@lint --dry-run"
+        ],
+        "security-check": [
+            "security-checker security:check"
+        ]
     }
 }

doc/recording.md

@@ -2,7 +2,7 @@
 
 Once a SUT (system under test) has fired HTTP requests, we often want to validate that our assumption about the nature
 of those requests are valid. For that purpose HTTP mock stores every request for later inspection. The recorded requests
-are presented as an instance of `InterNations\Component\HttpMock\Request\UnifiedRequest`.
+are presented as an instance of `Slim\Http\Response`.
 
 ```php
 $this->http->mock

doc/server.md

@@ -6,7 +6,8 @@ Overview of the internal server functionality
 ```
 POST /_expectation
 {
-    response (required): serialized Symfony response
+    response (required): stringified http respopnse
+    responseCallback (optional): serialized closure that is passed in the response, and can return a new Response
     matcher (optional): serialized list of closures
     limiter (optional): serialized closure that limits the validity of the expectation
 }

doc/start.md

@@ -58,10 +58,10 @@ class ExampleTest extends PHPUnit_Framework_TestCase
             ->end();
         $this->http->setUp();
 
-        $this->assertSame('mocked body', $this->http->client->post('http://localhost:8082/foo')->send()->getBody(true));
+        $this->assertSame('mocked body', (string)$this->http->client->post('http://localhost:8082/foo')->getBody());
 
         $this->assertSame('POST', $this->http->requests->latest()->getMethod());
-        $this->assertSame('/foo', $this->http->requests->latest()->getPath());
+        $this->assertSame('/foo', $this->http->requests->latest()->getUri()->getPath());
     }
 }
  ```

doc/stubbing.md

@@ -24,8 +24,8 @@ The example above say: when we see a `GET` request asking for `/resource` respon
 What we see here is internally syntactic sugar for the following, more verbose, example using plain callbacks.
 
 ```php
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
+use Psr\Http\Message\RequestInterface as Request;
+use Psr\Http\Message\ResponseInterface as Response;
 
 $this->http->mock
     ->when()
@@ -43,21 +43,20 @@ $this->http->mock
     ->end();
 ```
 
-What we can see above is that we use standard Symfony HTTP foundation `Request` and `Response` objects. If you want to
-learn more about it, look at
-[Symfony’s documentation](https://symfony.com/doc/current/components/http_foundation/introduction.html).
+What we can see above is that we use standard PSR/7 Request Response, we use the Guzzle implementation on the Client and the Slim implementation on the server side, hurrah standards
 
 Let’s have a look what we can do with matching and response building shortcuts:
 
 ```php
-use Symfony\Component\HttpFoundation\Response;
+use Psr\Http\Message\ResponseInterface as Response;
+use Slim\Http\StatusCode;
 
 $this->http->mock
     ->when()
         ->methodIs('GET')
         ->pathIs('/resource')
     ->then()
-        ->statusCode(Response::HTTP_NOT_FOUND)
+        ->statusCode(StatusCode::HTTP_NOT_FOUND)
         ->header('X-Custom-Header', 'Header Value')
         ->body('response')
     ->end();`

public/index.php

@@ -1,4 +1,8 @@
 <?php
+if (empty($_SERVER['REQUEST_URI'])) {
+    $_SERVER['REQUEST_URI'] = '/_me';
+    $_SERVER['REQUEST_METHOD'] = 'GET';
+}
 $filename = __DIR__ . preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']);
 if (php_sapi_name() === 'cli-server' && is_file($filename)) {
     return false;

src/Expectation.php

@@ -1,11 +1,12 @@
 <?php
+
 namespace InterNations\Component\HttpMock;
 
+use Closure;
 use InterNations\Component\HttpMock\Matcher\ExtractorFactory;
 use InterNations\Component\HttpMock\Matcher\MatcherFactory;
 use InterNations\Component\HttpMock\Matcher\MatcherInterface;
 use SuperClosure\SerializableClosure;
-use Closure;
 
 class Expectation
 {
@@ -29,8 +30,7 @@ public function __construct(
         MatcherFactory $matcherFactory,
         ExtractorFactory $extractorFactory,
         Closure $limiter
-    )
-    {
+    ) {
         $this->matcherFactory = $matcherFactory;
         $this->responseBuilder = new ResponseBuilder($mockBuilder);
         $this->extractorFactory = $extractorFactory;
@@ -142,6 +142,11 @@ public function getResponse()
         return $this->responseBuilder->getResponse();
     }
 
+    public function getResponseCallback()
+    {
+        return $this->responseBuilder->getResponseCallback();
+    }
+
     public function getLimiter()
     {
         return new SerializableClosure($this->limiter);

src/Matcher/AbstractMatcher.php

@@ -1,9 +1,10 @@
 <?php
+
 namespace InterNations\Component\HttpMock\Matcher;
 
 use Closure;
+use Psr\Http\Message\RequestInterface as Request;
 use SuperClosure\SerializableClosure;
-use Symfony\Component\HttpFoundation\Request;
 
 abstract class AbstractMatcher implements MatcherInterface
 {

src/Matcher/ClosureMatcher.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace InterNations\Component\HttpMock\Matcher;
 
 use Closure;

src/Matcher/ExtractorFactory.php

@@ -1,7 +1,8 @@
 <?php
+
 namespace InterNations\Component\HttpMock\Matcher;
 
-use Symfony\Component\HttpFoundation\Request;
+use Psr\Http\Message\RequestInterface as Request;
 
 class ExtractorFactory
 {
@@ -17,7 +18,7 @@ public function createPathExtractor()
         $basePath = $this->basePath;
 
         return static function (Request $request) use ($basePath) {
-            return substr_replace($request->getPathInfo(), '', 0, strlen($basePath));
+            return substr_replace($request->getUri()->getPath(), '', 0, strlen($basePath));
         };
     }
 
@@ -31,28 +32,33 @@ public function createMethodExtractor()
     public function createParamExtractor($param)
     {
         return static function (Request $request) use ($param) {
-            return $request->query->get($param);
+            return $request->getParam($param);
         };
     }
 
     public function createParamExistsExtractor($param)
     {
         return static function (Request $request) use ($param) {
-            return $request->query->has($param);
+            return $request->getParam($param, false) !== false;
         };
     }
 
     public function createHeaderExtractor($header)
     {
         return static function (Request $request) use ($header) {
-            return $request->headers->get($header);
+            $r = $request->getHeaderLine($header);
+            if (empty($r)) {
+                return null;
+            }
+
+            return $r;
         };
     }
 
     public function createHeaderExistsExtractor($header)
     {
         return static function (Request $request) use ($header) {
-            return $request->headers->has($header);
+            return $request->hasHeader($header);
         };
     }
 }

src/Matcher/MatcherFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace InterNations\Component\HttpMock\Matcher;
 
 use Closure;

src/Matcher/MatcherInterface.php

@@ -1,8 +1,9 @@
 <?php
+
 namespace InterNations\Component\HttpMock\Matcher;
 
-use SuperClosure\SerializableClosure;
 use Closure;
+use SuperClosure\SerializableClosure;
 
 interface MatcherInterface
 {

src/Matcher/RegexMatcher.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace InterNations\Component\HttpMock\Matcher;
 
 class RegexMatcher extends AbstractMatcher

src/Matcher/StringMatcher.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace InterNations\Component\HttpMock\Matcher;
 
 class StringMatcher extends AbstractMatcher

src/MockBuilder.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace InterNations\Component\HttpMock;
 
 use Closure;

src/PHPUnit/HttpMockFacade.php

@@ -1,7 +1,8 @@
 <?php
+
 namespace InterNations\Component\HttpMock\PHPUnit;
 
-use Guzzle\Http\Client;
+use GuzzleHttp\Client;
 use InterNations\Component\HttpMock\Matcher\ExtractorFactory;
 use InterNations\Component\HttpMock\Matcher\MatcherFactory;
 use InterNations\Component\HttpMock\MockBuilder;
@@ -10,15 +11,15 @@
 use RuntimeException;
 
 /**
- * @property-read Server $server The HTTP mock server that is currently running
- * @property-read MatcherFactory $matches An instance of the matcher factory
- * @property-read MockBuilder $mock An instance of the mock builder
- * @property-read RequestCollectionFacade $requests Convenient access to recorded requests
- * @property-read Client $client A pre configured HTTP for client for the currently running server
+ * @property Server                  $server   The HTTP mock server that is currently running
+ * @property MatcherFactory          $matches  An instance of the matcher factory
+ * @property MockBuilder             $mock     An instance of the mock builder
+ * @property RequestCollectionFacade $requests Convenient access to recorded requests
+ * @property Client                  $client   A pre configured HTTP for client for the currently running server
  */
 class HttpMockFacade
 {
-    /** @var array  */
+    /** @var array */
     private $services = [];
 
     private $basePath;