Bump phpstan to 2.x and level up to 10 (#33)

* Bump phpstan to 2.x and level up to 10

* Tweak asserts

* Tweak asserts

* Update README.md

Author: barryvdh

README.md

@@ -1,7 +1,7 @@
 # CORS for PHP (using the Symfony HttpFoundation)
 
 [![Unit Tests](https://github.com/fruitcake/php-cors/actions/workflows/run-tests.yml/badge.svg)](https://github.com/fruitcake/php-cors/actions)
-[![PHPStan Level 9](https://img.shields.io/badge/PHPStan-Level%209-blue)](https://github.com/fruitcake/php-cors/actions)
+[![PHPStan Level 9](https://img.shields.io/badge/PHPStan-Level%2010-blue)](https://github.com/fruitcake/php-cors/actions)
 [![Code Coverage](https://img.shields.io/badge/CodeCoverage-100%25-brightgreen)](https://github.com/fruitcake/php-cors/actions/workflows/run-coverage.yml)
 [![Packagist License](https://img.shields.io/badge/Licence-MIT-blue)](http://choosealicense.com/licenses/mit/)
 [![Latest Stable Version](https://img.shields.io/packagist/v/fruitcake/php-cors?label=Stable)](https://packagist.org/packages/fruitcake/php-cors)

composer.json

@@ -22,7 +22,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9",
         "squizlabs/php_codesniffer": "^3.5",
-        "phpstan/phpstan": "^1.4"
+        "phpstan/phpstan": "^2"
     },
     "autoload": {
         "psr-4": {
@@ -37,7 +37,7 @@
     "scripts": {
         "actions": "composer test && composer analyse && composer check-style",
         "test": "phpunit",
-        "analyse": "phpstan analyse src tests --level=9",
+        "analyse": "phpstan analyse src tests --level=10",
         "check-style": "phpcs -p --standard=PSR12 --exclude=Generic.Files.LineLength --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
         "fix-style": "phpcbf -p --standard=PSR12 --exclude=Generic.Files.LineLength --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests"
     },

tests/CorsServiceTest.php

@@ -49,8 +49,6 @@ public function itCanHaveOptions(): void
 
         $service = new CorsService($options);
 
-        $this->assertInstanceOf(CorsService::class, $service);
-
         $normalized = $this->getOptionsFromService($service);
 
         $this->assertEquals($options['allowedOrigins'], $normalized['allowedOrigins']);
@@ -71,8 +69,6 @@ public function itCanSetOptions(): void
         $normalized = $this->getOptionsFromService($service);
         $this->assertEquals([], $normalized['allowedOrigins']);
 
-        $this->assertInstanceOf(CorsService::class, $service);
-
         $options = [
             'allowedOrigins' => ['localhost'],
             'allowedOriginsPatterns' => ['/something/'],
@@ -106,8 +102,6 @@ public function itCanOverwriteSetOptions(): void
 
         $this->assertEquals(['example.com'], $normalized['allowedOrigins']);
 
-        $this->assertInstanceOf(CorsService::class, $service);
-
         $options = [
             'allowedOrigins' => ['localhost'],
             'allowedOriginsPatterns' => ['/something/'],
@@ -137,8 +131,6 @@ public function itCanOverwriteSetOptions(): void
     public function itCanHaveNoOptions(): void
     {
         $service = new CorsService();
-        $this->assertInstanceOf(CorsService::class, $service);
-
         $normalized = $this->getOptionsFromService($service);
 
         $this->assertEquals([], $normalized['allowedOrigins']);
@@ -147,7 +139,7 @@ public function itCanHaveNoOptions(): void
         $this->assertEquals([], $normalized['allowedMethods']);
         $this->assertEquals([], $normalized['exposedHeaders']);
         $this->assertEquals(0, $normalized['maxAge']);
-        $this->assertEquals(false, $normalized['supportsCredentials']);
+        $this->assertFalse($normalized['supportsCredentials']);
     }
 
     /**
@@ -156,8 +148,6 @@ public function itCanHaveNoOptions(): void
     public function itCanHaveEmptyOptions(): void
     {
         $service = new CorsService([]);
-        $this->assertInstanceOf(CorsService::class, $service);
-
         $normalized = $this->getOptionsFromService($service);
 
         $this->assertEquals([], $normalized['allowedOrigins']);
@@ -166,7 +156,7 @@ public function itCanHaveEmptyOptions(): void
         $this->assertEquals([], $normalized['allowedMethods']);
         $this->assertEquals([], $normalized['exposedHeaders']);
         $this->assertEquals(0, $normalized['maxAge']);
-        $this->assertEquals(false, $normalized['supportsCredentials']);
+        $this->assertFalse($normalized['supportsCredentials']);
     }
 
     /**
@@ -224,8 +214,6 @@ public function itThrowsExceptionOnInvalidOriginsArray(): void
     public function itNormalizesWildcardOrigins(): void
     {
         $service = new CorsService(['allowedOrigins' => ['*']]);
-        $this->assertInstanceOf(CorsService::class, $service);
-
         $this->assertTrue($this->getOptionsFromService($service)['allowAllOrigins']);
     }
 
@@ -235,8 +223,6 @@ public function itNormalizesWildcardOrigins(): void
     public function itNormalizesWildcardHeaders(): void
     {
         $service = new CorsService(['allowedHeaders' => ['*']]);
-        $this->assertInstanceOf(CorsService::class, $service);
-
         $this->assertTrue($this->getOptionsFromService($service)['allowAllHeaders']);
     }
 
@@ -246,8 +232,6 @@ public function itNormalizesWildcardHeaders(): void
     public function itNormalizesWildcardMethods(): void
     {
         $service = new CorsService(['allowedMethods' => ['*']]);
-        $this->assertInstanceOf(CorsService::class, $service);
-
         $this->assertTrue($this->getOptionsFromService($service)['allowAllMethods']);
     }
 
@@ -257,7 +241,6 @@ public function itNormalizesWildcardMethods(): void
     public function itConvertsWildcardOriginPatterns(): void
     {
         $service = new CorsService(['allowedOrigins' => ['*.mydomain.com']]);
-        $this->assertInstanceOf(CorsService::class, $service);
 
         $patterns = $this->getOptionsFromService($service)['allowedOriginsPatterns'];
         $this->assertEquals(['#^.*\.mydomain\.com\z#u'], $patterns);
@@ -279,7 +262,6 @@ public function itNormalizesUnderscoreOptions(): void
         ];
 
         $service = new CorsService($options);
-        $this->assertInstanceOf(CorsService::class, $service);
 
         $this->assertEquals($options['allowed_origins'], $this->getOptionsFromService($service)['allowedOrigins']);
         $this->assertEquals(