From 8464528d209d398455b269e62eafc89650393875 Mon Sep 17 00:00:00 2001 From: Jeroen Thora Date: Sat, 7 Nov 2020 20:59:04 +0100 Subject: [PATCH 1/2] Allow PHP8 and switch psr cache dev dependency to symfony/cache to allow php8 testing --- .github/workflows/ci.yml | 4 ++-- composer.json | 8 ++++---- test/Github/Tests/Functional/CacheTest.php | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fdae35ce2d..6ae5174d22a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: - php-versions: ['7.1', '7.2', '7.3', '7.4'] + php-versions: ['7.2', '7.3', '7.4', '8.0'] steps: - uses: actions/checkout@v2 @@ -46,7 +46,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: - php-version: 7.1 + php-version: 7.2 - name: Install Composer Dependencies uses: ramsey/composer-install@v1 diff --git a/composer.json b/composer.json index b7c3b9a7301..d0501e464d1 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^7.1", + "php": "^7.2|^8.0", "php-http/client-common": "^2.3", "php-http/cache-plugin": "^1.7", "php-http/discovery": "^1.11", @@ -29,15 +29,15 @@ "psr/http-message": "^1.0" }, "require-dev": { - "cache/array-adapter": "^1.0.1", + "symfony/cache": "^5.1", "guzzlehttp/psr7": "^1.5.2", "http-interop/http-factory-guzzle": "^1.0", - "php-http/guzzle6-adapter": "^2.0.1", + "guzzlehttp/guzzle": "^7.0.1", "php-http/mock-client": "^1.4", "phpstan/phpstan": "^0.12.32", "phpstan/extension-installer": "^1.0.4", "phpstan/phpstan-deprecation-rules": "^0.12.4", - "phpunit/phpunit": "^7.5.15 || ^8.4 || ^9.0" + "phpunit/phpunit": "^8.4 || ^9.0" }, "autoload": { "psr-4": { "Github\\": "lib/Github/" } diff --git a/test/Github/Tests/Functional/CacheTest.php b/test/Github/Tests/Functional/CacheTest.php index 625807700ba..58afe5f61f3 100644 --- a/test/Github/Tests/Functional/CacheTest.php +++ b/test/Github/Tests/Functional/CacheTest.php @@ -2,9 +2,9 @@ namespace Github\Tests\Functional; -use Cache\Adapter\PHPArray\ArrayCachePool; use Github\Client; use GuzzleHttp\Psr7\Response; +use Symfony\Component\Cache\Adapter\ArrayAdapter; /** * @group functional @@ -23,7 +23,7 @@ public function shouldServeCachedResponse() $mockClient->addResponse($this->getCurrentUserResponse('octocat')); $github = Client::createWithHttpClient($mockClient); - $github->addCache(new ArrayCachePool(), ['default_ttl'=>600]); + $github->addCache(new ArrayAdapter(), ['default_ttl'=>600]); $github->authenticate('fake_token_aaa', Client::AUTH_ACCESS_TOKEN); $userA = $github->currentUser()->show(); @@ -43,7 +43,7 @@ public function shouldVaryOnAuthorization() $mockClient->addResponse($this->getCurrentUserResponse('octocat')); $github = Client::createWithHttpClient($mockClient); - $github->addCache(new ArrayCachePool(), ['default_ttl'=>600]); + $github->addCache(new ArrayAdapter(), ['default_ttl'=>600]); $github->authenticate('fake_token_aaa', Client::AUTH_ACCESS_TOKEN); $userA = $github->currentUser()->show(); From be435e4f87a3a147328b829911844322b88b2cb3 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sat, 28 Nov 2020 23:07:06 +0000 Subject: [PATCH 2/2] Tweaked minimum versions --- composer.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index d0501e464d1..52917c2a854 100644 --- a/composer.json +++ b/composer.json @@ -17,27 +17,27 @@ } ], "require": { - "php": "^7.2|^8.0", + "php": "^7.2 || ^8.0", + "php-http/cache-plugin": "^1.7.1", "php-http/client-common": "^2.3", - "php-http/cache-plugin": "^1.7", - "php-http/discovery": "^1.11", - "php-http/httplug": "^2.1", - "php-http/multipart-stream-builder": "^1.1", + "php-http/discovery": "^1.12", + "php-http/httplug": "^2.2", + "php-http/multipart-stream-builder": "^1.1.2", "psr/cache": "^1.0", "psr/http-client-implementation": "^1.0", "psr/http-factory-implementation": "^1.0", "psr/http-message": "^1.0" }, "require-dev": { - "symfony/cache": "^5.1", - "guzzlehttp/psr7": "^1.5.2", + "symfony/cache": "^5.1.8", + "guzzlehttp/psr7": "^1.7", "http-interop/http-factory-guzzle": "^1.0", - "guzzlehttp/guzzle": "^7.0.1", - "php-http/mock-client": "^1.4", - "phpstan/phpstan": "^0.12.32", - "phpstan/extension-installer": "^1.0.4", - "phpstan/phpstan-deprecation-rules": "^0.12.4", - "phpunit/phpunit": "^8.4 || ^9.0" + "guzzlehttp/guzzle": "^7.2", + "php-http/mock-client": "^1.4.1", + "phpstan/phpstan": "^0.12.57", + "phpstan/extension-installer": "^1.0.5", + "phpstan/phpstan-deprecation-rules": "^0.12.5", + "phpunit/phpunit": "^8.5 || ^9.4" }, "autoload": { "psr-4": { "Github\\": "lib/Github/" }