Merge branch '4.1'

nicolas-grekas · nicolas-grekas · commit 741316819ccf · 2018-07-26T13:01:15.000+02:00
* 4.1:
  Fix tests for legacy phpunit versions
  Add missing Ukrainian translations
  Use an empty string as default for assertEquals
diff --git a/Tests/CrawlerTest.php b/Tests/CrawlerTest.php
@@ -1027,7 +1027,7 @@ public function testParents()
     /**
      * @dataProvider getBaseTagData
      */
-    public function testBaseTag($baseValue, $linkValue, $expectedUri, $currentUri = null, $description = null)
+    public function testBaseTag($baseValue, $linkValue, $expectedUri, $currentUri = null, $description = '')
     {
         $crawler = new Crawler('<html><base href="'.$baseValue.'"><a href="'.$linkValue.'"></a></html>', $currentUri);
         $this->assertEquals($expectedUri, $crawler->filterXPath('//a')->link()->getUri(), $description);

Original file line number	Diff line number	Diff line change
`@@ -1027,7 +1027,7 @@ public function testParents()`
`1027`	`1027`	`/**`
`1028`	`1028`	`* @dataProvider getBaseTagData`
`1029`	`1029`	`*/`
`1030`		`- public function testBaseTag($baseValue, $linkValue, $expectedUri, $currentUri = null, $description = null)`
	`1030`	`+ public function testBaseTag($baseValue, $linkValue, $expectedUri, $currentUri = null, $description = '')`
`1031`	`1031`	`{`
`1032`	`1032`	`$crawler = new Crawler('<html><base href="'.$baseValue.'"><a href="'.$linkValue.'"></a></html>', $currentUri);`
`1033`	`1033`	`$this->assertEquals($expectedUri, $crawler->filterXPath('//a')->link()->getUri(), $description);`