Symfony 4.4 compatibility

.github/workflows/ci.yaml

@@ -21,23 +21,22 @@ jobs:
           php-version: '${{ matrix.php-versions }}'
           extensions: mbstring,intl,mongodb
           tools: composer:v2
-      - name: Get composer cache directory
-        id: composercache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composercache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
         run: composer update ${{ matrix.composer.flags }}
       - name: PHPUnit
         run: composer test
 
   static-analysis:
-    name: Static analysis
+    name: Static analysis (PHP ${{ matrix.php-versions }}) (${{ matrix.composer.name }} dependencies)
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: ['7.4', '8.0']
+        composer:
+          - {name: "lowest", flags: " --prefer-dist --prefer-lowest"}
+          - {name: "stable", flags: " --prefer-dist --prefer-stable"}
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -47,17 +46,8 @@ jobs:
           php-version: '8.0'
           extensions: mbstring,intl,mongodb
           tools: composer:v2
-      - name: Get composer cache directory
-        id: composercache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composercache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --prefer-dist
+        run: composer update ${{ matrix.composer.flags }}
       - name: PHPStan
         run: composer phpstan
 

composer.json

@@ -34,7 +34,7 @@
     },
     "require-dev": {
         "symfony/var-dumper": "^4.0||^5.0",
-        "phpunit/phpunit": "^9.1",
+        "phpunit/phpunit": "^9.5",
         "phpspec/prophecy": "^1.11",
         "phpspec/prophecy-phpunit": "^2.0",
         "friendsofphp/php-cs-fixer": "^2.16",

src/Http/KernelHandler.php

@@ -32,7 +32,7 @@ public function __construct(HttpKernelInterface $kernel)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function handle(Request $request): \Iterator
     {

src/Http/MiddlewareStack.php

@@ -64,7 +64,7 @@ public function __construct(SplStack $middlewares, RequestHandlerInterface $hand
         $this->iterators = new SplStack();
     }
 
-    public function handle(Request $request, int $type = self::MASTER_REQUEST, bool $catch = true): Response
+    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
     {
         if ($this->middlewares->isEmpty()) {
             $gen = $this->handler->handle($request);

src/Integration/PHP/NativeSessionMiddleware.php

@@ -57,22 +57,20 @@ private function addSessionCookie(Response $response, string $sessionId): void
             return;
         }
 
-        $cookie = Cookie::create($sessionName)
-            ->withValue($sessionId)
-            ->withPath($params['path'])
-            ->withDomain($params['domain'])
-            ->withSecure($params['secure'])
-            ->withHttpOnly($params['httponly'])
-        ;
+        $expire = 0;
 
         if ($params['lifetime'] > 0) {
-            $cookie = $cookie->withExpires(time() + $params['lifetime']);
+            $expire = time() + $params['lifetime'];
         }
 
+        $sameSite = null;
+
         if ($params['samesite']) {
-            $cookie = $cookie->withSameSite($params['samesite']);
+            $sameSite = $params['samesite'];
         }
 
+        $cookie = Cookie::create($sessionName, $sessionId, $expire, $params['path'], $params['domain'], $params['secure'], $params['httponly'], false, $sameSite);
+
         $response->headers->setCookie($cookie);
     }
 }

tests/Integration/Doctrine/DoctrineORMMiddlewareTest.php

@@ -47,7 +47,7 @@ public function setUp(): void
 
         $this->request = Request::create('https://example.org');
         $this->handler = new class() implements HttpKernelInterface {
-            public function handle(Request $request, int $type = self::MASTER_REQUEST, bool $catch = true)
+            public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
             {
                 return new Response();
             }

tests/Integration/PHP/NativeSessionMiddlewareTest.php

@@ -142,7 +142,7 @@ public function __construct(\Closure $handler)
                 $this->handler = $handler;
             }
 
-            public function handle(Request $request, int $type = self::MASTER_REQUEST, bool $catch = true)
+            public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
             {
                 return ($this->handler)($request);
             }

tests/Integration/Sentry/SentryMiddlewareTest.php

@@ -48,7 +48,7 @@ public function __construct(SentryMiddlewareTest $test)
                 $this->test = $test;
             }
 
-            public function handle(Request $request, int $type = self::MASTER_REQUEST, bool $catch = true)
+            public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
             {
                 return ($this->test->onRequest)($request);
             }