Merge pull request #46 from laravel-shift/l12-compatibility

Laravel 12.x Compatibility

Author: owenvoke

.github/workflows/phpstan.yml

@@ -22,7 +22,7 @@ jobs:
 
       - name: Install composer dependencies
         run: |
-          composer require "larastan/larastan:^2.6"
+          composer require "larastan/larastan:^3.0"
           composer update --prefer-dist --no-interaction
 
       - name: Run PHPStan

.github/workflows/run-tests.yml

@@ -2,25 +2,28 @@ name: run-tests
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
   pull_request:
-    branches: [main]
+    branches:
+      - main
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.2, 8.3]
-        laravel: [10.*, 11.*]
+        php: [8.2, 8.3, 8.4]
+        laravel: ['11.*', '12.*']
         stability: [prefer-stable]
         include:
-          - laravel: 10.*
-            testbench: 8.*
           - laravel: 11.*
             testbench: 9.*
+          - laravel: 12.*
+            testbench: 10.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

README.md

@@ -1,5 +1,5 @@
-
 # Envy
+
 Automate keeping your environment files in sync.
 
 [![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/worksome/envy/run-tests.yml?branch=main)](https://github.com/worksome/envy/actions?query=workflow%3Arun-tests+branch%3Amain)

composer.json

@@ -17,19 +17,19 @@
     ],
     "require": {
         "php": "^8.2",
-        "illuminate/contracts": "^10.0 || ^11.0",
+        "illuminate/contracts": "^11.0 || ^12.0",
         "nikic/php-parser": "^4.19.1 || ^5.0.2",
         "nunomaduro/termwind": "^1.15 || ^2.0",
         "spatie/laravel-package-tools": "^1.16",
-        "thecodingmachine/safe": "^2.4 || ^3.0"
+        "thecodingmachine/safe": "^2.5 || ^3.0"
     },
     "require-dev": {
-        "nunomaduro/collision": "^7.0 || ^8.1",
-        "larastan/larastan": "^2.6",
-        "orchestra/testbench": "^8.0 || ^9.0",
-        "pestphp/pest": "^2.33",
-        "pestphp/pest-plugin-laravel": "^2.2",
-        "worksome/coding-style": "^2.8"
+        "nunomaduro/collision": "^8.1",
+        "larastan/larastan": "^3.0",
+        "orchestra/testbench": "^9.0 || ^10.0",
+        "pestphp/pest": "^3.7",
+        "pestphp/pest-plugin-laravel": "^3.1",
+        "worksome/coding-style": "^3.1"
     },
     "autoload": {
         "psr-4": {

src/Commands/PruneCommand.php

@@ -68,9 +68,12 @@ public function handle(Envy $envy, BladeCompiler $blade): int
      */
     private function getPendingPrunes(Envy $envy): Collection
     {
+        /** @var string|null $path */
+        $path = $this->option('path');
+
         return $envy->pendingPrunes(
             $envy->environmentCalls(),
-            $this->option('path') ? [strval($this->option('path'))] : null
+            $path ? [strval($path)] : null
         );
     }
 
@@ -110,6 +113,7 @@ private function askWhatWeShouldDoNext(bool $configFileHasBeenPublished): string
             self::ACTION_CANCEL => true,
         ])->filter()->keys()->all();
 
+        // @phpstan-ignore return.type
         return $this->option('force')
             ? self::ACTION_PRUNE_ENVIRONMENT_FILE
             : strval($this->choice(

src/Commands/SyncCommand.php

@@ -70,9 +70,12 @@ public function handle(Envy $envy, Repository $config, BladeCompiler $blade): in
      */
     private function getPendingPrunes(Envy $envy, Repository $config): Collection
     {
+        /** @var string|null $path */
+        $path = $this->option('path');
+
         return $envy->pendingUpdates(
             $envy->environmentCalls(boolval($config->get('envy.exclude_calls_with_defaults', false))),
-            $this->option('path') ? [strval($this->option('path'))] : null,
+            $path ? [strval($path)] : null,
         );
     }
 
@@ -114,6 +117,7 @@ private function askWhatWeShouldDoNext(bool $configFileHasBeenPublished): string
             self::ACTION_CANCEL => true,
         ])->filter()->keys()->all();
 
+        // @phpstan-ignore return.type
         return $this->option('force')
             ? self::ACTION_ADD_TO_ENVIRONMENT_FILE
             : strval($this->choice(

src/Envy.php

@@ -40,7 +40,6 @@ public function environmentCalls(bool $excludeCallsWithDefaults = false): Collec
         return collect($this->finder->configFilePaths())
             ->map(fn (string $path) => ($this->findEnvironmentCalls)($path, $excludeCallsWithDefaults))
             ->flatten()
-            // @phpstan-ignore-next-line
             ->sortBy(fn (EnvironmentCall $call) => $call->getKey());
     }
 
@@ -92,9 +91,7 @@ public function updateExclusionsWithPendingUpdates(Collection $pendingUpdates):
         /** @var Collection<int, EnvironmentVariable> $updates */
         $updates = $pendingUpdates
             ->flatten()
-            // @phpstan-ignore-next-line
             ->unique(fn (EnvironmentCall $environmentCall) => $environmentCall->getKey())
-            // @phpstan-ignore-next-line
             ->map(fn (EnvironmentCall $environmentCall) => new EnvironmentVariable(
                 $environmentCall->getKey(),
                 $environmentCall->getDefault() ?? ''
@@ -161,7 +158,6 @@ public function updateInclusionsWithPendingPrunes(Collection $pendingPrunes): vo
         /** @var Collection<int, EnvironmentVariable> $environmentVariables */
         $environmentVariables = $pendingPrunes
             ->flatten()
-            // @phpstan-ignore-next-line
             ->map(fn (string $key) => new EnvironmentVariable($key, ''));
 
         ($this->addEnvironmentVariablesToList)($environmentVariables, AddsEnvironmentVariablesToList::INCLUSIONS);

src/EnvyServiceProvider.php

@@ -77,6 +77,18 @@ public function packageRegistered(): void
         $this->app->bind(PrunesEnvironmentFile::class, PruneEnvironmentFile::class);
     }
 
+    /**
+     * @return array{
+     *     environment_files?: list<string>,
+     *     config_files?: list<string>,
+     *     display_comments?: bool,
+     *     display_location_hints?: bool,
+     *     display_default_values?: bool,
+     *     exclude_calls_with_defaults?: bool,
+     *     exclusions?: list<string>,
+     *     inclusions?: list<string>,
+     * }
+     */
     private function config(): array
     {
         // @phpstan-ignore-next-line

src/Support/PhpParser/AppendEnvironmentVariablesNodeVisitor.php

@@ -21,7 +21,7 @@ public function __construct(private Collection $updates, private string $arrayKe
     {
     }
 
-    public function leaveNode(Node $node)
+    public function leaveNode(Node $node): Node
     {
         if (! $node instanceof Node\Expr\Array_) {
             return $node;

src/Support/PhpParser/EnvCallNodeVisitor.php

@@ -30,7 +30,7 @@ public function __construct(
         private readonly string $filePath,
         private readonly bool $excludeVariablesWithDefaults = false,
     ) {
-        $this->environmentVariables = collect();
+        $this->environmentVariables = new Collection();
         $this->printer = new Standard();
     }