Support Symfony 7. (#104)

* Support Symfony 7.

* Update php versions

* Update run-tests.yml

* Test 8.3

* Add argument types.

---------

Co-authored-by: Barry vd. Heuvel <barryvdh@gmail.com>

.github/workflows/run-tests.yml

@@ -6,23 +6,38 @@ on:
 
 jobs:
  php-tests:
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
 
  strategy:
  matrix:
- php: [7.2, 7.3, 7.4, 8.0, 8.1]
- symfony: [4.x, 5.x, 6.x]
+ php: [8.1, 8.2, 8.3]
+ symfony: [6.x]
  dependency-version: [prefer-lowest, prefer-stable]
  os: [ubuntu-latest]
- exclude:
- - symfony: 6.x
- php: 7.2
- - symfony: 6.x
+ include:
+ - symfony: ^5.3
  php: 7.3
- - symfony: 6.x
+ dependency-version: prefer-lowest
+ - symfony: ^5.3
+ php: 7.3
+ dependency-version: prefer-stable
+ - symfony: ^5.3
  php: 7.4
-
- name: PHP${{ matrix.php }} Symfony${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
+ dependency-version: prefer-stable
+ - symfony: ^5.3
+ php: 8.1
+ dependency-version: prefer-stable
+ - symfony: ^7
+ php: 8.2
+ dependency-version: prefer-lowest
+ - symfony: ^7
+ php: 8.2
+ dependency-version: prefer-stable
+ - symfony: ^7
+ php: 8.3
+ dependency-version: prefer-stable
+
+ name: PHP${{ matrix.php }} Symfony${{ matrix.symfony }} - ${{ matrix.dependency-version }}
 
  steps:
  - name: Checkout code

composer.json

@@ -12,12 +12,12 @@
  }
  ],
  "require": {
- "php": "^7.2|^8.0",
- "symfony/http-foundation": "^4|^5|^6",
- "symfony/http-kernel": "^4|^5|^6"
+ "php": "^7.3|^8.0",
+ "symfony/http-foundation": "^5.3|^6|^7",
+ "symfony/http-kernel": "^5.3|^6|^7"
  },
  "require-dev": {
- "phpunit/phpunit": "^7|^9",
+ "phpunit/phpunit": "^9",
  "squizlabs/php_codesniffer": "^3.5"
  },
  "autoload": {
@@ -39,5 +39,7 @@
  "branch-alias": {
  "dev-master": "2.1-dev"
  }
- }
+ },
+ "minimum-stability": "beta",
+ "prefer-stable": true
 }

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, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true): Response
+ public function handle(Request $request, int $type = HttpKernelInterface::MAIN_REQUEST, bool $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, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true): Response
+ public function handle(Request $request, int $type = HttpKernelInterface::MAIN_REQUEST, bool $catch = true): Response
  {
  $response = new Response();