Merge branch '1.x' into bug/cache-hit-still-sends-body

Author: akrabat

.github/workflows/tests.yml

@@ -0,0 +1,36 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  tests:
+    name: Tests PHP ${{ matrix.php }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5]
+        include:
+          - php: 8.4
+            analysis: true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up PHP ${{ matrix.php }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Coding standards
+        if: matrix.analysis
+        run: vendor/bin/phpcs
+
+      - name: Tests
+        run: vendor/bin/phpunit --coverage-clover clover.xml
+

.travis.yml

@@ -1,8 +1,8 @@
 # Slim Framework HTTP Cache
 
-[![Build Status](https://travis-ci.com/slimphp/Slim-HttpCache.svg?branch=1.x)](https://travis-ci.com/slimphp/Slim-HttpCache)
+[![Build Status](https://github.com/slimphp/Slim-HttpCache/actions/workflows/tests.yml/badge.svg?branch=1.x)](https://github.com/slimphp/Slim-HttpCache/actions)
 [![Coverage Status](https://coveralls.io/repos/github/slimphp/Slim-HttpCache/badge.svg?branch=1.x)](https://coveralls.io/github/slimphp/Slim-HttpCache?branch=1.x)
-[![Latest Stable Version](https://poser.pugx.org/slim/http-cache/v)](//packagist.org/packages/slim/http-cache)
+[![Latest Stable Version](https://poser.pugx.org/slim/http-cache/v)](https://packagist.org/packages/slim/http-cache)
 [![License](https://poser.pugx.org/slim/http-cache/license)](https://packagist.org/packages/slim/http-cache)
 
 This repository contains a Slim Framework HTTP cache middleware and service provider.
@@ -11,7 +11,7 @@ This repository contains a Slim Framework HTTP cache middleware and service prov
 
 Via Composer
 
-``` bash
+```bash
 $ composer require slim/http-cache
 ```
 

README.md

@@ -19,7 +19,7 @@
   ],
   "require": {
     "php": "^7.2 || ^8.0",
-    "psr/http-message": "^1.0",
+    "psr/http-message": "^1.1 || ^2.0",
     "psr/http-server-middleware": "^1.0"
   },
   "require-dev": {

composer.json

@@ -15,7 +15,6 @@
 use function gmdate;
 use function in_array;
 use function is_integer;
-use function is_null;
 use function strtotime;
 use function time;
 
@@ -43,7 +42,7 @@ public function allowCache(
         }
         $headerValue = $type;
         if ($maxAge || is_integer($maxAge)) {
-            if (!is_integer($maxAge) && !is_null($maxAge)) {
+            if (!is_integer($maxAge) && $maxAge !== null) {
                 $maxAge = strtotime($maxAge) - time();
             }
             $headerValue = $headerValue.', max-age='.$maxAge;

src/CacheProvider.php

@@ -50,7 +50,7 @@ protected function createResponse(): ResponseInterface
      *
      * @return RequestHandlerInterface
      */
-    protected function createRequestHandler(ResponseInterface $response = null): RequestHandlerInterface
+    protected function createRequestHandler(?ResponseInterface $response): RequestHandlerInterface
     {
         $response = $response ?? $this->createResponse();
 
@@ -74,7 +74,7 @@ public function testCacheControlHeader()
         $cache = $this->createCache('public', 86400);
         $req = $this->requestFactory();
 
-        $res = $cache->process($req, $this->createRequestHandler());
+        $res = $cache->process($req, $this->createRequestHandler(null));
 
         $cacheControl = $res->getHeaderLine('Cache-Control');
 
@@ -86,7 +86,7 @@ public function testCacheControlHeaderWithMustRevalidate()
         $cache = $this->createCache('private', 86400, true);
         $req = $this->requestFactory();
 
-        $res = $cache->process($req, $this->createRequestHandler());
+        $res = $cache->process($req, $this->createRequestHandler(null));
 
         $cacheControl = $res->getHeaderLine('Cache-Control');
 
@@ -98,7 +98,7 @@ public function testCacheControlHeaderWithZeroMaxAge()
         $cache = $this->createCache('private', 0, false);
         $req = $this->requestFactory();
 
-        $res = $cache->process($req, $this->createRequestHandler());
+        $res = $cache->process($req, $this->createRequestHandler(null));
 
         $cacheControl = $res->getHeaderLine('Cache-Control');