Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
itafroma merged 3 commits into from
May 14, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79b0407
Revert "Update diactoros to support Drupal 8.6+. (#52)"
itafroma May 14, 2020
950aecb
Increase memory limit
itafroma May 14, 2020
58a404a
Even higher limit
itafroma May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
language: php

php:
- 7.3
- 7.2
- 7.1
- 7.0
- 5.6

before_install:
- travis_retry composer self-update
- phpenv config-rm xdebug.ini
- echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

before_script:
- travis_retry make install
Expand Down
10 changes: 5 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
14 changes: 2 additions & 12 deletions src/Symfony/HmacAuthenticationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
16 changes: 3 additions & 13 deletions src/Symfony/HmacResponseListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down