Skip to content

Commit 7bf6871

Browse files
Merge branch '3.3' into 3.4
* 3.3: [Serializer] Fix extra attributes when no group specified [Intl] Make intl-data tests pass and save language aliases again [Console] Fix CommandTester::setInputs() docblock [Serializer] readd default argument value [VarDumper] fix trailling comma when dumping an exception Remove useless docblocks [FrameworkBundle] Fix docblocks [PropertyInfo] Remove useless docblocks
2 parents 8cc827e + cebe3c0 commit 7bf6871

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

Crawler.php

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
*/
2121
class Crawler implements \Countable, \IteratorAggregate
2222
{
23-
/**
24-
* @var string The current URI
25-
*/
2623
protected $uri;
2724

2825
/**
@@ -58,14 +55,14 @@ class Crawler implements \Countable, \IteratorAggregate
5855
private $isHtml = true;
5956

6057
/**
61-
* @param mixed $node A Node to use as the base for the crawling
62-
* @param string $currentUri The current URI
63-
* @param string $baseHref The base href value
58+
* @param mixed $node A Node to use as the base for the crawling
59+
* @param string $uri The current URI
60+
* @param string $baseHref The base href value
6461
*/
65-
public function __construct($node = null, $currentUri = null, $baseHref = null)
62+
public function __construct($node = null, $uri = null, $baseHref = null)
6663
{
67-
$this->uri = $currentUri;
68-
$this->baseHref = $baseHref ?: $currentUri;
64+
$this->uri = $uri;
65+
$this->baseHref = $baseHref ?: $uri;
6966

7067
$this->add($node);
7168
}

0 commit comments

Comments
 (0)