Merge pull request #10 from fruitcake/feat-php74plus

Drop support for legacy versions

Author: barryvdh

.github/workflows/run-coverage.yml

@@ -10,10 +10,6 @@ jobs:
   php-tests:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        php: [8.1]
-
     name: PHP Code Coverage
 
     steps:

.github/workflows/run-tests.yml

@@ -12,16 +12,12 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0, 8.1]
-        symfony: [4.x, 5.x, 6.x]
+        php: [7.4, 8.0, 8.1]
+        symfony: [^4.4, ^5.4, ^6]
         dependency-version: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
         exclude:
-          - symfony: 6.x
-            php: 7.2
-          - symfony: 6.x
-            php: 7.3
-          - symfony: 6.x
+          - symfony: ^6
             php: 7.4
 
     name: PHP${{ matrix.php }} Symfony${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
@@ -49,7 +45,7 @@ jobs:
 
     - name: Analyse with PHPStan
       run: composer analyse
-      if: matrix.os == 'ubuntu-latest' && matrix.symfony != '4.x'
+      if: matrix.os == 'ubuntu-latest' && matrix.symfony != '^4.4'
 
     - name: Check PSR-12 Codestyle
       run: composer test

composer.json

@@ -6,17 +6,21 @@
     "type": "library",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Fruitcake",
+            "homepage": "https://fruitcake.nl"
+        },
         {
             "name": "Barryvdh",
             "email": "[email protected]"
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
-        "symfony/http-foundation": "^4|^5|^6"
+        "php": "^7.4|^8.0",
+        "symfony/http-foundation": "^4.4|^5.4|^6"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7|^9",
+        "phpunit/phpunit": "^9",
         "squizlabs/php_codesniffer": "^3.5",
         "phpstan/phpstan": "^1.4"
     },

src/CorsService.php

@@ -38,26 +38,21 @@
 class CorsService
 {
     /** @var string[]  */
-    private $allowedOrigins = [];
+    private array $allowedOrigins = [];
     /** @var string[] */
-    private $allowedOriginsPatterns = [];
+    private array $allowedOriginsPatterns = [];
     /** @var string[] */
-    private $allowedMethods = [];
+    private array $allowedMethods = [];
     /** @var string[] */
-    private $allowedHeaders = [];
+    private array $allowedHeaders = [];
     /** @var string[] */
-    private $exposedHeaders = [];
-    /** @var bool */
-    private $supportsCredentials = false;
-    /** @var null|int */
-    private $maxAge = 0;
-
-    /** @var bool */
-    private $allowAllOrigins = false;
-    /** @var bool */
-    private $allowAllMethods = false;
-    /** @var bool */
-    private $allowAllHeaders = false;
+    private array $exposedHeaders = [];
+    private bool $supportsCredentials = false;
+    private ?int $maxAge = 0;
+
+    private bool $allowAllOrigins = false;
+    private bool $allowAllMethods = false;
+    private bool $allowAllHeaders = false;
 
     /**
      * @param CorsInputOptions $options
@@ -93,26 +88,9 @@ public function setOptions(array $options): void
         $exposedHeaders = $options['exposedHeaders'] ?? $options['exposed_headers'] ?? $this->exposedHeaders;
         $this->exposedHeaders = $exposedHeaders === false ? [] : $exposedHeaders;
 
-        $this->validateOptions();
         $this->normalizeOptions();
     }
 
-    private function validateOptions(): void
-    {
-        $arrayHeaders = [
-            'allowedOrigins',
-            'allowedOriginsPatterns',
-            'allowedHeaders',
-            'allowedMethods',
-            'exposedHeaders',
-        ];
-        foreach ($arrayHeaders as $key) {
-            if (!is_array($this->{$key})) {
-                throw new InvalidOptionException("CORS option `{$key}` should be an array");
-            }
-        }
-    }
-
     private function normalizeOptions(): void
     {
         // Normalize case

tests/CorsServiceTest.php

@@ -201,7 +201,7 @@ public function itAllowsZeroMaxAge(): void
      */
     public function itThrowsExceptionOnInvalidExposedHeaders(): void
     {
-        $this->expectException(InvalidOptionException::class);
+        $this->expectException(\TypeError::class);
 
         /** @phpstan-ignore-next-line */
         $service = new CorsService(['exposedHeaders' => true]);
@@ -212,7 +212,7 @@ public function itThrowsExceptionOnInvalidExposedHeaders(): void
      */
     public function itThrowsExceptionOnInvalidOriginsArray(): void
     {
-        $this->expectException(InvalidOptionException::class);
+        $this->expectException(\TypeError::class);
 
         /** @phpstan-ignore-next-line */
         $service = new CorsService(['allowedOrigins' => 'string']);