Add support for psr-15

Author: snapshotpl

.travis.yml

@@ -1,19 +1,18 @@
 language: php
 
-matrix:
-  fast_finish: true
-  include:
-    - php: 5.5
-    - php: 5.6
-    - php: 7
-    - php: hhvm
-  allow_failures:
-    - php: 7
-    - php: hhvm
+php:
+  - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
+  - hhvm
 
-install:
-  - travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source
-  - composer info -i
+env:
+  - COMPOSER_FLAGS=--prefer-lowest
+  - COMPOSER_FLAGS=
+  
+before_script:
+  - composer update --no-interaction --no-suggest --prefer-dist $COMPOSER_FLAGS
 
 script:
-  - ./vendor/bin/phpunit
+  - vendor/bin/phpunit

composer.json

@@ -15,10 +15,8 @@
         "php": ">=5.5",
         "psr/log": "^1.0.0",
         "psr/http-message": "^1.0",
-        "zendframework/zend-diactoros": "^1.1.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^4.8.6"
+        "zendframework/zend-diactoros": "^1.1.3",
+        "http-interop/http-middleware": "^0.4.1"
     },
     "autoload": {
         "psr-4": {
@@ -29,5 +27,8 @@
         "psr-4": {
             "PhpMiddlewareTest\\LogHttpMessages\\": "test/"
         }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.0"
     }
 }

src/LogMiddleware.php

@@ -2,13 +2,19 @@
 
 namespace PhpMiddleware\LogHttpMessages;
 
+use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use PhpMiddleware\LogHttpMessages\Formatter\HttpMessagesFormatter;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ServerRequestInterface as ServerRequest;
+use Psr\Log\LoggerInterface;
 use Psr\Log\LoggerInterface as Logger;
 use Psr\Log\LogLevel;
+use UnexpectedValueException;
 
-class LogMiddleware
+class LogMiddleware implements MiddlewareInterface
 {
     /**
      * @var Logger
@@ -50,11 +56,17 @@ public function __invoke(ServerRequest $request, Response $response, callable $n
         $messages = $this->formatter->format($request, $outResponse);
 
         if (!is_string($messages)) {
-            throw new \UnexpectedValueException(sprintf('%s must return string', HttpMessagesFormatter::class));
+            throw new UnexpectedValueException(sprintf('%s must return string', HttpMessagesFormatter::class));
         }
 
         $this->logger->log($this->level, $messages);
 
         return $outResponse;
     }
+
+    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
+    {
+        
+    }
+
 }

test/LogMiddlewareTest.php

@@ -41,7 +41,7 @@ public function testLogMessage()
         $this->formatter->expects($this->once())->method('format')->with($this->request, $this->nextResponse)->willReturn('boo');
         $this->logger->expects($this->once())->method('log')->with($this->level, 'boo');
 
-        $response = $this->executeMiddleware();
+        $response = $this->executeDoublePassMiddleware();
 
         $this->assertSame($this->nextResponse, $response);
     }
@@ -53,10 +53,10 @@ public function testTryToLogNullMessage()
     {
         $this->formatter->expects($this->once())->method('format')->willReturn(null);
 
-        $this->executeMiddleware();
+        $this->executeDoublePassMiddleware();
     }
 
-    public function executeMiddleware()
+    public function executeDoublePassMiddleware()
     {
         return call_user_func($this->middleware, $this->request, $this->response, $this->next);
     }