Merge branch '7.x' into 8.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Aug 22, 2023 · 39428ca · 39428ca
2 parents b0e7321 + 8ec4b82
commit 39428ca
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 9 deletions.
diff --git a/.phpunit.cache/test-results b/.phpunit.cache/test-results
diff --git a/composer.json b/composer.json
@@ -23,10 +23,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Orchestra\\Canvas\\Tests\\": "tests/",
-            "Workbench\\App\\": "workbench/app/",
-            "Workbench\\Database\\Factories\\": "workbench/database/factories/",
-            "Workbench\\Database\\Seeders\\": "workbench/database/seeders/"
+            "Orchestra\\Canvas\\Tests\\": "tests/"
         }
     },
     "require": {
@@ -68,8 +65,8 @@
         "clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
         "prepare": "@php vendor/bin/testbench package:discover --ansi",
         "lint": [
-            "@php vendor/bin/phpstan analyse",
-            "@php vendor/bin/pint"
+            "@php vendor/bin/pint",
+            "@php vendor/bin/phpstan analyse"
         ],
         "test": "@php vendor/bin/phpunit -c ./ --color",
         "ci": [

diff --git a/src/Presets/PackageWorkbench.php b/src/Presets/PackageWorkbench.php
@@ -3,7 +3,6 @@
 namespace Orchestra\Canvas\Presets;
 
 use Orchestra\Canvas\Core\Presets\Preset;
-use Orchestra\Workbench\Workbench;
 
 use function Orchestra\Testbench\workbench_path;
 

diff --git a/tests/Feature/Presets/PackageWorkbenchTest.php b/tests/Feature/Presets/PackageWorkbenchTest.php
@@ -6,7 +6,6 @@
 use Orchestra\Canvas\Presets\PackageWorkbench;
 use Orchestra\Testbench\Concerns\WithWorkbench;
 use Orchestra\Testbench\TestCase;
-use Orchestra\Workbench\Workbench;
 
 use function Orchestra\Testbench\package_path;
 use function Orchestra\Testbench\workbench_path;

diff --git a/workbench/database/factories/.gitkeep b/workbench/database/factories/.gitkeep
diff --git a/workbench/database/migrations/.gitkeep b/workbench/database/migrations/.gitkeep
diff --git a/workbench/database/seeders/.gitkeep b/workbench/database/seeders/.gitkeep