Merge branch '7.x' into 8.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Aug 21, 2023 · de99b0a · de99b0a
2 parents 0b651ac + c2bf58e
commit de99b0a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -6,7 +6,6 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.phpunit.cache export-ignore
-/canvas.yaml export-ignore
 /phpstan-baseline.neon export-ignore
 /phpstan.neon.dist export-ignore
 /phpunit.xml export-ignore

diff --git a/composer.json b/composer.json
@@ -57,7 +57,7 @@
     },
     "scripts": {
         "post-autoload-dump": "@prepare",
-        "prepare": "@php ./vendor/bin/testbench package:discover --ansi",
+        "prepare": "@php vendor/bin/testbench package:discover --ansi",
         "lint": [
             "@php vendor/bin/phpstan analyse",
             "@php vendor/bin/pint"

diff --git a/src/Testing/TestCase.php b/src/Testing/TestCase.php
@@ -2,9 +2,6 @@
 
 namespace Orchestra\Canvas\Core\Testing;
 
-use Composer\InstalledVersions;
-use Composer\Semver\VersionParser;
-
 class TestCase extends \Orchestra\Testbench\TestCase
 {
     use Concerns\InteractsWithPublishedFiles;