Merge pull request #154 from xavierleune/feature/tests-matrix

Update matrix with lowest & highest deps + PHP 8.0 & 8.1
Kevinrob · Jan 10, 2022 · 9b63aa3 · 9b63aa3
2 parents c699f46 + 3b11516
commit 9b63aa3
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 45 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,10 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        dependencies:
+          - "lowest"
+          - "highest"
     steps:
     - uses: actions/checkout@v2
-    
+
     - name: Install PHP
       uses: shivammathur/setup-php@v2
       with:
@@ -20,8 +23,10 @@ jobs:
     - name: Validate composer.json and composer.lock
       run: composer validate
 
-    - name: Install dependencies
-      run: composer install --prefer-dist --no-progress
+    - name: "Composer install ${{ matrix.dependencies }} dependencies"
+      uses: "ramsey/composer-install@v1"
+      with:
+        dependency-versions: "${{ matrix.dependencies }}"
 
     - name: Run test suite
       run: composer run-script test
diff --git a/composer.json b/composer.json
@@ -13,13 +13,13 @@
     }
   ],
   "require": {
-    "php": ">=5.5.0",
+    "php": ">=7.2.0",
     "guzzlehttp/guzzle": "^6.0 || ^7.0",
     "guzzlehttp/psr7": "^1.7.0 || ^2.0.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8.36 || ^5.0",
-    "doctrine/cache": "^1.0",
+    "phpunit/phpunit": "^8.5.15 || ^9.5",
+    "doctrine/cache": "^1.10",
     "league/flysystem": "^1.0",
     "psr/cache": "^1.0",
     "cache/array-adapter": "^0.4 || ^0.5 || ^1.0",
@@ -39,7 +39,7 @@
   },
   "suggest": {
     "guzzlehttp/guzzle": "For using this library. It was created for Guzzle6 (but you can use it with any PSR-7 HTTP client).",
-    "doctrine/cache": "This library has a lot of ready-to-use cache storage (to be used with Kevinrob\\GuzzleCache\\Storage\\DoctrineCacheStorage).",
+    "doctrine/cache": "This library has a lot of ready-to-use cache storage (to be used with Kevinrob\\GuzzleCache\\Storage\\DoctrineCacheStorage). Use only versions >=1.4.0 < 2.0.0",
     "league/flysystem": "To be used with Kevinrob\\GuzzleCache\\Storage\\FlysystemStorage",
     "psr/cache": "To be used with Kevinrob\\GuzzleCache\\Storage\\Psr6CacheStorage",
     "psr/simple-cache": "To be used with Kevinrob\\GuzzleCache\\Storage\\Psr16CacheStorage",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,31 +1,27 @@
+<?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="./vendor/autoload.php"
->
+         bootstrap="./vendor/autoload.php">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <report>
+      <clover outputFile="coverage.xml"/>
+    </report>
+  </coverage>
   <php>
-    <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
+    <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
   </php>
-
   <testsuites>
     <testsuite name="Project Test Suite">
       <directory>tests</directory>
     </testsuite>
   </testsuites>
-
-  <filter>
-    <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">src</directory>
-    </whitelist>
-  </filter>
-
-  <logging>
-    <log type="coverage-clover" target="coverage.xml"/>
-  </logging>
-
+  <logging/>
   <listeners>
     <listener class="\Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
   </listeners>
-
 </phpunit>
diff --git a/src/KeyValueHttpHeader.php b/src/KeyValueHttpHeader.php
@@ -76,6 +76,7 @@ public function isEmpty()
      * @return mixed Can return any type.
      * @since 5.0.0
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->values);
@@ -87,7 +88,7 @@ public function current()
      * @return void Any returned value is ignored.
      * @since 5.0.0
      */
-    public function next()
+    public function next(): void
     {
         next($this->values);
     }
@@ -97,7 +98,9 @@ public function next()
      * @link http://php.net/manual/en/iterator.key.php
      * @return mixed scalar on success, or null on failure.
      * @since 5.0.0
+     *
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->values);
@@ -110,7 +113,7 @@ public function key()
      * Returns true on success or false on failure.
      * @since 5.0.0
      */
-    public function valid()
+    public function valid(): bool
     {
         return key($this->values) !== null;
     }
@@ -121,7 +124,7 @@ public function valid()
      * @return void Any returned value is ignored.
      * @since 5.0.0
      */
-    public function rewind()
+    public function rewind(): void
     {
         reset($this->values);
     }

diff --git a/tests/BaseTest.php b/tests/BaseTest.php
@@ -18,7 +18,7 @@ class BaseTest extends TestCase
      */
     protected $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // Create default HandlerStack
         $stack = HandlerStack::create(function (RequestInterface $request, array $options) {

diff --git a/tests/CacheEntryTest.php b/tests/CacheEntryTest.php
@@ -3,13 +3,14 @@
 namespace Kevinrob\GuzzleCache\Tests;
 
 use Kevinrob\GuzzleCache\CacheEntry;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
  * @group time-sensitive
  */
-class CacheEntryTest extends \PHPUnit_Framework_TestCase
+class CacheEntryTest extends TestCase
 {
     /**
      * @var RequestInterface
@@ -23,7 +24,7 @@ class CacheEntryTest extends \PHPUnit_Framework_TestCase
 
     private $responseHeaders = [];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->request = $this->getMockBuilder(RequestInterface::class)->getMock();

diff --git a/tests/DelegatingCacheTest.php b/tests/DelegatingCacheTest.php
@@ -28,7 +28,7 @@ class DelegatingCacheTest extends TestCase
      */
     protected $stack;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // Create default HandlerStack
         $this->stack = HandlerStack::create(function (RequestInterface $request, array $options) {

diff --git a/tests/GreedyCacheTest.php b/tests/GreedyCacheTest.php
@@ -21,7 +21,7 @@ class GreedyCacheTest extends TestCase
      */
     private $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $stack = HandlerStack::create(function (RequestInterface $request, array $options) {
             switch ($request->getUri()->getPath()) {

diff --git a/tests/HeaderExpireTest.php b/tests/HeaderExpireTest.php
@@ -28,7 +28,7 @@ class HeaderExpireTest extends TestCase
      */
     protected $sendError = false;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // Create default HandlerStack
         $stack = HandlerStack::create(function (RequestInterface $request, array $options) {

diff --git a/tests/InvalidateCacheTest.php b/tests/InvalidateCacheTest.php
@@ -16,7 +16,7 @@ class InvalidateCacheTest extends TestCase
      */
     protected $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // Create default HandlerStack
         $stack = HandlerStack::create(function () {

diff --git a/tests/NullCacheTest.php b/tests/NullCacheTest.php
@@ -13,7 +13,6 @@
 
 class NullCacheTest extends TestCase
 {
-
     public function testCacheIsNeverHit()
     {
         $stack = HandlerStack::create(new MockHandler([
@@ -33,5 +32,4 @@ public function testCacheIsNeverHit()
 
         $this->assertEquals(CacheMiddleware::HEADER_CACHE_MISS, $response->getHeaderLine(CacheMiddleware::HEADER_CACHE_INFO));
     }
-
 }
diff --git a/tests/PublicCacheTest.php b/tests/PublicCacheTest.php
@@ -33,7 +33,7 @@ class PublicCacheTest extends TestCase
      */
     protected $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // Create default HandlerStack
         $stack = HandlerStack::create(function (RequestInterface $request, array $options) {

diff --git a/tests/RequestCacheControlTest.php b/tests/RequestCacheControlTest.php
@@ -17,7 +17,7 @@ class RequestCacheControlTest extends TestCase
      */
     protected $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // Create default HandlerStack
         $stack = HandlerStack::create(function (RequestInterface $request, array $options) {
@@ -111,7 +111,7 @@ public function testOnlyIfCachedHeader()
             $response->getHeaderLine(CacheMiddleware::HEADER_CACHE_INFO)
         );
 
-        $this->setExpectedException('GuzzleHttp\Exception\ServerException', '504');
+        $this->expectException('GuzzleHttp\Exception\ServerException', '504');
         $this->client->get('http://test.com/only-if-cached', [
             'headers' => [
                 'Cache-Control' => 'only-if-cached',

diff --git a/tests/ResponseAgeTest.php b/tests/ResponseAgeTest.php
@@ -17,7 +17,7 @@ class ResponseAgeTest extends TestCase
      */
     protected $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // Create default HandlerStack
         $stack = HandlerStack::create(function (RequestInterface $request, array $options) {

diff --git a/tests/ResponseCacheControlTest.php b/tests/ResponseCacheControlTest.php
@@ -17,7 +17,7 @@ class ResponseCacheControlTest extends TestCase
      */
     protected $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // Create default HandlerStack
         $stack = HandlerStack::create(function (RequestInterface $request, array $options) {

diff --git a/tests/ResponseVaryTest.php b/tests/ResponseVaryTest.php
@@ -17,7 +17,7 @@ class ResponseVaryTest extends TestCase
      */
     protected $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // Create default HandlerStack
         $stack = HandlerStack::create(function (RequestInterface $request, array $options) {

diff --git a/tests/Strategy/GreedyCacheStrategyTest.php b/tests/Strategy/GreedyCacheStrategyTest.php
@@ -20,7 +20,7 @@ class GreedyCacheStrategyTest extends TestCase
      */
     protected $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // Create default HandlerStack
         $stack = HandlerStack::create(function (RequestInterface $request, array $options) {

diff --git a/tests/ValidationTest.php b/tests/ValidationTest.php
@@ -28,7 +28,7 @@ class ValidationTest extends TestCase
      */
     protected $cache;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // Create default HandlerStack
         $stack = HandlerStack::create(function (RequestInterface $request, array $options) {