Merge pull request #3442 from maksimovic/3.x-php85

Author: akrabat

.github/workflows/tests.yml

@@ -1,49 +1,51 @@
 name: Tests
 
-on: [push, pull_request]
+on:
+    push:
+        branches: [3.x]
+    pull_request:
 
 jobs:
     tests:
-        name: Tests PHP ${{ matrix.php }}
+        name: PHP ${{ matrix.php }}
         runs-on: ubuntu-latest
-        continue-on-error: ${{ matrix.experimental }}
         strategy:
             fail-fast: false
             matrix:
-                php: [7.3, 7.4, 8.0]
-                experimental: [false]
+                php: ['8.1', '8.2', '8.3', '8.4', '8.5']
                 include:
-                    - php: 8.0
-                      analysis: true
-                    - php: 8.1
-                      experimental: true
+                    - php: '8.5'
+                      coverage: 'xdebug'
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Set up PHP ${{ matrix.php }}
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
-                  coverage: xdebug
+                  coverage: ${{ matrix.coverage || 'none' }}
 
             - name: Install dependencies with Composer
-              uses: ramsey/composer-install@v1
+              uses: ramsey/composer-install@v3
 
             - name: Coding standards
-              if: matrix.analysis
               run: vendor/bin/phpcs
 
             - name: Static analysis
-              if: matrix.analysis
-              run: vendor/bin/phpstan
+              run: vendor/bin/phpstan analyse --memory-limit=512M
 
             - name: Tests
+              if: ${{ !matrix.coverage }}
+              run: vendor/bin/phpunit
+
+            - name: Tests with coverage
+              if: ${{ matrix.coverage }}
               run: vendor/bin/phpunit --coverage-clover clover.xml
 
             - name: Upload coverage results to Coveralls
-              if: matrix.analysis
+              if: ${{ matrix.coverage }}
               env:
                   COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               run: |

.gitignore

@@ -4,3 +4,4 @@ coverage
 vendor
 .DS_Store
 .idea
+.phpunit.result.cache

.travis.yml

@@ -16,7 +16,12 @@ It's recommended that you use [Composer](https://getcomposer.org/) to install Sl
 $ composer require slim/slim "^3.0"
 ```
 
-This will install Slim and all required dependencies. Slim requires PHP 5.5.0 or newer.
+This will install Slim and all required dependencies. 
+
+## Version compatibility
+
+- Slim version 3.13.0 requires PHP 8.1 or newer.   
+- Slim version 3.12.x and below requires PHP 5.5 – PHP 8.1.
 
 ## Usage
 

README.md

@@ -547,7 +547,7 @@ public function subRequest(
         array $headers = [],
         array $cookies = [],
         $bodyContent = '',
-        ResponseInterface $response = null
+        ?ResponseInterface $response = null
     ) {
         $env = $this->container->get('environment');
         $uri = Uri::createFromEnvironment($env)->withPath($path)->withQuery($query);
@@ -663,7 +663,7 @@ protected function isEmptyResponse(ResponseInterface $response)
      */
     protected function isHeadRequest(RequestInterface $request)
     {
-        return strtoupper($request->getMethod()) === 'HEAD';
+        return strtoupper((string)$request->getMethod()) === 'HEAD';
     }
 
     /**

Slim/App.php

@@ -16,6 +16,8 @@
  * This class provides a common interface used by many other
  * classes in a Slim application that manage "collections"
  * of data that must be inspected and/or manipulated
+ *
+ * @phpstan-consistent-constructor
  */
 class Collection implements CollectionInterface
 {
@@ -109,6 +111,7 @@ public function clear()
      *
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($key)
     {
         return $this->has($key);
@@ -121,6 +124,7 @@ public function offsetExists($key)
      *
      * @return mixed The key's value, or the default value
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($key)
     {
         return $this->get($key);
@@ -132,6 +136,7 @@ public function offsetGet($key)
      * @param string $key   The data key
      * @param mixed  $value The data value
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($key, $value)
     {
         $this->set($key, $value);
@@ -142,6 +147,7 @@ public function offsetSet($key, $value)
      *
      * @param string $key The data key
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($key)
     {
         $this->remove($key);
@@ -152,6 +158,7 @@ public function offsetUnset($key)
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return count($this->data);
@@ -162,6 +169,7 @@ public function count()
      *
      * @return ArrayIterator
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->data);

Slim/Collection.php

@@ -111,7 +111,7 @@ public function get($id)
             if ($this->exceptionThrownByContainer($exception)) {
                 throw new SlimContainerException(
                     sprintf('Container error while retrieving "%s"', $id),
-                    null,
+                    0,
                     $exception
                 );
             } else {

Slim/Container.php

@@ -28,7 +28,7 @@ class DeferredCallable
      * @param callable|string $callable
      * @param ContainerInterface $container
      */
-    public function __construct($callable, ContainerInterface $container = null)
+    public function __construct($callable, ?ContainerInterface $container = null)
     {
         $this->callable = $callable;
         $this->container = $container;

Slim/DeferredCallable.php

@@ -36,7 +36,7 @@ abstract class AbstractHandler
      */
     protected function determineContentType(ServerRequestInterface $request)
     {
-        $acceptHeader = $request->getHeaderLine('Accept');
+        $acceptHeader = (string)$request->getHeaderLine('Accept');
         $selectedContentTypes = array_intersect(explode(',', $acceptHeader), $this->knownContentTypes);
 
         if (count($selectedContentTypes)) {

Slim/Handlers/AbstractHandler.php

@@ -25,6 +25,8 @@
  * @link https://github.com/php-fig/http-message/blob/master/src/MessageInterface.php
  * @link https://github.com/php-fig/http-message/blob/master/src/RequestInterface.php
  * @link https://github.com/php-fig/http-message/blob/master/src/ServerRequestInterface.php
+ *
+ * @phpstan-consistent-constructor
  */
 class Request extends Message implements ServerRequestInterface
 {
@@ -490,7 +492,7 @@ public function getRequestTarget()
         } else {
             $basePath = '';
         }
-        $path = $this->uri->getPath();
+        $path = (string)$this->uri->getPath();
         $path = $basePath . '/' . ltrim($path, '/');
 
         $query = $this->uri->getQuery();
@@ -1011,7 +1013,7 @@ public function getParsedBody()
             return null;
         }
 
-        $mediaType = $this->getMediaType();
+        $mediaType = (string)$this->getMediaType();
 
         // Check if this specific media type has a parser registered first
         if (!isset($this->bodyParsers[$mediaType])) {
@@ -1188,7 +1190,7 @@ public function getQueryParam($key, $default = null)
      *
      * @return mixed[]
      */
-    public function getParams(array $only = null)
+    public function getParams(?array $only = null)
     {
         $params = $this->getQueryParams();
         $postParams = $this->getParsedBody();