Merge branch '6.x' into 7.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>

.gitattributes

@@ -2,15 +2,13 @@
 
 # Ignore following folder/file.
 /.github export-ignore
-/build export-ignore
-/docs export-ignore
 /tests export-ignore
-/.coveralls.yml export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /phpstan-baseline.neon export-ignore
 /phpstan.neon.dist export-ignore
 /phpunit.xml export-ignore
+/pint.json export-ignore
 /CHANGELOG-*.md export-ignore
 /CODE_OF_CONDUCT.md export-ignore
 /CONTRIBUTING.md export-ignore

CHANGELOG-6.x.md

@@ -2,6 +2,14 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench-browser-kit`.
 
+## 6.18.0
+
+Released: 2023-08-10
+
+### Changes
+
+* Update minimum support for Testbench v6.29.2+. ([v6.24.1...v6.29.2](https://github.com/orchestral/testbench/compare/v6.24.1...v6.29.2))
+
 ## 6.17.3
 
 Released: 2022-02-08

composer.json

@@ -23,7 +23,7 @@
     "require": {
         "php": "^8.0",
         "laravel/browser-kit-testing": "^6.3",
-        "orchestra/testbench": "^7.22",
+        "orchestra/testbench": "^7.26.2",
         "symfony/dom-crawler": "^6.0.9"
     },
     "require-dev": {

pint.json

@@ -7,6 +7,9 @@
             "strict": true
         },
         "no_superfluous_phpdoc_tags": false,
-        "php_unit_method_casing": false
+        "php_unit_method_casing": false,
+        "nullable_type_declaration_for_default_null_value": {
+            "use_nullable_type_declaration": true
+        }
     }
 }

src/TestCase.php

@@ -62,9 +62,7 @@ protected function tearDown(): void
      */
     protected function setUpTraits()
     {
-        $uses = array_flip(class_uses_recursive(static::class));
-
-        return $this->setUpTheTestEnvironmentTraits($uses);
+        return $this->setUpTheTestEnvironmentTraits(static::$cachedTestCaseUses);
     }
 
     /**
@@ -79,16 +77,25 @@ protected function refreshApplication()
         $this->app = $this->createApplication();
     }
 
+    /**
+     * Prepare the testing environment before the running the test case.
+     *
+     * @return void
+     */
+    public static function setUpBeforeClass(): void
+    {
+        static::setupBeforeClassUsingPHPUnit();
+        static::setupBeforeClassUsingWorkbench();
+    }
+
     /**
      * Clean up the testing environment before the next test case.
      *
      * @return void
      */
     public static function tearDownAfterClass(): void
     {
-        (function () {
-            $this->classDocBlocks = [];
-            $this->methodDocBlocks = [];
-        })->call(Registry::getInstance());
+        static::teardownAfterClassUsingWorkbench();
+        static::teardownAfterClassUsingPHPUnit();
     }
 }