.github/workflows/audits.yaml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - '*.x'
+      - '!7.x'
+      - '!8.x'
   pull_request:
   workflow_dispatch:
 

CHANGELOG-7.x.md

@@ -2,13 +2,34 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench-core`.
 
+## 7.54.0
+
+Released: 2025-03-06
+
+### Added
+
+* Added `resolvePhpUnitTestClassName()` and `resolvePhpUnitTestMethodName()` to `Orchestra\Testbench\Concerns\InteractsWithPHPUnit` trait.
+
+### Changes
+
+* Allows `usesTestingFeature()` to register attribute directly on test method.
+* Improves `vendor` detection on the default skeleton.
+* Utilise `Orchestra\Sidekick\is_symlink()` function instead of `is_link()` to improves support on Windows.
+* Use `::class` instead of `get_class()`.
+* Delete `vendor` symlink via `package:purge-skeleton` command.
+
+### Fixes
+
+* Fix static variable via `Orchestra\Testbench\Attributes\UsesVendor::beforeEach()` method.
+
 ## 7.53.0
 
 Released: 2025-02-19
 
 ### Added
 
 * Use `orchestra/sidekick`.
+* Implements `Illuminate\Foundation\Testing\Concerns\InteractsWithViews`.
 
 ### Deprecated
 

CHANGELOG-8.x.md

@@ -2,13 +2,36 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench-core`.
 
+## 8.35.0
+
+Released: 2025-03-06
+
+### Added
+
+* Added `resolvePhpUnitTestClassName()` and `resolvePhpUnitTestMethodName()` to `Orchestra\Testbench\Concerns\InteractsWithPHPUnit` trait.
+
+### Changes
+
+* Allows `usesTestingFeature()` to register attribute directly on test method.
+* Improves `vendor` detection on the default skeleton.
+* Utilise `Orchestra\Sidekick\is_symlink()` function instead of `is_link()` to improves support on Windows.
+* Use `::class` instead of `get_class()`.
+* Delete `vendor` symlink via `package:purge-skeleton` command.
+
+### Fixes
+
+* Fix static variable via `Orchestra\Testbench\Attributes\UsesVendor::beforeEach()` method.
+
+Changelog: [v8.34.0...8.x](https://github.com/orchestral/testbench-core/compare/v8.34.0...8.x)
+
 ## 8.34.0
 
 Released: 2025-02-19
 
 ### Added
 
 * Use `orchestra/sidekick`.
+* Implements `Illuminate\Foundation\Testing\Concerns\InteractsWithViews`.
 
 ### Deprecated
 

bin/configure-skeleton.php

@@ -61,6 +61,14 @@
         $files->replaceInFile(['{{tableClassName}}', '{{table}}'], [Illuminate\Support\Str::studly($table), $table], "{$workingPath}/laravel/migrations/{$migration}.php");
     });
 
+transform([
+    line("require __DIR__.'/vendor/autoload.php';") => line("require __DIR__.'/bootstrap/autoload.php';"),
+], fn ($changes) => $files->replaceInFile(array_keys($changes), array_values($changes), "{$workingPath}/laravel/artisan"));
+
+transform([
+    line("require __DIR__.'/../vendor/autoload.php';") => line("require __DIR__.'/../bootstrap/autoload.php';"),
+], fn ($changes) => $files->replaceInFile(array_keys($changes), array_values($changes), "{$workingPath}/laravel/public/index.php"));
+
 transform([
     line('APP_KEY=', 0) => line('APP_KEY=AckfSECXIvnK5r28GVIWUAxmbBSjTsmF', 0),
     line('DB_CONNECTION=mysql', 0) => line('DB_CONNECTION=sqlite', 0),

bin/sync

@@ -44,7 +44,7 @@ $files->put("{$workingPath}/laravel/bootstrap/.testbench-default-skeleton", '@te
  * ----------------------------------------------------------------------
  */
 
-require Orchestra\Testbench\join_paths(__DIR__, 'configure-skeleton.php');
+require Orchestra\Sidekick\join_paths(__DIR__, 'configure-skeleton.php');
 
 transform([
     line('App\Providers', 2) => line('// App\Providers', 2),

composer.json

@@ -38,14 +38,15 @@
     "require": {
         "php": "^8.1",
         "composer-runtime-api": "^2.2",
-        "orchestra/sidekick": "^1.0.2",
+        "orchestra/sidekick": "^1.0.5",
+        "symfony/deprecation-contracts": "^2.5|^3.0",
         "symfony/polyfill-php83": "^1.31"
     },
     "require-dev": {
         "fakerphp/faker": "^1.21",
         "laravel/framework": "^10.48.28",
         "laravel/pint": "^1.20",
-        "laravel/serializable-closure": "^1.3 || ^2.0",
+        "laravel/serializable-closure": "^1.3|^2.0",
         "mockery/mockery": "^1.5.1",
         "phpstan/phpstan": "^2.1",
         "phpunit/phpunit": "^10.1",
@@ -55,24 +56,24 @@
         "vlucas/phpdotenv": "^5.4.1"
     },
     "conflict": {
-        "brianium/paratest": "<6.4.0 || >=7.0.0 <7.1.4 || >=8.0.0",
-        "laravel/framework": "<10.48.28 || >=11.0.0",
-        "laravel/serializable-closure": "<1.3.0 || >=3.0.0",
-        "nunomaduro/collision": "<6.4.0 || >=7.0.0 <7.4.0 || >=8.0.0",
-        "orchestra/testbench-dusk": "<8.32.0 || >=9.0.0",
+        "brianium/paratest": "<6.4.0|>=7.0.0 <7.1.4|>=8.0.0",
+        "laravel/framework": "<10.48.28|>=11.0.0",
+        "laravel/serializable-closure": "<1.3.0|>=3.0.0",
+        "nunomaduro/collision": "<6.4.0|>=7.0.0 <7.4.0|>=8.0.0",
+        "orchestra/testbench-dusk": "<8.32.0|>=9.0.0",
         "orchestra/workbench": "<1.0.0",
-        "phpunit/phpunit": "<9.6.0 || >=10.3.0 <10.3.3 || >=10.6.0"
+        "phpunit/phpunit": "<9.6.0|>=10.3.0 <10.3.3|>=10.6.0"
     },
     "suggest": {
         "ext-pcntl": "Required to use all features of the console signal trapping.",
-        "brianium/paratest": "Allow using parallel testing (^6.4 || ^7.1.4).",
+        "brianium/paratest": "Allow using parallel testing (^6.4|^7.1.4).",
         "fakerphp/faker": "Allow using Faker for testing (^1.21).",
         "laravel/framework": "Required for testing (^10.48.28).",
         "mockery/mockery": "Allow using Mockery for testing (^1.5.1).",
-        "nunomaduro/collision": "Allow using Laravel style tests output and parallel testing (^6.4 || ^7.4).",
+        "nunomaduro/collision": "Allow using Laravel style tests output and parallel testing (^6.4|^7.4).",
         "orchestra/testbench-browser-kit": "Allow using legacy Laravel BrowserKit for testing (^8.0).",
         "orchestra/testbench-dusk": "Allow using Laravel Dusk for testing (^8.0).",
-        "phpunit/phpunit": "Allow using PHPUnit for testing (^9.6 || ^10.1).",
+        "phpunit/phpunit": "Allow using PHPUnit for testing (^9.6|^10.1).",
         "symfony/process": "Required to use Orchestra\\Testbench\\remote function (^6.2).",
         "symfony/yaml": "Required for Testbench CLI (^6.2).",
         "vlucas/phpdotenv": "Required for Testbench CLI (^5.4.1)."
@@ -108,6 +109,11 @@
             "@php bin/sync",
             "@lint"
         ],
+        "sync-dev": [
+            "@clear",
+            "@php bin/sync --dev",
+            "@lint"
+        ],
         "ci": [
             "@composer audit",
             "@post-autoload-dump",

laravel/artisan

@@ -15,7 +15,7 @@ define('LARAVEL_START', microtime(true));
 |
 */
 
-require __DIR__.'/vendor/autoload.php';
+require __DIR__.'/bootstrap/autoload.php';
 
 $app = require_once __DIR__.'/bootstrap/app.php';
 

laravel/bootstrap/app.php

@@ -33,10 +33,6 @@
     );
 };
 
-if (! defined('TESTBENCH_WORKING_PATH') && is_string(getenv('TESTBENCH_WORKING_PATH'))) {
-    define('TESTBENCH_WORKING_PATH', getenv('TESTBENCH_WORKING_PATH'));
-}
-
 $app = $createApp(realpath(join_paths(__DIR__, '..')));
 
 unset($createApp);

laravel/bootstrap/autoload.php

@@ -0,0 +1,9 @@
+<?php
+
+if (! defined('TESTBENCH_WORKING_PATH') && is_string(getenv('TESTBENCH_WORKING_PATH'))) {
+    define('TESTBENCH_WORKING_PATH', getenv('TESTBENCH_WORKING_PATH'));
+}
+
+$workingPath = defined('TESTBENCH_WORKING_PATH') ? TESTBENCH_WORKING_PATH : realpath(__DIR__.'/../');
+
+require $workingPath.'/vendor/autoload.php';

laravel/composer.json

@@ -16,10 +16,5 @@
             "Tests\\": "tests/"
         }
     },
-    "extra": {
-        "laravel": {
-            "dont-discover": []
-        }
-    },
     "minimum-stability": "dev"
 }

laravel/public/index.php

@@ -31,7 +31,7 @@
 |
 */
 
-require __DIR__.'/../vendor/autoload.php';
+require __DIR__.'/../bootstrap/autoload.php';
 
 /*
 |--------------------------------------------------------------------------

src/Attributes/UsesVendor.php

@@ -3,10 +3,12 @@
 namespace Orchestra\Testbench\Attributes;
 
 use Attribute;
+use Illuminate\Foundation\Application;
+use Illuminate\Support\Facades\Facade;
 use Orchestra\Testbench\Contracts\Attributes\AfterEach as AfterEachContract;
 use Orchestra\Testbench\Contracts\Attributes\BeforeEach as BeforeEachContract;
 use Orchestra\Testbench\Foundation\Actions\DeleteVendorSymlink;
-use Orchestra\Testbench\Foundation\Application;
+use Orchestra\Testbench\Foundation\Application as Testbench;
 
 use function Orchestra\Testbench\package_path;
 
@@ -26,9 +28,14 @@ final class UsesVendor implements AfterEachContract, BeforeEachContract
      */
     public function beforeEach($app): void
     {
-        $laravel = Application::createVendorSymlink(base_path(), package_path('vendor'));
+        $laravel = Testbench::createVendorSymlink(base_path(), package_path('vendor'));
 
         $this->vendorSymlinkCreated = $laravel['TESTBENCH_VENDOR_SYMLINK'] ?? false;
+
+        Facade::clearResolvedInstances();
+        Facade::setFacadeApplication($app);
+
+        Application::setInstance($app);
     }
 
     /**

src/Concerns/CreatesApplication.php

@@ -217,13 +217,13 @@ protected function getPackageProviders($app)
     /**
      * Resolve the application's base path.
      *
-     * @api
+     * @internal
      *
      * @return string
      */
     protected function getApplicationBasePath()
     {
-        return $this->getBasePath() ?? static::applicationBasePath();
+        return static::applicationBasePath();
     }
 
     /**
@@ -233,11 +233,13 @@ protected function getApplicationBasePath()
      *
      * @return string|null
      *
-     * @deprecated 6.22.0 Use `getApplicationBasePath()` instead.
+     * @deprecated 6.22.0 Use `applicationBasePath()` static method instead.
      */
     protected function getBasePath()
     {
-        return null;
+        trigger_deprecation('orchestra/testbench-core', '6.22.0', 'Use `%s` static method instead.', 'applicationBasePath()');
+
+        return static::applicationBasePath();
     }
 
     /**

src/Concerns/HandlesRoutes.php

@@ -2,11 +2,13 @@
 
 namespace Orchestra\Testbench\Concerns;
 
+use Attribute;
 use Closure;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\Application as LaravelApplication;
 use Laravel\SerializableClosure\SerializableClosure;
 use Orchestra\Testbench\Attributes\DefineRoute;
+use Orchestra\Testbench\Attributes\UsesVendor;
 use Orchestra\Testbench\Features\TestingFeature;
 use Orchestra\Testbench\Foundation\Application;
 use Orchestra\Testbench\Foundation\Bootstrap\SyncTestbenchCachedRoutes;
@@ -20,6 +22,9 @@
  */
 trait HandlesRoutes
 {
+    use InteractsWithPHPUnit;
+    use InteractsWithTestCase;
+
     /**
      * Indicates if we have made it through the requireApplicationCachedRoutes function.
      *
@@ -106,6 +111,16 @@ protected function defineStashRoutes(Closure|string $route): void
      */
     protected function defineCacheRoutes(Closure|string $route, bool $cached = true): void
     {
+        static::usesTestingFeature($attribute = new UsesVendor, Attribute::TARGET_METHOD);
+
+        if (
+            $this->app instanceof LaravelApplication
+            && property_exists($this, 'setUpHasRun')
+            && $this->setUpHasRun === true
+        ) {
+            $attribute->beforeEach($this->app);
+        }
+
         $files = new Filesystem;
 
         $time = time();