laravel-6 support

vendor/symfony/dom-crawler/AbstractUriElement.php

@@ -24,7 +24,7 @@ abstract class AbstractUriElement
     protected $node;
 
     /**
-     * @var string The method to use for the element
+     * @var string|null The method to use for the element
      */
     protected $method;
 
@@ -35,20 +35,22 @@ abstract class AbstractUriElement
 
     /**
      * @param \DOMElement $node       A \DOMElement instance
-     * @param string      $currentUri The URI of the page where the link is embedded (or the base href)
-     * @param string      $method     The method to use for the link (get by default)
+     * @param string|null $currentUri The URI of the page where the link is embedded (or the base href)
+     * @param string|null $method     The method to use for the link (GET by default)
      *
      * @throws \InvalidArgumentException if the node is not a link
      */
-    public function __construct(\DOMElement $node, $currentUri, $method = 'GET')
+    public function __construct(\DOMElement $node, string $currentUri = null, ?string $method = 'GET')
     {
-        if (!in_array(strtolower(substr($currentUri, 0, 4)), array('http', 'file'))) {
-            throw new \InvalidArgumentException(sprintf('Current URI must be an absolute URL ("%s").', $currentUri));
-        }
-
         $this->setNode($node);
         $this->method = $method ? strtoupper($method) : null;
         $this->currentUri = $currentUri;
+
+        $elementUriIsRelative = null === parse_url(trim($this->getRawUri()), \PHP_URL_SCHEME);
+        $baseUriIsAbsolute = null !== $this->currentUri && \in_array(strtolower(substr($this->currentUri, 0, 4)), ['http', 'file']);
+        if ($elementUriIsRelative && !$baseUriIsAbsolute) {
+            throw new \InvalidArgumentException(sprintf('The URL of the element is relative, so you must define its base URI passing an absolute URL to the constructor of the "%s" class ("%s" was passed).', __CLASS__, $this->currentUri));
+        }
     }
 
     /**
@@ -68,7 +70,7 @@ abstract class AbstractUriElement
      */
     public function getMethod()
     {
-        return $this->method;
+        return $this->method ?? 'GET';
     }
 
     /**
@@ -81,7 +83,7 @@ abstract class AbstractUriElement
         $uri = trim($this->getRawUri());
 
         // absolute URL?
-        if (null !== parse_url($uri, PHP_URL_SCHEME)) {
+        if (null !== parse_url($uri, \PHP_URL_SCHEME)) {
             return $uri;
         }
 
@@ -102,7 +104,7 @@ abstract class AbstractUriElement
         }
 
         // absolute URL with relative schema
-        if (0 === strpos($uri, '//')) {
+        if (str_starts_with($uri, '//')) {
             return preg_replace('#^([^/]*)//.*$#', '$1', $baseUri).$uri;
         }
 
@@ -114,7 +116,7 @@ abstract class AbstractUriElement
         }
 
         // relative path
-        $path = parse_url(substr($this->currentUri, strlen($baseUri)), PHP_URL_PATH);
+        $path = parse_url(substr($this->currentUri, \strlen($baseUri)), \PHP_URL_PATH);
         $path = $this->canonicalizePath(substr($path, 0, strrpos($path, '/')).'/'.$uri);
 
         return $baseUri.('' === $path || '/' !== $path[0] ? '/' : '').$path;
@@ -140,11 +142,11 @@ abstract class AbstractUriElement
             return $path;
         }
 
-        if ('.' === substr($path, -1)) {
+        if (str_ends_with($path, '.')) {
             $path .= '/';
         }
 
-        $output = array();
+        $output = [];
 
         foreach (explode('/', $path) as $segment) {
             if ('..' === $segment) {
@@ -168,24 +170,16 @@ abstract class AbstractUriElement
 
     /**
      * Removes the query string and the anchor from the given uri.
-     *
-     * @param string $uri The uri to clean
-     *
-     * @return string
      */
-    private function cleanupUri($uri)
+    private function cleanupUri(string $uri): string
     {
         return $this->cleanupQuery($this->cleanupAnchor($uri));
     }
 
     /**
      * Remove the query string from the uri.
-     *
-     * @param string $uri
-     *
-     * @return string
      */
-    private function cleanupQuery($uri)
+    private function cleanupQuery(string $uri): string
     {
         if (false !== $pos = strpos($uri, '?')) {
             return substr($uri, 0, $pos);
@@ -196,12 +190,8 @@ abstract class AbstractUriElement
 
     /**
      * Remove the anchor from the uri.
-     *
-     * @param string $uri
-     *
-     * @return string
      */
-    private function cleanupAnchor($uri)
+    private function cleanupAnchor(string $uri): string
     {
         if (false !== $pos = strpos($uri, '#')) {
             return substr($uri, 0, $pos);