Re-support Symfony 4 and 5 (#99)

* Test Symfony 4,5,6
* Use signature for both new and old versions

.github/workflows/run-tests.yml

@@ -10,11 +10,23 @@ jobs:
 
  strategy:
  matrix:
- php: [8.0, 8.1]
+ php: [7.1, 7.2, 7.3, 7.4, 8.0, 8.1]
+ symfony: [4.x, 5.x, 6.x]
  dependency-version: [prefer-lowest, prefer-stable]
  os: [ubuntu-latest]
-
- name: PHP${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
+ exclude:
+ - symfony: 5.x
+ php: 7.1
+ - symfony: 6.x
+ php: 7.1
+ - symfony: 6.x
+ php: 7.2
+ - symfony: 6.x
+ php: 7.3
+ - symfony: 6.x
+ php: 7.4
+
+ name: PHP${{ matrix.php }} Symfony${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
 
  steps:
  - name: Checkout code
@@ -28,7 +40,8 @@ jobs:
 
  - name: Install dependencies
  run: |
- composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+ composer require "symfony/http-foundation:${{ matrix.symfony }}" "symfony/http-kernel:${{ matrix.symfony }}" --no-interaction --no-update
+ composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest --with-all-dependencies
 
  - name: Execute Unit Tests
  run: vendor/bin/phpunit

composer.json

@@ -12,12 +12,12 @@
  }
  ],
  "require": {
- "php": "^8.0",
- "symfony/http-foundation": "^6",
- "symfony/http-kernel": "^6"
+ "php": "^7.1.3|^8.0",
+ "symfony/http-foundation": "^4|^5|^6",
+ "symfony/http-kernel": "^4|^5|^6"
  },
  "require-dev": {
- "phpunit/phpunit": "^9",
+ "phpunit/phpunit": "^7|^9",
  "squizlabs/php_codesniffer": "^3.5"
  },
  "autoload": {

src/Cors.php

@@ -43,7 +43,7 @@ public function __construct(HttpKernelInterface $app, array $options = [])
  $this->cors = new CorsService(array_merge($this->defaultOptions, $options));
  }
 
- public function handle(Request $request, int $type = HttpKernelInterface::MAIN_REQUEST, bool $catch = true): Response
+ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true): Response
  {
  if ($this->cors->isPreflightRequest($request)) {
  $response = $this->cors->handlePreflightRequest($request);

tests/MockApp.php

@@ -16,7 +16,7 @@ public function __construct(array $responseHeaders)
  $this->responseHeaders = $responseHeaders;
  }
 
- public function handle(Request $request, int $type = HttpKernelInterface::MAIN_REQUEST, bool $catch = true): Response
+ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true): Response
  {
  $response = new Response();