From 79b0407cda66a4e50cc873d47fc1ce65d614b185 Mon Sep 17 00:00:00 2001 From: Mark Trapp Date: Thu, 14 May 2020 08:15:38 -0700 Subject: [PATCH 1/3] Revert "Update diactoros to support Drupal 8.6+. (#52)" This reverts commit bc453aa8488afa0b93400621e7ed57eb5b46f67c. --- .travis.yml | 3 ++- composer.json | 10 +++++----- src/Symfony/HmacAuthenticationProvider.php | 14 ++------------ src/Symfony/HmacResponseListener.php | 16 +++------------- 4 files changed, 12 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02a233b..8220879 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,10 @@ language: php php: - - 7.3 - 7.2 - 7.1 + - 7.0 + - 5.6 before_install: - travis_retry composer self-update diff --git a/composer.json b/composer.json index 08e1e20..94077f9 100644 --- a/composer.json +++ b/composer.json @@ -14,14 +14,14 @@ "issues": "https://github.com/acquia/http-hmac-php/issues" }, "require": { - "php": "^7.1", + "php": "~5.6 || ~7.0", "psr/http-message": "~1.0.0" }, "suggest": { "guzzlehttp/guzzle": "~6.0", - "symfony/psr-http-message-bridge": "^1.1.2 | ^2.0", + "symfony/psr-http-message-bridge": "^1.0", "symfony/security": "^3.0 | ^4.0", - "laminas/laminas-diactoros": "^1.8 || ^2.2" + "zendframework/zend-diactoros": "^1.3" }, "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.1.2 | ^2.0", + "symfony/psr-http-message-bridge": "^1.0", "symfony/security": "^3.0 | ^4.0", "symfony/security-bundle": "^3.0 | ^4.0", - "laminas/laminas-diactoros": "^1.8 || ^2.2" + "zendframework/zend-diactoros": "^1.3" }, "replace": { "acquia/hmac-request": "self.version" diff --git a/src/Symfony/HmacAuthenticationProvider.php b/src/Symfony/HmacAuthenticationProvider.php index 7f207f9..d5280cf 100644 --- a/src/Symfony/HmacAuthenticationProvider.php +++ b/src/Symfony/HmacAuthenticationProvider.php @@ -3,12 +3,7 @@ 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; @@ -40,13 +35,8 @@ public function __construct(RequestAuthenticatorInterface $authenticator) */ public function authenticate(TokenInterface $token) { - 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()); + $psr7Factory = new DiactorosFactory(); + $psr7Request = $psr7Factory->createRequest($token->getRequest()); try { $key = $this->authenticator->authenticate($psr7Request); diff --git a/src/Symfony/HmacResponseListener.php b/src/Symfony/HmacResponseListener.php index 1cc0e3d..4198efc 100644 --- a/src/Symfony/HmacResponseListener.php +++ b/src/Symfony/HmacResponseListener.php @@ -3,12 +3,7 @@ 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; @@ -32,16 +27,11 @@ public function onKernelResponse(FilterResponseEvent $event) $response = $event->getResponse(); if ($request->attributes->has('hmac.key')) { - if (class_exists(DiactorosFactory::class)) { - $httpMessageFactory = new DiactorosFactory(); - } else { - $httpMessageFactory = new PsrHttpFactory(new ServerRequestFactory(), new StreamFactory(), new UploadedFileFactory(), new ResponseFactory()); - } - + $psr7Factory = new DiactorosFactory(); $foundationFactory = new HttpFoundationFactory(); - $psr7Request = $httpMessageFactory->createRequest($request); - $psr7Response = $httpMessageFactory->createResponse($response); + $psr7Request = $psr7Factory->createRequest($request); + $psr7Response = $psr7Factory->createResponse($response); $signer = new ResponseSigner($request->attributes->get('hmac.key'), $psr7Request); $signedResponse = $signer->signResponse($psr7Response); From 950aecbc5651698dbceae389a58468fbec0858ac Mon Sep 17 00:00:00 2001 From: Mark Trapp Date: Thu, 14 May 2020 08:39:30 -0700 Subject: [PATCH 2/3] Increase memory limit --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8220879..b514996 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ php: before_install: - travis_retry composer self-update - phpenv config-rm xdebug.ini + - echo "memory_limit=512M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini before_script: - travis_retry make install From 58a404ac71ec6d59bbc86ee4f741ddbf36ac103e Mon Sep 17 00:00:00 2001 From: Mark Trapp Date: Thu, 14 May 2020 08:44:06 -0700 Subject: [PATCH 3/3] Even higher limit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b514996..2c8aa79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ php: before_install: - travis_retry composer self-update - phpenv config-rm xdebug.ini - - echo "memory_limit=512M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini + - echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini before_script: - travis_retry make install