Merge branch 'develop' into 8.x

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
orchestral · Sep 25, 2023 · 7483bd0 · 7483bd0
2 parents c793f19 + b40f171
commit 7483bd0
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 3 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -110,7 +110,7 @@ jobs:
         run: composer show -D
 
       - name: Execute tests
-        run: vendor/bin/phpunit --exclude-group commander,core,database,workbench --no-coverage --no-configuration --dont-report-useless-tests --bootstrap vendor/autoload.php core/tests
+        run: vendor/bin/phpunit --exclude-group commander,core,database,workbench,phpunit-configuration --no-coverage --no-configuration --dont-report-useless-tests --bootstrap vendor/autoload.php core/tests
         env:
           RAY_ENABLED: false
           TESTBENCH_CONVERT_DEPRECATIONS_TO_EXCEPTIONS: true

diff --git a/CHANGELOG-7.x.md b/CHANGELOG-7.x.md
@@ -2,6 +2,25 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench`.
 
+## 7.32.0
+
+Released: 2023-09-25
+
+### Changes
+
+* Update minimum support for Testbench Core v7.32.0+. ([v7.31.0...v7.32.0](https://github.com/orchestral/testbench-core/compare/v7.31.0...v7.32.0))
+* Update minimum support for Workbench 0.4.0+.
+
+#### Testbench Changes
+
+##### Added Added
+
+* Added `cachedConfigurationForWorkbench()` to `Orchestra\Testbench\Concern\InteractsWithWorkbench` trait.
+* Add the ability to read `TESTBENCH_WORKING_PATH` from environment variables for Testbench Dusk usage.
+* Supports Workbench `discovers` configuration.
+* Add the ability to properly forward Environment Variables.
+* Add `usesSqliteInMemoryDatabaseConnection` to `Orchestra\Testbench\Concerns\HandlesDatabases` trait.
+
 ## 7.31.0
 
 Released: 2023-09-19

diff --git a/CHANGELOG-8.x.md b/CHANGELOG-8.x.md
@@ -2,6 +2,25 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench`.
 
+## 8.12.0
+
+Released: 2023-09-25
+
+### Changes
+
+* Update minimum support for Testbench Core v8.12.0+. ([v8.11.1...v8.12.0](https://github.com/orchestral/testbench-core/compare/v8.11.1...v8.12.0))
+* Update minimum support for Workbench 0.4.0+.
+
+#### Testbench Changes
+
+##### Added Added
+
+* Added `cachedConfigurationForWorkbench()` to `Orchestra\Testbench\Concern\InteractsWithWorkbench` trait.
+* Add the ability to read `TESTBENCH_WORKING_PATH` from environment variables for Testbench Dusk usage.
+* Supports Workbench `discovers` configuration.
+* Add the ability to properly forward Environment Variables.
+* Add `usesSqliteInMemoryDatabaseConnection` to `Orchestra\Testbench\Concerns\HandlesDatabases` trait.
+
 ## 8.11.1
 
 Released: 2023-09-20

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "laravel/framework": "10.x-dev",
         "mockery/mockery": "^1.5.1",
         "orchestra/testbench-core": "8.x-dev",
-        "orchestra/workbench": "0.3.x-dev || dev-master",
+        "orchestra/workbench": "0.4.x-dev || dev-master",
         "phpunit/phpunit": "^9.6 || ^10.1",
         "spatie/laravel-ray": "^1.32.4",
         "symfony/process": "^6.2",

diff --git a/core b/core
+2 −2		.github/workflows/tests.yaml
+28 −0		CHANGELOG-7.x.md
+29 −0		CHANGELOG-8.x.md
+4 −1		bin/sync
+1 −1		composer.json
+1 −1		laravel/config/database.php
+0 −1		laravel/config/mail.php
+1 −1		src/Bootstrap/HandleExceptions.php
+1 −1		src/Bootstrap/LoadEnvironmentVariables.php
+24 −0		src/Concerns/HandlesDatabases.php
+4 −0		src/Concerns/InteractsWithPHPUnit.php
+40 −4		src/Concerns/InteractsWithPublishedFiles.php
+35 −14		src/Concerns/InteractsWithWorkbench.php
+16 −1		src/Concerns/WithLaravelMigrations.php
+1 −2		src/Concerns/WithWorkbench.php
+0 −1		src/Foundation/Application.php
+1 −1		src/Foundation/Bootstrap/EnsuresDefaultConfiguration.php
+1 −1		src/Foundation/Bootstrap/LoadEnvironmentVariablesFromArray.php
+1 −1		src/Foundation/Bootstrap/LoadMigrationsFromArray.php
+1 −1		src/Foundation/Bootstrap/StartWorkbench.php
+41 −3		src/Foundation/Config.php
+17 −5		src/Foundation/Console/TestCommand.php
+32 −0		src/Foundation/Env.php
+4 −0		src/TestCase.php
+52 −0		tests/AssertPublishedFilesTest.php
+2 −1		tests/Databases/MigrateWithLaravelMigrationsTest.php
+2 −1		tests/Databases/RefreshDatabaseTest.php
+15 −2		tests/DefaultConfigurationTest.php
+10 −0		tests/Foundation/ConfigTest.php
+34 −0		tests/Foundation/EnvTest.php
+18 −0		tests/Integrations/EncryptionTest.php
+6 −0		tests/TestbenchTest.php
+29 −3		tests/WithWorkbenchTest.php
+13 −0		tests/Workbench/HelpersTest.php