Merge branch '8.x' into develop

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Jul 24, 2024 · b29f712 · b29f712
2 parents 380518b + 1fa5042
commit b29f712
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
         "symfony/polyfill-php83": "^1.28"
     },
     "require-dev": {
-        "laravel/pint": "^1.6",
+        "laravel/pint": "^1.17",
         "laravel/tinker": "^2.9",
         "phpstan/phpstan": "^1.11",
         "phpunit/phpunit": "^10.5 || ^11.0"

diff --git a/src/DuskServer.php b/src/DuskServer.php
@@ -227,7 +227,7 @@ protected function guardServerStarting(): void
     protected function prepareCommand(): array
     {
         return [
-            (string) (new PhpExecutableFinder())->find(false),
+            (string) (new PhpExecutableFinder)->find(false),
             '-S',
             sprintf('%s:%s', $this->host, $this->port),
             join_paths(__DIR__, 'server.php'),

diff --git a/src/Options.php b/src/Options.php
@@ -72,7 +72,7 @@ public static function using($callback)
     {
         static::$chromeOptionsCallback = $callback;
 
-        return new static();
+        return new static;
     }
 
     /**
@@ -86,7 +86,7 @@ public static function addArgument(string $argument)
             array_push(static::$arguments, $argument);
         }
 
-        return new static();
+        return new static;
     }
 
     /**
@@ -100,7 +100,7 @@ public static function removeArgument(string $argument)
             static::$arguments = array_values(array_filter(static::$arguments, static fn ($option) => $option !== $argument));
         }
 
-        return new static();
+        return new static;
     }
 
     /**
@@ -246,7 +246,7 @@ public static function userAgent(string $useragent)
      */
     public static function getChromeOptions()
     {
-        return tap(new ChromeOptions(), static function ($option) {
+        return tap(new ChromeOptions, static function ($option) {
             if (static::$w3cCompliant === false) {
                 $option->setExperimentalOption('w3c', static::$w3cCompliant);
             }

diff --git a/tests/Unit/Concerns/CanServeSiteTest.php b/tests/Unit/Concerns/CanServeSiteTest.php
@@ -13,7 +13,7 @@ class CanServeSiteTest extends TestCase
     #[Test]
     public function it_starts_and_stops_a_server()
     {
-        $dummy = new CanServeSiteDummy();
+        $dummy = new CanServeSiteDummy;
 
         $dummy::serve('127.0.0.1', 8001);
 
@@ -33,7 +33,7 @@ public function it_starts_and_stops_a_server()
     #[Test]
     public function it_stops_an_existing_server_and_starts_a_new_one_with_consecutive_serve_requests()
     {
-        $dummy = new CanServeSiteDummy();
+        $dummy = new CanServeSiteDummy;
 
         $dummy::serve('127.0.0.1', 8001);
 

diff --git a/tests/Unit/DuskServerTest.php b/tests/Unit/DuskServerTest.php
@@ -13,14 +13,14 @@ public function it_provides_the_laravel_public_directory()
     {
         $this->assertEquals(
             realpath(__DIR__.'/../../laravel'),
-            (new DuskServer())->basePath()
+            (new DuskServer)->basePath()
         );
     }
 
     #[Test]
     public function it_provides_the_laravel_public_directory_from_custom_location()
     {
-        $server = new DuskServer();
+        $server = new DuskServer;
         $server->setLaravel(basePath: '/dir/project/laravel');
 
         $this->assertEquals(
@@ -33,8 +33,8 @@ public function it_provides_the_laravel_public_directory_from_custom_location()
     public function it_fails_when_there_is_a_server_on_the_host_and_port_already()
     {
         try {
-            $a = new DuskServer();
-            $b = new DuskServer();
+            $a = new DuskServer;
+            $b = new DuskServer;
 
             $a->start();
             $this->waitForServerToStart();
@@ -69,15 +69,15 @@ public function an_early_exit_does_not_leave_an_orphan_server()
                 // We have everything from the script so far available
                 // So create a server and exit (to simluate a dd() or similar in a test)
                 // Once complete, the parent can check for the orpahn server.
-                (new DuskServer())->start();
+                (new DuskServer)->start();
                 $this->waitForServerToStart();
                 exit();
                 break;
             default:
                 // @parent
                 pcntl_waitpid($pid, $status);
                 try {
-                    (new DuskServer())->start();
+                    (new DuskServer)->start();
                     $this->assertTrue(true, 'We did not end up with an orphan server');
                 } catch (UnableToStartServer $e) {
                     $this->fail('There was an orphan server. You\'ll need to remove it manually.');