diff --git a/test/Client/TestAdapterTest.php b/test/Client/TestAdapterTest.php index cfd4105c..d96abc9d 100644 --- a/test/Client/TestAdapterTest.php +++ b/test/Client/TestAdapterTest.php @@ -189,7 +189,7 @@ public function testSettingNextResponseToAnInvalidIndex() $this->fail(); } catch (\Exception $e) { $this->assertInstanceOf(OutOfRangeException::class, $e); - $this->assertRegexp('/out of range/i', $e->getMessage()); + $this->assertMatchesRegularExpression('/out of range/i', $e->getMessage()); } } } diff --git a/test/Header/LocationTest.php b/test/Header/LocationTest.php index f6ca8e99..bcc2f8dc 100644 --- a/test/Header/LocationTest.php +++ b/test/Header/LocationTest.php @@ -54,7 +54,7 @@ public function testLocationCanSetDifferentSchemeUris($uri, $expectedClass) { $locationHeader = new Location(); $locationHeader->setUri($uri); - $this->assertInstanceOf($expectedClass, $locationHeader->uri); + $this->assertInstanceOf($expectedClass, $locationHeader->uri()); } /** @@ -70,7 +70,7 @@ public function testLocationCanSetDifferentSchemeUriObjects($uri, $expectedClass $uri = UriFactory::factory($uri); $locationHeader = new Location(); $locationHeader->setUri($uri); - $this->assertInstanceOf($expectedClass, $locationHeader->uri); + $this->assertInstanceOf($expectedClass, $locationHeader->uri()); } /** diff --git a/test/Header/SetCookieTest.php b/test/Header/SetCookieTest.php index 22add77d..cf5c1ca3 100644 --- a/test/Header/SetCookieTest.php +++ b/test/Header/SetCookieTest.php @@ -588,7 +588,7 @@ public function testSetJsonValue() $cookie = new SetCookie($cookieName, $jsonData); $regExp = sprintf('#^%s=%s#', $cookieName, urlencode($jsonData)); - $this->assertRegExp($regExp, $cookie->getFieldValue()); + $this->assertMatchesRegularExpression($regExp, $cookie->getFieldValue()); $cookieName = 'fooCookie'; $jsonData = json_encode(['foo' => 'bar']); @@ -597,7 +597,7 @@ public function testSetJsonValue() $cookie->setDomain('example.org'); $regExp = sprintf('#^%s=%s; Domain=#', $cookieName, urlencode($jsonData)); - $this->assertRegExp($regExp, $cookie->getFieldValue()); + $this->assertMatchesRegularExpression($regExp, $cookie->getFieldValue()); } /**