Merge branch '9.x' into 10.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Sep 24, 2024 · 1107125 · 1107125
2 parents f69461b + a040a69
commit 1107125
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 5 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,12 +5,8 @@
 /bin export-ignore
 /workbench export-ignore
 /.github export-ignore
-/.coveralls.yml export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.gitmodules export-ignore
-/.travis.yml export-ignore
-/phpunit9.xml export-ignore
 /phpunit.xml export-ignore
 /testbench.yaml export-ignore
 /CHANGELOG-*.md export-ignore

diff --git a/CHANGELOG-8.x.md b/CHANGELOG-8.x.md
@@ -2,6 +2,62 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench`.
 
+## 8.27.0
+
+Released: 2024-09-23
+
+### Changes
+
+* Update minimum support for Testbench Core v8.28.1+. ([v8.27.0...v8.28.1](https://github.com/orchestral/testbench-core/compare/v8.27.0...v8.28.1))
+
+#### Testbench Changes
+
+##### Added
+
+* Added `markTestSkippedWhen()` and `markTestSkippedUnless()` assertion helper to conditionally handle `markTestSkipped()`.
+* Added `Orchestra\Testbench\default_migration_path()` helper function.
+* Added `Orchestra\Testbench\laravel_vendor_exists()` helper function.
+* Allows TestCase to inherit Attributes defined on parent TestCase by @BlackLanzer in #233.
+
+##### Changes
+
+* Allow Testbench to delete `vendor` symlink directory if it was created while running tests.
+
+##### Fixes
+
+* Fixes `view.paths` configuration not being updated to include `workbench/resources/views` due to IoC booting sequence.
+* Fixes compatibility with PHPUnit 10.3.
+
+##### Deprecated
+
+* Deprecated `Orchestra\Testbench\laravel_migration_path()`, use `default_migration_path()` instead.
+
+<!--
+#### New Contributors
+* @BlackLanzer made their first contribution in https://github.com/orchestral/testbench-core/pull/233
+-->
+
+## 8.26.0
+
+Released: 2024-08-26
+
+### Changes
+
+* Update minimum support for Testbench Core v8.27.0+. ([v8.26.0...v8.27.0](https://github.com/orchestral/testbench-core/compare/v8.26.0...v8.27.0))
+
+#### Testbench Changes
+
+##### Added
+
+* Added `artisan` binary to Laravel skeleton.
+* Added `Orchestra\Testbench\join_paths()` function.
+* Added `Orchestra\Testbench\Attributes\UsesVendor` attribute class.
+* Added `defineStashRoutes()` method to register adhoc route for test.
+
+##### Changes
+
+* Improvements to `Orchestra\Testbench\default_skeleton_path()`, `Orchestra\Testbench\package_path()`, and `Orchestra\Testbench\workbench_path()` usage based on new `Orchestra\Testbench\join_paths()` function.
+
 ## 8.25.0
 
 Released: 2024-08-14

diff --git a/CHANGELOG-9.x.md b/CHANGELOG-9.x.md
@@ -2,6 +2,62 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench`.
 
+## 9.5.0
+
+Released: 2024-09-23
+
+### Changes
+
+* Update minimum support for Testbench Core v9.5.0+. ([v9.4.0...v9.5.0](https://github.com/orchestral/testbench-core/compare/v9.4.0...v9.5.0))
+
+#### Testbench Changes
+
+##### Added
+
+* Added `Orchestra\Testbench\Attributes\RequiresDatabase` attribute class.
+* Added `markTestSkippedWhen()` and `markTestSkippedUnless()` assertion helper to conditionally handle `markTestSkipped()`.
+* Added `Orchestra\Testbench\default_migration_path()` helper function.
+* Added `Orchestra\Testbench\laravel_vendor_exists()` helper function.
+* Allows TestCase to inherit Attributes defined on parent TestCase by @BlackLanzer in #233.
+
+### Changes
+
+* Allow Testbench to delete `vendor` symlink directory if it was created while running tests.
+
+### Fixes
+
+* Fixes `view.paths` configuration not being updated to include `workbench/resources/views` due to IoC booting sequence.
+
+### Deprecated
+
+* Deprecated `Orchestra\Testbench\laravel_migration_path()`, use `default_migration_path()` instead.
+
+<!--
+#### New Contributors
+* @BlackLanzer made their first contribution in https://github.com/orchestral/testbench-core/pull/233
+-->
+
+## 9.4.0
+
+Released: 2024-08-26
+
+### Changes
+
+* Update minimum support for Testbench Core v9.4.0+. ([v9.3.0...v9.4.0](https://github.com/orchestral/testbench-core/compare/v9.3.0...v9.4.0))
+
+#### Testbench Changes
+
+##### Added
+
+* Added `artisan` binary to Laravel skeleton.
+* Added `Orchestra\Testbench\join_paths()` function.
+* Added `Orchestra\Testbench\Attributes\UsesVendor` attribute class.
+* Added `defineStashRoutes()` method to register adhoc route for test.
+
+### Changes
+
+* Improvements to `Orchestra\Testbench\default_skeleton_path()`, `Orchestra\Testbench\package_path()`, and `Orchestra\Testbench\workbench_path()` usage based on new `Orchestra\Testbench\join_paths()` function.
+
 ## 9.3.0
 
 Released: 2024-08-14

diff --git a/bin/sync b/bin/sync
@@ -23,7 +23,7 @@ Illuminate\Support\Collection::make([
 });
 
 Illuminate\Support\Collection::make([
-    ...$files->glob("{$workingPath}/core/workbench/bootstrap/*"),
+    ...$files->glob("{$workingPath}/core/workbench/bootstrap/*.php"),
     ...$files->allFiles("{$workingPath}/vendor/orchestra/testbench-core/workbench/config/"),
     ...$files->allFiles("{$workingPath}/vendor/orchestra/testbench-core/workbench/database/"),
     ...$files->allFiles("{$workingPath}/vendor/orchestra/testbench-core/workbench/lang/"),

diff --git a/workbench/resources/views/errors/418.blade.php b/workbench/resources/views/errors/418.blade.php
@@ -0,0 +1 @@
+I&#039;m a teapot
diff --git a/workbench/routes/web.php b/workbench/routes/web.php
@@ -19,3 +19,6 @@
 
 Route::view('/testbench', 'workbench::testbench')->name('testbench');
 Route::text('/hello-world', 'Hello world');
+Route::get('/root', function () {
+    abort(418);
+});