Update diactoros to support Drupal 8.6+. (#52)

* Update diactoros to support Drupal 8.6+.
* Reverse the if statements for Diactoros.
* Update to php 7.3, fix some linting.

Author: japerry

.travis.yml

@@ -7,10 +7,9 @@
 language: php
 
 php:
+  - 7.3
   - 7.2
   - 7.1
-  - 7.0
-  - 5.6
 
 before_install:
   - travis_retry composer self-update

composer.json

@@ -14,14 +14,14 @@
         "issues": "https://github.com/acquia/http-hmac-php/issues"
     },
     "require": {
-        "php": "~5.6 || ~7.0",
+        "php": "^7.1",
         "psr/http-message": "~1.0.0"
     },
     "suggest": {
         "guzzlehttp/guzzle": "~6.0",
-        "symfony/psr-http-message-bridge": "^1.0",
+        "symfony/psr-http-message-bridge": "^1.1.2 | ^2.0",
         "symfony/security": "^3.0 | ^4.0",
-        "zendframework/zend-diactoros": "^1.3"
+        "laminas/laminas-diactoros": "^1.8 || ^2.2"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "~6.0",
@@ -30,10 +30,10 @@
         "phpunit/phpunit": "~5.7",
         "sebastian/phpcpd": "^2.0",
         "friendsofphp/php-cs-fixer": "^2.11",
-        "symfony/psr-http-message-bridge": "^1.0",
+        "symfony/psr-http-message-bridge": "^1.1.2 | ^2.0",
         "symfony/security": "^3.0 | ^4.0",
         "symfony/security-bundle": "^3.0 | ^4.0",
-        "zendframework/zend-diactoros": "^1.3"
+        "laminas/laminas-diactoros": "^1.8 || ^2.2"
     },
     "replace": {
         "acquia/hmac-request": "self.version"

src/Symfony/HmacAuthenticationProvider.php

@@ -3,7 +3,12 @@
 namespace Acquia\Hmac\Symfony;
 
 use Acquia\Hmac\RequestAuthenticatorInterface;
+use Laminas\Diactoros\ResponseFactory;
+use Laminas\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\StreamFactory;
+use Laminas\Diactoros\UploadedFileFactory;
 use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
+use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
 use Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
@@ -35,8 +40,13 @@ public function __construct(RequestAuthenticatorInterface $authenticator)
      */
     public function authenticate(TokenInterface $token)
     {
-        $psr7Factory = new DiactorosFactory();
-        $psr7Request = $psr7Factory->createRequest($token->getRequest());
+        if (class_exists(DiactorosFactory::class)) {
+            $httpMessageFactory = new DiactorosFactory();
+        } else {
+            $httpMessageFactory = new PsrHttpFactory(new ServerRequestFactory(), new StreamFactory(), new UploadedFileFactory(), new ResponseFactory());
+        }
+
+        $psr7Request = $httpMessageFactory->createRequest($token->getRequest());
 
         try {
             $key = $this->authenticator->authenticate($psr7Request);

src/Symfony/HmacResponseListener.php

@@ -3,7 +3,12 @@
 namespace Acquia\Hmac\Symfony;
 
 use Acquia\Hmac\ResponseSigner;
+use Laminas\Diactoros\ResponseFactory;
+use Laminas\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\StreamFactory;
+use Laminas\Diactoros\UploadedFileFactory;
 use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
+use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -27,11 +32,16 @@ public function onKernelResponse(FilterResponseEvent $event)
         $response = $event->getResponse();
 
         if ($request->attributes->has('hmac.key')) {
-            $psr7Factory = new DiactorosFactory();
+            if (class_exists(DiactorosFactory::class)) {
+                $httpMessageFactory = new DiactorosFactory();
+            } else {
+                $httpMessageFactory = new PsrHttpFactory(new ServerRequestFactory(), new StreamFactory(), new UploadedFileFactory(), new ResponseFactory());
+            }
+
             $foundationFactory = new HttpFoundationFactory();
 
-            $psr7Request = $psr7Factory->createRequest($request);
-            $psr7Response = $psr7Factory->createResponse($response);
+            $psr7Request = $httpMessageFactory->createRequest($request);
+            $psr7Response = $httpMessageFactory->createResponse($response);
 
             $signer = new ResponseSigner($request->attributes->get('hmac.key'), $psr7Request);
             $signedResponse = $signer->signResponse($psr7Response);