CO-Public-Mirror/CloudObjects-PHP-SDK
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated dependencies, upgrade Symfony-PSR conversion

Browse Source
This commit is contained in:
Lukas Rosenstock
2022-11-17 12:15:22 +01:00
parent 3c88ccd4cc
commit 8b1a5ca4a2
4 changed files with 633 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -1,4 +1,7 @@
vendor vendor
build build
cache cache
.cache
.config
.local
*.phar *.phar

10
CloudObjects/SDK/AccountGateway/AccountContext.php
View File

@@ -9,7 +9,8 @@ namespace CloudObjects\SDK\AccountGateway;
use ML\IRI\IRI; use ML\IRI\IRI;
use ML\JsonLD\Document, ML\JsonLD\JsonLD, ML\JsonLD\Node; use ML\JsonLD\Document, ML\JsonLD\JsonLD, ML\JsonLD\Node;
use Symfony\Component\HttpFoundation\Request, Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Request, Symfony\Component\HttpFoundation\Response;
use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory; use Nyholm\Psr7\Factory\Psr17Factory;
use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
use GuzzleHttp\Client, GuzzleHttp\HandlerStack, GuzzleHttp\Middleware; use GuzzleHttp\Client, GuzzleHttp\HandlerStack, GuzzleHttp\Middleware;
use Psr\Http\Message\RequestInterface, Psr\Http\Message\ResponseInterface; use Psr\Http\Message\RequestInterface, Psr\Http\Message\ResponseInterface;
@@ -110,8 +111,11 @@ class AccountContext {
new IRI('aauid:'.$request->headers->get('C-AAUID')), new IRI('aauid:'.$request->headers->get('C-AAUID')),
$request->headers->get('C-Access-Token')); $request->headers->get('C-Access-Token'));
$psr7Factory = new DiactorosFactory; // Convert HTTP Foundation to PSR17
$context->parsePsrRequest($psr7Factory->createRequest($request)); // based on: https://symfony.com/doc/current/components/psr7.html#converting-from-httpfoundation-objects-to-psr-7
$psr17Factory = new Psr17Factory;
$psrHttpFactory = new PsrHttpFactory($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory);
$context->parsePsrRequest($psrHttpFactory->createRequest($request));
return $context; return $context;
} }

4
composer.json
View File

@@ -27,13 +27,13 @@
"phpunit/phpunit": ">=4.8.0,<5.0", "phpunit/phpunit": ">=4.8.0,<5.0",
"symfony/http-foundation" : ">=4.0", "symfony/http-foundation" : ">=4.0",
"symfony/psr-http-message-bridge" : ">=1.1.0", "symfony/psr-http-message-bridge" : ">=1.1.0",
"zendframework/zend-diactoros" : "~1.8.6", "nyholm/psr7" : "~1.5.1",
"defuse/php-encryption" : "^2.2" "defuse/php-encryption" : "^2.2"
}, },
"suggest" : { "suggest" : {
"symfony/http-foundation" : "Required to use parseSymfonyRequest() in AccountContext.", "symfony/http-foundation" : "Required to use parseSymfonyRequest() in AccountContext.",
"symfony/psr-http-message-bridge" : "Required to use parseSymfonyRequest() in AccountContext.", "symfony/psr-http-message-bridge" : "Required to use parseSymfonyRequest() in AccountContext.",
"zendframework/zend-diactoros" : "Required to use parseSymfonyRequest() in AccountContext.", "nyholm/psr7" : "Required to use parseSymfonyRequest() in AccountContext.",
"defuse/php-encryption": "Required to use CryptoHelper" "defuse/php-encryption": "Required to use CryptoHelper"
} }
} }

1221
composer.lock generated
View File

File diff suppressed because it is too large Load Diff