Merge branch '2.7' into 2.8

* 2.7:
  [Intl] Make intl-data tests pass and save language aliases again
  Remove useless docblocks

Author: nicolas-grekas

Crawler.php

@@ -20,9 +20,6 @@
  */
 class Crawler extends \SplObjectStorage
 {
-    /**
-     * @var string The current URI
-     */
     protected $uri;
 
     /**
@@ -53,14 +50,14 @@ class Crawler extends \SplObjectStorage
     private $isHtml = true;
 
     /**
-     * @param mixed  $node       A Node to use as the base for the crawling
-     * @param string $currentUri The current URI
-     * @param string $baseHref   The base href value
+     * @param mixed  $node     A Node to use as the base for the crawling
+     * @param string $uri      The current URI
+     * @param string $baseHref The base href value
      */
-    public function __construct($node = null, $currentUri = null, $baseHref = null)
+    public function __construct($node = null, $uri = null, $baseHref = null)
     {
-        $this->uri = $currentUri;
-        $this->baseHref = $baseHref ?: $currentUri;
+        $this->uri = $uri;
+        $this->baseHref = $baseHref ?: $uri;
 
         $this->add($node);
     }