Merge branch '7.x' into develop

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

CHANGELOG-7.x.md

@@ -2,6 +2,24 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench`.
 
+## 7.40.1
+
+Released: 2024-01-19
+
+### Changes
+
+* Update minimum support for Testbench Core v7.40.1+. ([v7.40.0...v7.40.1](https://github.com/orchestral/testbench-core/compare/v7.40.0...v7.40.1))
+
+#### Testbench Changes
+
+##### Changes
+
+* Support nested configuration files.
+
+##### Fixes
+
+* Fixes issue with Livewire testing where calling `$router->getRoutes()->refreshActionLookups()` caused tests to fail.
+
 ## 7.40.0
 
 Released: 2024-01-19
@@ -14,8 +32,6 @@ Released: 2024-01-19
 
 ##### Added
 
-### Added
-
 * Added `Orchestra\Testbench\Attributes\WithImmutableDates` attribute to force `Illuminate\Support\Date` to use `Carbon\CarbonImmutable`.
 * Added following helper functions:
     - `Orchestra\Testbench\default_skeleton_path`

bin/sync

@@ -31,7 +31,8 @@ Illuminate\Support\Collection::make([
 });
 
 Illuminate\Support\Collection::make([
-    ...$files->glob("{$workingPath}/core/workbench/config/*"),
+    ...$files->glob("{$workingPath}/core/workbench/config/*.php"),
+    ...$files->glob("{$workingPath}/core/workbench/config/*/*.php"),
     ...$files->glob("{$workingPath}/core/workbench/database/migrations/*"),
     ...$files->glob("{$workingPath}/core/workbench/lang/en/*"),
     ...$files->glob("{$workingPath}/core/workbench/routes/*"),

workbench/config/nested/workbench.php

@@ -0,0 +1,7 @@
+<?php
+
+use Composer\InstalledVersions;
+
+return [
+    'installed' => InstalledVersions::isInstalled('orchestra/workbench'),
+];