Merge branch '1.9' into 1.10

chrome-php · Oct 8, 2023 · d076f8d · d076f8d
2 parents d45e130 + 1b78aa4
commit d076f8d
Show file tree

Hide file tree

Showing 16 changed files with 84 additions and 84 deletions.
diff --git a/src/BrowserFactory.php b/src/BrowserFactory.php
@@ -66,7 +66,7 @@ public function __construct(string $chromeBinary = null)
      */
     public function createBrowser(?array $options = null): ProcessAwareBrowser
     {
-        $options = $options ?? $this->options;
+        $options ??= $this->options;
 
         // create logger from options
         $logger = self::createLogger($options);

diff --git a/src/Communication/ResponseReader.php b/src/Communication/ResponseReader.php
@@ -109,7 +109,7 @@ public function waitForResponse(int $timeout = null): Response
             return $this->getResponse();
         }
 
-        $timeout = $timeout ?? $this->connection->getSendSyncDefaultTimeout();
+        $timeout ??= $this->connection->getSendSyncDefaultTimeout();
 
         return Utils::tryWithTimeout($timeout * 1000, $this->waitForResponseGenerator());
     }

diff --git a/tests/BrowserFactoryTest.php b/tests/BrowserFactoryTest.php
@@ -56,7 +56,7 @@ public function testUserAgentOption(): void
 
         $response = $page->evaluate('navigator.userAgent')->getReturnValue();
 
-        self::assertEquals('foo bar baz', $response);
+        self::assertSame('foo bar baz', $response);
     }
 
     public function testAddHeaders(): void

diff --git a/tests/BrowsingTest.php b/tests/BrowsingTest.php
@@ -52,12 +52,12 @@ public function testPageNavigateEvaluate(): void
         // initial navigation
         $page = $this->openSitePage('index.html');
         $title = $page->evaluate('document.title')->getReturnValue();
-        self::assertEquals('foo', $title);
+        self::assertSame('foo', $title);
 
         // navigate again
         $page->navigate(self::sitePath('a.html'))->waitForNavigation();
         $title = $page->evaluate('document.title')->getReturnValue();
-        self::assertEquals('a - test', $title);
+        self::assertSame('a - test', $title);
     }
 
     public function testFormSubmission(): void
@@ -72,7 +72,7 @@ public function testFormSubmission(): void
         );
 
         $evaluation->waitForPageReload();
-        self::assertEquals('hello', $page->evaluate('document.querySelector("#value").innerHTML')->getReturnValue());
+        self::assertSame('hello', $page->evaluate('document.querySelector("#value").innerHTML')->getReturnValue());
     }
 
     public function testGetCurrentUrl(): void
@@ -81,11 +81,11 @@ public function testGetCurrentUrl(): void
 
         $page->getSession()->getConnection()->readData();
 
-        self::assertEquals('about:blank', $page->getCurrentUrl());
+        self::assertSame('about:blank', $page->getCurrentUrl());
 
         $page->navigate(self::sitePath('a.html'))->waitForNavigation();
 
-        self::assertEquals(self::sitePath('a.html'), $page->getCurrentUrl());
+        self::assertSame(self::sitePath('a.html'), $page->getCurrentUrl());
     }
 
     public function testPageNavigationLocalNotFoundUrl(): void
@@ -127,12 +127,12 @@ public function testGetPagesNavigateEvaluate(): void
             // initial navigation
             $page = $this->openSitePage('index.html');
             $title = $page->evaluate('document.title')->getReturnValue();
-            self::assertEquals('foo', $title);
+            self::assertSame('foo', $title);
 
             // navigate again
             $page->navigate(self::sitePath('a.html'))->waitForNavigation();
             $title = $page->evaluate('document.title')->getReturnValue();
-            self::assertEquals('a - test', $title);
+            self::assertSame('a - test', $title);
         }
     }
 

diff --git a/tests/Communication/ConnectionTest.php b/tests/Communication/ConnectionTest.php
@@ -64,8 +64,8 @@ public function testCreateSession(): void
         $session = $connection->createSession('baz-qux');
 
         self::assertInstanceOf(Session::class, $session);
-        self::assertEquals('foo-bar', $session->getSessionId());
-        self::assertEquals('baz-qux', $session->getTargetId());
+        self::assertSame('foo-bar', $session->getSessionId());
+        self::assertSame('baz-qux', $session->getTargetId());
         self::assertSame($connection, $session->getConnection());
     }
 

diff --git a/tests/Communication/MessageTest.php b/tests/Communication/MessageTest.php
@@ -22,8 +22,8 @@ class MessageTest extends TestCase
     public function testMessage(): void
     {
         $message = new Message('foo', ['bar' => 'baz']);
-        self::assertEquals(Message::getLastMessageId(), $message->getId());
-        self::assertEquals('foo', $message->getMethod());
+        self::assertSame(Message::getLastMessageId(), $message->getId());
+        self::assertSame('foo', $message->getMethod());
         self::assertEquals(['bar' => 'baz'], $message->getParams());
 
         self::assertEquals(
@@ -32,9 +32,9 @@ public function testMessage(): void
         );
 
         $message2 = new Message('qux', ['quux' => 'corge']);
-        self::assertEquals(Message::getLastMessageId(), $message2->getId());
+        self::assertSame(Message::getLastMessageId(), $message2->getId());
         self::assertNotSame($message->getId(), $message2->getId());
-        self::assertEquals('qux', $message2->getMethod());
+        self::assertSame('qux', $message2->getMethod());
         self::assertEquals(['quux' => 'corge'], $message2->getParams());
     }
 }
diff --git a/tests/Communication/ResponseReaderTest.php b/tests/Communication/ResponseReaderTest.php
@@ -115,11 +115,11 @@ public function testWaitForResponseIsAtomic(): void
         // wait for response should not read the second message (method:qux.quux)
         $response = $responseReader->waitForResponse(1);
         self::assertEquals(['id' => $message->getId(), 'foo' => 'qux'], $response->getData());
-        self::assertEquals(0, $emitWatcher->emittedCount);
+        self::assertSame(0, $emitWatcher->emittedCount);
 
         // next call to read line should read the second message (method:qux.quux)
         $connection->readLine();
-        self::assertEquals(1, $emitWatcher->emittedCount);
+        self::assertSame(1, $emitWatcher->emittedCount);
     }
 
     public function testExceptionNoResponse(): void

diff --git a/tests/Communication/ResponseTest.php b/tests/Communication/ResponseTest.php
@@ -28,7 +28,7 @@ public function testMessage(): void
         self::assertSame($message, $response->getMessage());
         self::assertTrue($response->isSuccessful());
         self::assertTrue(isset($response['bar']));
-        self::assertEquals('foo', $response['bar']);
+        self::assertSame('foo', $response['bar']);
         self::assertEquals(['id' => $message->getId(), 'bar' => 'foo'], $response->getData());
     }
 

diff --git a/tests/Communication/SessionTest.php b/tests/Communication/SessionTest.php
@@ -37,8 +37,8 @@ public function testSession(): void
         $connection = new Connection($this->mockSocket);
         $session = new Session('foo', 'bar', $connection);
 
-        self::assertEquals('foo', $session->getTargetId());
-        self::assertEquals('bar', $session->getSessionId());
+        self::assertSame('foo', $session->getTargetId());
+        self::assertSame('bar', $session->getSessionId());
         self::assertSame($connection, $session->getConnection());
     }
 

diff --git a/tests/CookieTest.php b/tests/CookieTest.php
@@ -56,8 +56,8 @@ public function testReadCookies(): void
         self::assertInstanceOf(CookiesCollection::class, $cookies);
         self::assertCount(1, $cookies);
 
-        self::assertEquals($cookies->getAt(0)->getName(), 'foo');
-        self::assertEquals($cookies->getAt(0)->getValue(), 'bar');
+        self::assertSame('foo', $cookies->getAt(0)->getName());
+        self::assertSame('bar', $cookies->getAt(0)->getValue());
     }
 
     public function testGetAllCookies(): void
@@ -70,8 +70,8 @@ public function testGetAllCookies(): void
         self::assertInstanceOf(CookiesCollection::class, $cookies);
         self::assertCount(1, $cookies);
 
-        self::assertEquals($cookies->getAt(0)->getName(), 'foo');
-        self::assertEquals($cookies->getAt(0)->getValue(), 'bar');
+        self::assertSame('foo', $cookies->getAt(0)->getName());
+        self::assertSame('bar', $cookies->getAt(0)->getValue());
     }
 
     public function testSetCookies(): void
@@ -92,9 +92,9 @@ public function testSetCookies(): void
         self::assertInstanceOf(CookiesCollection::class, $cookies);
         self::assertCount(1, $cookies);
 
-        self::assertEquals($cookies->getAt(0)->getName(), 'baz');
-        self::assertEquals($cookies->getAt(0)->getValue(), 'qux');
-        self::assertEquals($cookies->getAt(0)->getDomain(), 'foo.bar');
+        self::assertSame('baz', $cookies->getAt(0)->getName());
+        self::assertSame('qux', $cookies->getAt(0)->getValue());
+        self::assertSame('foo.bar', $cookies->getAt(0)->getDomain());
 
         // Set cookie for current page
         $page->navigate(self::sitePath('a.html'))->waitForNavigation();
@@ -108,12 +108,12 @@ public function testSetCookies(): void
         self::assertInstanceOf(CookiesCollection::class, $cookies);
         self::assertCount(2, $cookies);
 
-        self::assertEquals($cookies->getAt(1)->getName(), 'quux');
-        self::assertEquals($cookies->getAt(1)->getValue(), 'corge');
-        self::assertEquals($cookies->getAt(1)->getDomain(), 'localhost');
+        self::assertSame('quux', $cookies->getAt(1)->getName());
+        self::assertSame('corge', $cookies->getAt(1)->getValue());
+        self::assertSame('localhost', $cookies->getAt(1)->getDomain());
 
-        self::assertEquals($cookies->getAt(0)->getName(), 'baz');
-        self::assertEquals($cookies->getAt(0)->getValue(), 'qux');
-        self::assertEquals($cookies->getAt(0)->getDomain(), 'foo.bar');
+        self::assertSame('baz', $cookies->getAt(0)->getName());
+        self::assertSame('qux', $cookies->getAt(0)->getValue());
+        self::assertSame('foo.bar', $cookies->getAt(0)->getDomain());
     }
 }
diff --git a/tests/Cookies/CookiesCollectionTest.php b/tests/Cookies/CookiesCollectionTest.php
@@ -32,8 +32,8 @@ public function testFilterBy(): void
         $newCookies = $cookies->filterBy('name', 'foo');
 
         self::assertCount(2, $newCookies);
-        self::assertEquals('bar', $newCookies->getAt(0)->getValue());
-        self::assertEquals('baz', $newCookies->getAt(1)->getValue());
+        self::assertSame('bar', $newCookies->getAt(0)->getValue());
+        self::assertSame('baz', $newCookies->getAt(1)->getValue());
     }
 
     public function testFindOneBy(): void
@@ -47,7 +47,7 @@ public function testFindOneBy(): void
         $cookieFoo = $cookies->findOneBy('name', 'foo');
         $cookieQux = $cookies->findOneBy('name', 'qux');
 
-        self::assertEquals('bar', $cookieFoo->getValue());
-        self::assertEquals('quux', $cookieQux->getValue());
+        self::assertSame('bar', $cookieFoo->getValue());
+        self::assertSame('quux', $cookieQux->getValue());
     }
 }
diff --git a/tests/DomTest.php b/tests/DomTest.php
@@ -101,7 +101,7 @@ public function testType(): void
             ->getReturnValue();
 
         // checks if the input contains the typed text
-        self::assertEquals('bar', $value);
+        self::assertSame('bar', $value);
     }
 
     public function testGetText(): void
@@ -112,7 +112,7 @@ public function testGetText(): void
 
         $value = $element->getText();
 
-        self::assertEquals('bar', $value);
+        self::assertSame('bar', $value);
     }
 
     public function testGetAttribute(): void
@@ -123,7 +123,7 @@ public function testGetAttribute(): void
 
         $value = $element->getAttribute('type');
 
-        self::assertEquals('foo', $value);
+        self::assertSame('foo', $value);
     }
 
     public function testSetAttribute(): void
@@ -136,7 +136,7 @@ public function testSetAttribute(): void
 
         $value = $element->getAttribute('type');
 
-        self::assertEquals('hello', $value);
+        self::assertSame('hello', $value);
     }
 
     public function testUploadFile(): void

diff --git a/tests/KeyboardApiTest.php b/tests/KeyboardApiTest.php
@@ -62,7 +62,7 @@ public function testTypeText(): void
             ->getReturnValue();
 
         // checks if the input contains the typed text
-        self::assertEquals($text, $value);
+        self::assertSame($text, $value);
     }
 
     /**
@@ -127,7 +127,7 @@ public function testTypeKeyCombinations(): void
             ->getReturnValue();
 
         // check if the input contains the typed text twice
-        self::assertEquals($text.$text, $value);
+        self::assertSame($text.$text, $value);
     }
 
     /**
@@ -144,7 +144,7 @@ public function testReleaseAll(): void
             ->press('b')
             ->release();
 
-        self::assertEquals(0, \count($page->keyboard()->getPressedKeys()));
+        self::assertCount(0, $page->keyboard()->getPressedKeys());
     }
 
     /**

diff --git a/tests/KeyboardKeysTest.php b/tests/KeyboardKeysTest.php
@@ -68,20 +68,20 @@ public static function keyCodesProvider(): array
     public function testOnKeyPressAndRelease($key, $expectedKey): void
     {
         self::assertFalse($this->keyboard->isKeyPressed());
-        self::assertEquals(0, $this->keyboard->getModifiers());
+        self::assertSame(0, $this->keyboard->getModifiers());
 
         $this->keyboard->onKeyPress($key);
 
-        self::assertEquals($expectedKey, $this->keyboard->getCurrentKey());
-        self::assertEquals(0, $this->keyboard->getModifiers());
-        self::assertEquals(1, \count($this->keyboard->getPressedKeys()));
+        self::assertSame($expectedKey, $this->keyboard->getCurrentKey());
+        self::assertSame(0, $this->keyboard->getModifiers());
+        self::assertSame(1, \count($this->keyboard->getPressedKeys()));
         self::assertTrue($this->keyboard->isKeyPressed());
 
         $this->keyboard->onKeyRelease($key);
 
-        self::assertEquals($expectedKey, $this->keyboard->getCurrentKey());
-        self::assertEquals(0, \count($this->keyboard->getPressedKeys()));
-        self::assertEquals(0, $this->keyboard->getModifiers());
+        self::assertSame($expectedKey, $this->keyboard->getCurrentKey());
+        self::assertSame(0, \count($this->keyboard->getPressedKeys()));
+        self::assertSame(0, $this->keyboard->getModifiers());
         self::assertFalse($this->keyboard->isKeyPressed());
     }
 
@@ -96,23 +96,23 @@ public function testToggleModifierFromKey($key, $expectedModifier): void
         $this->keyboard->setCurrentKey('NonModifierKey');
         $this->keyboard->toggleModifierFromKey();
 
-        self::assertEquals($expectedModifier, $this->keyboard->getModifiers());
+        self::assertSame($expectedModifier, $this->keyboard->getModifiers());
 
         $this->keyboard->setCurrentKey($key);
         $this->keyboard->toggleModifierFromKey();
-        self::assertEquals(0, $this->keyboard->getModifiers());
+        self::assertSame(0, $this->keyboard->getModifiers());
     }
 
     public function testToggleModifier(): void
     {
         $this->keyboard->toggleModifier(0b0001);
         $this->keyboard->toggleModifier(0b0010);
 
-        self::assertEquals(0b0011, $this->keyboard->getModifiers());
+        self::assertSame(0b0011, $this->keyboard->getModifiers());
 
         $this->keyboard->toggleModifier(0b0010);
 
-        self::assertEquals(0b0001, $this->keyboard->getModifiers());
+        self::assertSame(0b0001, $this->keyboard->getModifiers());
     }
 
     /**
@@ -122,6 +122,6 @@ public function testGetKeyCode($key, $code): void
     {
         $this->keyboard->setCurrentKey($key);
 
-        self::assertEquals($code, $this->keyboard->getKeyCode());
+        self::assertSame($code, $this->keyboard->getKeyCode());
     }
 }