diff --git a/AbstractBrowser.php b/AbstractBrowser.php index 16420c7..d2a1fae 100644 --- a/AbstractBrowser.php +++ b/AbstractBrowser.php @@ -353,11 +353,11 @@ public function request(string $method, string $uri, array $parameters = [], arr $server = array_merge($this->server, $server); - if (!empty($server['HTTP_HOST']) && null === parse_url($originalUri, \PHP_URL_HOST)) { + if (!empty($server['HTTP_HOST']) && !parse_url($originalUri, \PHP_URL_HOST)) { $uri = preg_replace('{^(https?\://)'.preg_quote($this->extractHost($uri)).'}', '${1}'.$server['HTTP_HOST'], $uri); } - if (isset($server['HTTPS']) && null === parse_url($originalUri, \PHP_URL_SCHEME)) { + if (isset($server['HTTPS']) && !parse_url($originalUri, \PHP_URL_SCHEME)) { $uri = preg_replace('{^'.parse_url($uri, \PHP_URL_SCHEME).'}', $server['HTTPS'] ? 'https' : 'http', $uri); } diff --git a/Cookie.php b/Cookie.php index 1719963..08aeeac 100644 --- a/Cookie.php +++ b/Cookie.php @@ -147,7 +147,7 @@ public static function fromString(string $cookie, ?string $url = null): static ]; if (null !== $url) { - if ((false === $urlParts = parse_url($url)) || !isset($urlParts['host'])) { + if (false === ($urlParts = parse_url($url)) || !isset($urlParts['host'])) { throw new InvalidArgumentException(sprintf('The URL "%s" is not valid.', $url)); } @@ -160,7 +160,7 @@ public static function fromString(string $cookie, ?string $url = null): static if ('secure' === strtolower($part)) { // Ignore the secure flag if the original URI is not given or is not HTTPS - if (!$url || !isset($urlParts['scheme']) || 'https' !== $urlParts['scheme']) { + if (null === $url || !isset($urlParts['scheme']) || 'https' !== $urlParts['scheme']) { continue; }