PHP 8.5 support (#368)

* Add PHP 8.5 to ci

Signed-off-by: Pushpak Chhajed <[email protected]>

* Add PHP 8.5 Guidelines

Signed-off-by: Pushpak Chhajed <[email protected]>

* Refine PHP 8.5 guidelines

Signed-off-by: Pushpak Chhajed <[email protected]>

* Update matrix to include PHP 8.5 compatibility

Signed-off-by: Pushpak Chhajed <[email protected]>

* Move fixtures to Fixtures

Signed-off-by: Pushpak Chhajed <[email protected]>

* fix Test

Signed-off-by: Pushpak Chhajed <[email protected]>

* Fix code styling

* Fix Test

Signed-off-by: Pushpak Chhajed <[email protected]>

* Fix Test

Signed-off-by: Pushpak Chhajed <[email protected]>

* Fix Test

Signed-off-by: Pushpak Chhajed <[email protected]>

* Formatting

Signed-off-by: Pushpak Chhajed <[email protected]>

---------

Signed-off-by: Pushpak Chhajed <[email protected]>

Author: pushpak1300

.ai/php/8.5/core.blade.php

@@ -0,0 +1,17 @@
+## PHP 8.5
+
+- PHP 8.5 has new array functions that will make code simpler whenever we don't use Laravel's collections.
+    - `array_first(array $array): mixed` - Get first value (or `null` if empty)
+    - `array_last(array $array): mixed` - Get last value (or `null` if empty)
+
+- Use `clone($object, ['property' => $value])` to modify properties during cloning—ideal for readonly classes.
+
+### Pipe Operator
+- The pipe operator (`|>`) chains function calls left-to-right, replacing nested calls:
+<code-snippet name="Pipe Operator Example" lang="php">
+// Before PHP 8.5
+$slug = strtolower(str_replace(' ', '-', trim($title)));
+
+// After PHP 8.5
+$slug = $title |> trim(...) |> (fn($s) => str_replace(' ', '-', $s)) |> strtolower(...);
+</code-snippet>

.github/workflows/tests.yml

@@ -25,6 +25,13 @@ jobs:
         os: [ ubuntu-22.04, windows-latest ]
         php: [ 8.2, 8.3, 8.4 ]
         laravel: [ 11, 12 ]
+        include:
+          - php: 8.5
+            laravel: 12
+            os: ubuntu-22.04
+          - php: 8.5
+            laravel: 12
+            os: windows-latest
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.os }}
 

composer.json

@@ -24,10 +24,10 @@
         "laravel/roster": "^0.2.9"
     },
     "require-dev": {
-        "laravel/pint": "1.20",
+        "laravel/pint": "^1.20.0",
         "mockery/mockery": "^1.6.12",
         "orchestra/testbench": "^8.36.0|^9.15.0|^10.6",
-        "pestphp/pest": "^2.36.0|^3.8.4",
+        "pestphp/pest": "^2.36.0|^3.8.4|^4.1.5",
         "phpstan/phpstan": "^2.1.27",
         "rector/rector": "^2.1"
     },

tests/Feature/Console/InstallCommandMultiselectTest.php

@@ -78,15 +78,11 @@
     );
 
     // Verify we get keys that can be used with in_array checks
-    expect($result)->toBeArray();
-    expect($result)->toHaveCount(3); // All 3 selected (2 default + 1 added)
-
-    // These are the exact checks used in InstallCommand
-    expect(in_array('mcp_server', $result, true))->toBeTrue();
-    expect(in_array('ai_guidelines', $result, true))->toBeTrue();
-    expect(in_array('style_guidelines', $result, true))->toBeTrue();
-
-    // Verify it doesn't contain the display values
-    expect(in_array('Boost MCP Server', $result, true))->toBeFalse();
-    expect(in_array('Package AI Guidelines (i.e. Framework, Inertia, Pest)', $result, true))->toBeFalse();
+    expect($result)->toBeArray()
+        ->and($result)->toHaveCount(3)
+        ->and($result)->toContain('mcp_server')
+        ->and($result)->toContain('ai_guidelines')
+        ->and($result)->toContain('style_guidelines')
+        ->and($result)->not->toContain('Boost MCP Server')
+        ->and($result)->not->toContain('Package AI Guidelines (i.e. Framework, Inertia, Pest)');
 })->skipOnWindows();

tests/Feature/Install/GuidelineComposerTest.php

@@ -313,7 +313,7 @@
     $composer = Mockery::mock(GuidelineComposer::class, [$this->roster, $this->herd])->makePartial();
     $composer
         ->shouldReceive('customGuidelinePath')
-        ->andReturnUsing(fn ($path = ''): string => realpath(testDirectory('fixtures/.ai/guidelines')).'/'.ltrim((string) $path, '/'));
+        ->andReturnUsing(fn ($path = ''): string => realpath(testDirectory('Fixtures/.ai/guidelines')).'/'.ltrim((string) $path, '/'));
 
     expect($composer->compose())
         ->toContain('=== .ai/custom-rule rules ===')
@@ -336,7 +336,7 @@
     $composer = Mockery::mock(GuidelineComposer::class, [$this->roster, $this->herd])->makePartial();
     $composer
         ->shouldReceive('customGuidelinePath')
-        ->andReturnUsing(fn ($path = ''): string => realpath(testDirectory('fixtures/.ai/guidelines')).'/'.ltrim((string) $path, '/'));
+        ->andReturnUsing(fn ($path = ''): string => realpath(testDirectory('Fixtures/.ai/guidelines')).'/'.ltrim((string) $path, '/'));
 
     $guidelines = $composer->compose();
     $overrideStringCount = substr_count((string) $guidelines, 'Thanks though, appreciate you');
@@ -442,7 +442,7 @@
     $composer = Mockery::mock(GuidelineComposer::class, [$this->roster, $this->herd])->makePartial();
     $composer
         ->shouldReceive('customGuidelinePath')
-        ->andReturnUsing(fn ($path = ''): string => realpath(testDirectory('fixtures/.ai/guidelines')).'/'.ltrim((string) $path, '/'));
+        ->andReturnUsing(fn ($path = ''): string => realpath(testDirectory('Fixtures/.ai/guidelines')).'/'.ltrim((string) $path, '/'));
 
     $guidelines = $composer->compose();
 
@@ -640,7 +640,7 @@
     $composer = Mockery::mock(GuidelineComposer::class, [$this->roster, $this->herd])->makePartial();
     $composer
         ->shouldReceive('customGuidelinePath')
-        ->andReturnUsing(fn ($path = ''): string => realpath(testDirectory('fixtures/.ai/guidelines')).'/'.ltrim((string) $path, '/'));
+        ->andReturnUsing(fn ($path = ''): string => realpath(testDirectory('Fixtures/.ai/guidelines')).'/'.ltrim((string) $path, '/'));
 
     $packages = new PackageCollection([
         new Package(Packages::LARAVEL, 'laravel/framework', '11.0.0'),

tests/Feature/Middleware/InjectBoostTest.php

@@ -16,7 +16,7 @@
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 beforeEach(function (): void {
-    $this->app['view']->addNamespace('test', __DIR__.'/../../fixtures');
+    $this->app['view']->addNamespace('test', __DIR__.'/../../Fixtures');
 });
 
 function createMiddlewareResponse($response): SymfonyResponse