Vendor
This commit is contained in:
parent
d3710f034f
commit
ae5526db8e
@ -265,11 +265,7 @@ final class Uri implements UriInterface
|
|||||||
return !isset(self::$schemes[$scheme]) || $port !== self::$schemes[$scheme];
|
return !isset(self::$schemes[$scheme]) || $port !== self::$schemes[$scheme];
|
||||||
}
|
}
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
private function filterPort(int $port): ?bool
|
|
||||||
=======
|
|
||||||
private function filterPort(int $port): ?int
|
private function filterPort(int $port): ?int
|
||||||
>>>>>>> 097faaa6cdcfaa51b2861ff317b6deb027bec7bf
|
|
||||||
{
|
{
|
||||||
if (null === $port) {
|
if (null === $port) {
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user