Merge branch '7.x' into develop

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
orchestral · Aug 29, 2023 · 3480d2b · 3480d2b
2 parents 71d3fff + 5e0ca45
commit 3480d2b
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 62 deletions.
diff --git a/composer.json b/composer.json
@@ -24,8 +24,8 @@
         "fakerphp/faker": "^1.21",
         "laravel/framework": ">=10.17.0 <10.21.0",
         "mockery/mockery": "^1.5.1",
-        "orchestra/testbench-core": ">=8.9.1 <8.10.0",
-        "orchestra/workbench": "^0.1.7 || ^0.2.0",
+        "orchestra/testbench-core": ">=8.10.0 <8.11.0 || 8.x-dev",
+        "orchestra/workbench": "^0.2.4",
         "phpunit/phpunit": "^9.6 || ^10.1",
         "spatie/laravel-ray": "^1.32.4",
         "symfony/process": "^6.2",

diff --git a/core b/core
diff --git a/sync.sh b/sync.sh
@@ -10,4 +10,3 @@ git submodule foreach git checkout $BRANCH
 git submodule foreach git pull
 
 cp -rf core/testbench.yaml ./
-cp -rf core/workbench ./
diff --git a/workbench/.gitignore b/workbench/.gitignore
diff --git a/workbench/app/Providers/TestbenchServiceProvider.php b/workbench/app/Providers/TestbenchServiceProvider.php
diff --git a/workbench/database/migrations/2013_07_26_182750_create_testbench_users_table.php b/workbench/database/migrations/2013_07_26_182750_create_testbench_users_table.php