minor symfony#28025 Use an empty string as default for assertEquals (DavidPrevot)

nicolas-grekas · nicolas-grekas · commit af5f7d34ba58 · 2018-07-26T12:03:52.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- Use an empty string as default for assertEquals Make sure it isn’t interpreted as a type NULL, making the test fail with PHPUnit 7.2. | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT This shouldn’t break the existing tests, but will also make them work with recent PHPUnit. Commits ------- 3135314 Use an empty string as default for assertEquals
diff --git a/src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php b/src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
@@ -138,7 +138,7 @@ public function testCreateMapFinderSupport()
         ), ClassMapGenerator::createMap($finder));
     }
 
-    protected function assertEqualsNormalized($expected, $actual, $message = null)
+    protected function assertEqualsNormalized($expected, $actual, $message = '')
     {
         foreach ($expected as $ns => $path) {
             $expected[$ns] = str_replace('\\', '/', $path);
diff --git a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/src/Symfony/Component/DomCrawler/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);
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
@@ -73,7 +73,7 @@ public function testDuration()
         $event->start();
         usleep(200000);
         $event->stop();
-        $this->assertEquals(200, $event->getDuration(), null, self::DELTA);
+        $this->assertEquals(200, $event->getDuration(), '', self::DELTA);
 
         $event = new StopwatchEvent(microtime(true) * 1000);
         $event->start();
@@ -83,15 +83,15 @@ public function testDuration()
         $event->start();
         usleep(100000);
         $event->stop();
-        $this->assertEquals(200, $event->getDuration(), null, self::DELTA);
+        $this->assertEquals(200, $event->getDuration(), '', self::DELTA);
     }
 
     public function testDurationBeforeStop()
     {
         $event = new StopwatchEvent(microtime(true) * 1000);
         $event->start();
         usleep(200000);
-        $this->assertEquals(200, $event->getDuration(), null, self::DELTA);
+        $this->assertEquals(200, $event->getDuration(), '', self::DELTA);
 
         $event = new StopwatchEvent(microtime(true) * 1000);
         $event->start();
@@ -100,7 +100,7 @@ public function testDurationBeforeStop()
         usleep(50000);
         $event->start();
         usleep(100000);
-        $this->assertEquals(100, $event->getDuration(), null, self::DELTA);
+        $this->assertEquals(100, $event->getDuration(), '', self::DELTA);
     }
 
     /**
@@ -134,7 +134,7 @@ public function testEnsureStopped()
         $event->start();
         usleep(100000);
         $event->ensureStopped();
-        $this->assertEquals(300, $event->getDuration(), null, self::DELTA);
+        $this->assertEquals(300, $event->getDuration(), '', self::DELTA);
     }
 
     public function testStartTime()
@@ -151,7 +151,7 @@ public function testStartTime()
         $event->start();
         usleep(100000);
         $event->stop();
-        $this->assertEquals(0, $event->getStartTime(), null, self::DELTA);
+        $this->assertEquals(0, $event->getStartTime(), '', self::DELTA);
     }
 
     /**
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php
@@ -79,7 +79,7 @@ public function testStop()
         $event = $stopwatch->stop('foo');
 
         $this->assertInstanceOf('Symfony\Component\Stopwatch\StopwatchEvent', $event);
-        $this->assertEquals(200, $event->getDuration(), null, self::DELTA);
+        $this->assertEquals(200, $event->getDuration(), '', self::DELTA);
     }
 
     /**
diff --git a/src/Symfony/Component/Yaml/Tests/Fixtures/escapedCharacters.yml b/src/Symfony/Component/Yaml/Tests/Fixtures/escapedCharacters.yml
@@ -4,7 +4,7 @@ yaml: |
 php: |
     "\\0 \\ \\a \\b \\n"
 ---
-test: null
+test: 'null'
 yaml: |
     "\0"
 php: |

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function testCreateMapFinderSupport()`
`138`	`138`	`), ClassMapGenerator::createMap($finder));`
`139`	`139`	`}`
`140`	`140`
`141`		`- protected function assertEqualsNormalized($expected, $actual, $message = null)`
	`141`	`+ protected function assertEqualsNormalized($expected, $actual, $message = '')`
`142`	`142`	`{`
`143`	`143`	`foreach ($expected as $ns => $path) {`
`144`	`144`	`$expected[$ns] = str_replace('\\', '/', $path);`
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);`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function testStop()`
`79`	`79`	`$event = $stopwatch->stop('foo');`
`80`	`80`
`81`	`81`	`$this->assertInstanceOf('Symfony\Component\Stopwatch\StopwatchEvent', $event);`
`82`		`- $this->assertEquals(200, $event->getDuration(), null, self::DELTA);`
	`82`	`+ $this->assertEquals(200, $event->getDuration(), '', self::DELTA);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`/**`