feat: support Laravel 12 (#295)

Author: jonnott

.github/workflows/static.yml

@@ -9,4 +9,5 @@ jobs:
     name: Static analysis
     uses: monicahq/workflows/.github/workflows/static.yml@v2
     with:
-      php-version: 8.3
+      php-version: 8.4
+      with: phpstan

.github/workflows/tests.yml

@@ -26,11 +26,11 @@ jobs:
     name: Run tests
     uses: monicahq/workflows/.github/workflows/library.yml@v2
     with:
-      php-versions: "['8.1', '8.2', '8.3']"
-      laravel-versions: "['^9.0', '^10.0', '^11.0']"
-      default-php-version: '8.3'
-      default-laravel-version: '^11.0'
-      matrix-exclude: "[{'php-version': '8.1', 'laravel-version': '^11.0'}]"
+      php-versions: "['8.1', '8.2', '8.3', '8.4']"
+      laravel-versions: "['^9.0', '^10.0', '^11.0', '^12.0']"
+      default-php-version: '8.4'
+      default-laravel-version: '^12.0'
+      matrix-exclude: "[{'php-version': '8.1', 'laravel-version': '^11.0'},{'php-version': '8.1', 'laravel-version': '^12.0'}]"
       project: monicahq_laravel-cloudflare
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

composer.json

@@ -21,21 +21,21 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0"
+        "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0"
     },
     "require-dev": {
+        "brainmaestro/composer-git-hooks": "^3.0",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
-        "jschaedl/composer-git-hooks": "^4.0",
-        "larastan/larastan": "^1.0 || ^2.4",
+        "larastan/larastan": "^1.0 || ^2.4 || ^3.0",
         "laravel/pint": "^1.15",
         "mockery/mockery": "^1.4",
         "ocramius/package-versions": "^1.5 || ^2.1",
-        "orchestra/testbench": "^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-strict-rules": "^1.0",
+        "orchestra/testbench": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
+        "phpstan/phpstan-deprecation-rules": "^1.0 || ^2.0",
+        "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
+        "phpstan/phpstan-strict-rules": "^1.0 || ^2.0",
         "phpunit/phpunit": "^9.5 || ^10.0 || ^11.0",
-        "vimeo/psalm": "^4.0 || ^5.6"
+        "vimeo/psalm": "^4.0 || ^5.6 || ^6.0"
     },
     "autoload": {
         "psr-4": {

phpstan.neon

@@ -10,4 +10,3 @@ parameters:
     inferPrivatePropertyTypeFromConstructor: true
     level: 5
     ignoreErrors:
-    excludes_analyse:

phpunit.xml

@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+>
   <testsuites>
-    <testsuite name="Tests">
-      <directory suffix="Test.php">./tests/</directory>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests</directory>
     </testsuite>
   </testsuites>
+  <coverage/>
   <php>
     <env name="APP_ENV" value="testing"/>
     <env name="APP_KEY" value="base64:uA/XEme0vpegJz/rKSk3ys2uzEfXZA0Ca2P0e1M8vRU="/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>

src/CloudflareProxies.php

@@ -37,8 +37,7 @@ class CloudflareProxies
     public function __construct(
         protected Repository $config,
         protected HttpClient $http
-    ) {
-    }
+    ) {}
 
     /**
      * Retrieve Cloudflare proxies list.
@@ -72,6 +71,6 @@ protected function retrieve(string $name): array
             throw new UnexpectedValueException('Failed to load trust proxies from Cloudflare server.', 1, $e);
         }
 
-        return array_filter(explode("\n", $response->body()));
+        return array_filter(explode("\n", $response->body())); // @phpstan-ignore arrayFilter.strict
     }
 }

src/Facades/CloudflareProxies.php

@@ -14,6 +14,7 @@ class CloudflareProxies extends Facade
     /**
      * Get the registered name of the component.
      */
+    #[\Override]
     protected static function getFacadeAccessor(): string
     {
         return \Monicahq\Cloudflare\CloudflareProxies::class;

src/TrustedProxyServiceProvider.php

@@ -29,6 +29,7 @@ private function registerPublishing(): void
     /**
      * Register any package services.
      */
+    #[\Override]
     public function register(): void
     {
         $this->mergeConfigFrom(

tests/Unit/Http/Middleware/TrustProxiesTest.php

@@ -17,7 +17,7 @@ public function it_sets_trusted_proxies()
             ->with('cloudflare.proxies', \Closure::class)
             ->andReturn(['expect']);
 
-        $request = new Request();
+        $request = new Request;
 
         $this->app->make(TrustProxies::class)->handle($request, fn () => null);
 
@@ -34,7 +34,7 @@ public function it_sets_trusted_proxies_with_cache()
         });
 
         try {
-            $request = new Request();
+            $request = new Request;
 
             $this->app->make(TrustProxies::class)->handle($request, fn () => null);
 
@@ -55,7 +55,7 @@ public function it_does_not_sets_trusted_proxies()
             ->with('cloudflare.proxies', \Closure::class)
             ->andReturn([]);
 
-        $request = new Request();
+        $request = new Request;
 
         $this->app->make(TrustProxies::class)->handle($request, fn () => null);
 
@@ -69,7 +69,7 @@ public function it_deactivates_middleware()
     {
         config(['laravelcloudflare.enabled' => false]);
 
-        $request = new Request();
+        $request = new Request;
 
         $this->app->make(TrustProxies::class)->handle($request, fn () => null);
 
@@ -84,7 +84,7 @@ public function it_sets_remote_addr()
     {
         config(['laravelcloudflare.replace_ip' => true]);
 
-        $request = new Request();
+        $request = new Request;
         $request->server->set('REMOTE_ADDR', '127.0.0.1');
         $request->headers->set('Cf-Connecting-Ip', '127.0.1.1');
 

tests/Unit/LaravelCloudflareTest.php

@@ -25,7 +25,7 @@ public function it_call_callback()
         });
 
         try {
-            $request = new Request();
+            $request = new Request;
 
             $this->app->make(TrustProxies::class)->handle($request, fn () => null);
 
@@ -45,7 +45,7 @@ public function it_call_load()
             ->once()
             ->andReturn(['expect']);
 
-        $request = new Request();
+        $request = new Request;
 
         $this->app->make(TrustProxies::class)->handle($request, fn () => null);