Merge branch '7.x' into 8.x

orchestral · Nov 30, 2024 · c6215e8 · c6215e8
2 parents 5196822 + aa78608
commit c6215e8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/Foundation/Actions/CreateVendorSymlink.php b/src/Foundation/Actions/CreateVendorSymlink.php
@@ -20,7 +20,7 @@ final class CreateVendorSymlink
      * @param  string  $workingPath
      */
     public function __construct(
-        public string $workingPath
+        protected string $workingPath
     ) {}
 
     /**

diff --git a/src/Foundation/Console/Concerns/CopyTestbenchFiles.php b/src/Foundation/Console/Concerns/CopyTestbenchFiles.php
@@ -89,10 +89,17 @@ protected function copyTestbenchDotEnvFile(
         $testbenchEnvFilename = $this->testbenchEnvironmentFile();
 
         $configurationFile = LazyCollection::make(static function () use ($testbenchEnvFilename) {
+            $defaultTestbenchEnvFilename = '.env';
+
             yield $testbenchEnvFilename;
             yield "{$testbenchEnvFilename}.example";
             yield "{$testbenchEnvFilename}.dist";
-        })->map(static fn ($file) => join_paths($workingPath, $file))
+
+            yield $defaultTestbenchEnvFilename;
+            yield "{$defaultTestbenchEnvFilename}.example";
+            yield "{$defaultTestbenchEnvFilename}.dist";
+        })->unique()
+            ->map(static fn ($file) => join_paths($workingPath, $file))
             ->filter(static fn ($file) => $filesystem->isFile($file))
             ->first();
 

diff --git a/src/Workbench/Actions/AddAssetSymlinkFolders.php b/src/Workbench/Actions/AddAssetSymlinkFolders.php
@@ -21,8 +21,8 @@ final class AddAssetSymlinkFolders
      * @param  \Orchestra\Testbench\Contracts\Config  $config
      */
     public function __construct(
-        public Filesystem $files,
-        public ConfigContract $config
+        protected Filesystem $files,
+        protected ConfigContract $config
     ) {}
 
     /**

diff --git a/src/Workbench/Actions/RemoveAssetSymlinkFolders.php b/src/Workbench/Actions/RemoveAssetSymlinkFolders.php
@@ -20,8 +20,8 @@ final class RemoveAssetSymlinkFolders
      * @param  \Orchestra\Testbench\Contracts\Config  $config
      */
     public function __construct(
-        public Filesystem $files,
-        public ConfigContract $config
+        protected Filesystem $files,
+        protected ConfigContract $config
     ) {}
 
     /**