minor #32971 Use assertStringContainsString when needed (jderusse)

This PR was merged into the 3.4 branch. Discussion ---------- Use assertStringContainsString when needed | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32844 | License | MIT | Doc PR | NA This PR replaces deprecated assertContains to comparre string by the dedicated method `assertStringContainsString` Commits ------- 058ef39 Use assertStringContainsString when needed
symfony · Aug 6, 2019 · 08573a1 · 08573a1
2 parents 611f57c + 058ef39
commit 08573a1
Show file tree

Hide file tree

Showing 51 changed files with 205 additions and 205 deletions.
diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
@@ -197,12 +197,12 @@ public function testLogsFromListeners()
 
         $event = new ConsoleCommandEvent(new Command('foo'), $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock(), $output);
         $dispatcher->dispatch(ConsoleEvents::COMMAND, $event);
-        $this->assertContains('Before command message.', $out = $output->fetch());
-        $this->assertContains('After command message.', $out);
+        $this->assertStringContainsString('Before command message.', $out = $output->fetch());
+        $this->assertStringContainsString('After command message.', $out);
 
         $event = new ConsoleTerminateEvent(new Command('foo'), $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock(), $output, 0);
         $dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);
-        $this->assertContains('Before terminate message.', $out = $output->fetch());
-        $this->assertContains('After terminate message.', $out);
+        $this->assertStringContainsString('Before terminate message.', $out = $output->fetch());
+        $this->assertStringContainsString('After terminate message.', $out);
     }
 }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php b/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
@@ -33,14 +33,14 @@ public function test()
 
         exec("$php $phpunit -c $dir/phpunit-without-listener.xml.dist $dir/tests/ --coverage-text 2> /dev/null", $output);
         $output = implode("\n", $output);
-        $this->assertContains('FooCov', $output);
+        $this->assertStringContainsString('FooCov', $output);
 
         exec("$php $phpunit -c $dir/phpunit-with-listener.xml.dist $dir/tests/ --coverage-text 2> /dev/null", $output);
         $output = implode("\n", $output);
-        $this->assertNotContains('FooCov', $output);
-        $this->assertContains("SutNotFoundTest::test\nCould not find the tested class.", $output);
-        $this->assertNotContains("CoversTest::test\nCould not find the tested class.", $output);
-        $this->assertNotContains("CoversDefaultClassTest::test\nCould not find the tested class.", $output);
-        $this->assertNotContains("CoversNothingTest::test\nCould not find the tested class.", $output);
+        $this->assertStringNotContainsString('FooCov', $output);
+        $this->assertStringContainsString("SutNotFoundTest::test\nCould not find the tested class.", $output);
+        $this->assertStringNotContainsString("CoversTest::test\nCould not find the tested class.", $output);
+        $this->assertStringNotContainsString("CoversDefaultClassTest::test\nCould not find the tested class.", $output);
+        $this->assertStringNotContainsString("CoversNothingTest::test\nCould not find the tested class.", $output);
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php b/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php
@@ -26,7 +26,7 @@ public function testDebugCommand()
         $ret = $tester->execute([], ['decorated' => false]);
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
-        $this->assertContains('Functions', trim($tester->getDisplay()));
+        $this->assertStringContainsString('Functions', trim($tester->getDisplay()));
     }
 
     public function testLineSeparatorInLoaderPaths()
@@ -59,7 +59,7 @@ public function testLineSeparatorInLoaderPaths()
 TXT;
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
-        $this->assertContains($loaderPaths, trim($tester->getDisplay(true)));
+        $this->assertStringContainsString($loaderPaths, trim($tester->getDisplay(true)));
     }
 
     public function testWithGlobals()
@@ -70,7 +70,7 @@ public function testWithGlobals()
 
         $display = $tester->getDisplay();
 
-        $this->assertContains(json_encode($message), $display);
+        $this->assertStringContainsString(json_encode($message), $display);
     }
 
     public function testWithGlobalsJson()

diff --git a/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php b/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php
@@ -31,7 +31,7 @@ public function testLintCorrectFile()
         $ret = $tester->execute(['filename' => [$filename]], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
-        $this->assertContains('OK in', trim($tester->getDisplay()));
+        $this->assertStringContainsString('OK in', trim($tester->getDisplay()));
     }
 
     public function testLintIncorrectFile()

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php
@@ -27,7 +27,7 @@ public function testDebugAllRoutes()
         $ret = $tester->execute(['name' => null], ['decorated' => false]);
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
-        $this->assertContains('Name   Method   Scheme   Host   Path', $tester->getDisplay());
+        $this->assertStringContainsString('Name   Method   Scheme   Host   Path', $tester->getDisplay());
     }
 
     public function testDebugSingleRoute()
@@ -36,7 +36,7 @@ public function testDebugSingleRoute()
         $ret = $tester->execute(['name' => 'foo'], ['decorated' => false]);
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
-        $this->assertContains('Route Name   | foo', $tester->getDisplay());
+        $this->assertStringContainsString('Route Name   | foo', $tester->getDisplay());
     }
 
     public function testDebugInvalidRoute()

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
@@ -29,7 +29,7 @@ public function testWithMatchPath()
         $ret = $tester->execute(['path_info' => '/foo', 'foo'], ['decorated' => false]);
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
-        $this->assertContains('Route Name   | foo', $tester->getDisplay());
+        $this->assertStringContainsString('Route Name   | foo', $tester->getDisplay());
     }
 
     public function testWithNotMatchPath()
@@ -38,7 +38,7 @@ public function testWithNotMatchPath()
         $ret = $tester->execute(['path_info' => '/test', 'foo'], ['decorated' => false]);
 
         $this->assertEquals(1, $ret, 'Returns 1 in case of failure');
-        $this->assertContains('None of the routes match the path "/test"', $tester->getDisplay());
+        $this->assertStringContainsString('None of the routes match the path "/test"', $tester->getDisplay());
     }
 
     /**
@@ -56,7 +56,7 @@ public function testLegacyMatchCommand()
 
         $tester->execute(['path_info' => '/']);
 
-        $this->assertContains('None of the routes match the path "/"', $tester->getDisplay());
+        $this->assertStringContainsString('None of the routes match the path "/"', $tester->getDisplay());
     }
 
     /**

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
@@ -239,7 +239,7 @@ public function testLegacyDebugCommand()
         $tester = new CommandTester($application->find('debug:translation'));
         $tester->execute(['locale' => 'en']);
 
-        $this->assertContains('No defined or extracted', $tester->getDisplay());
+        $this->assertStringContainsString('No defined or extracted', $tester->getDisplay());
     }
 
     private function getBundle($path)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
@@ -231,7 +231,7 @@ public function testLegacyUpdateCommand()
         $tester = new CommandTester($application->find('translation:update'));
         $tester->execute(['locale' => 'en']);
 
-        $this->assertContains('You must choose one of --force or --dump-messages', $tester->getDisplay());
+        $this->assertStringContainsString('You must choose one of --force or --dump-messages', $tester->getDisplay());
     }
 
     private function getBundle($path)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/YamlLintCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/YamlLintCommandTest.php
@@ -41,7 +41,7 @@ public function testLintCorrectFile()
         );
 
         $this->assertEquals(0, $tester->getStatusCode(), 'Returns 0 in case of success');
-        $this->assertContains('OK', trim($tester->getDisplay()));
+        $this->assertStringContainsString('OK', trim($tester->getDisplay()));
     }
 
     public function testLintIncorrectFile()
@@ -55,7 +55,7 @@ public function testLintIncorrectFile()
         $tester->execute(['filename' => $filename], ['decorated' => false]);
 
         $this->assertEquals(1, $tester->getStatusCode(), 'Returns 1 in case of error');
-        $this->assertContains('Unable to parse at line 3 (near "bar").', trim($tester->getDisplay()));
+        $this->assertStringContainsString('Unable to parse at line 3 (near "bar").', trim($tester->getDisplay()));
     }
 
     public function testLintFileNotReadable()
@@ -106,7 +106,7 @@ public function testLintFilesFromBundleDirectory()
         );
 
         $this->assertEquals(0, $tester->getStatusCode(), 'Returns 0 in case of success');
-        $this->assertContains('[OK] All 0 YAML files contain valid syntax', trim($tester->getDisplay()));
+        $this->assertStringContainsString('[OK] All 0 YAML files contain valid syntax', trim($tester->getDisplay()));
     }
 
     /**

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
@@ -160,9 +160,9 @@ public function testRunOnlyWarnsOnUnregistrableCommand()
         $output = $tester->getDisplay();
 
         $this->assertSame(0, $tester->getStatusCode());
-        $this->assertContains('Some commands could not be registered:', $output);
-        $this->assertContains('throwing', $output);
-        $this->assertContains('fine', $output);
+        $this->assertStringContainsString('Some commands could not be registered:', $output);
+        $this->assertStringContainsString('throwing', $output);
+        $this->assertStringContainsString('fine', $output);
     }
 
     public function testRegistrationErrorsAreDisplayedOnCommandNotFound()
@@ -188,8 +188,8 @@ public function testRegistrationErrorsAreDisplayedOnCommandNotFound()
         $output = $tester->getDisplay();
 
         $this->assertSame(1, $tester->getStatusCode());
-        $this->assertContains('Some commands could not be registered:', $output);
-        $this->assertContains('Command "fine" is not defined.', $output);
+        $this->assertStringContainsString('Some commands could not be registered:', $output);
+        $this->assertStringContainsString('Command "fine" is not defined.', $output);
     }
 
     private function getKernel(array $bundles, $useDispatcher = false)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
@@ -127,9 +127,9 @@ public function testInvalidBundleName($bundleName, $suggestedBundleName)
 
             if (false === $suggestedBundleName) {
                 // make sure we don't have a suggestion
-                $this->assertNotContains('Did you mean', $e->getMessage());
+                $this->assertStringNotContainsString('Did you mean', $e->getMessage());
             } else {
-                $this->assertContains(sprintf('Did you mean "%s"', $suggestedBundleName), $e->getMessage());
+                $this->assertStringContainsString(sprintf('Did you mean "%s"', $suggestedBundleName), $e->getMessage());
             }
         }
     }

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
@@ -186,8 +186,8 @@ public function testFile()
         if ($response->headers->get('content-type')) {
             $this->assertSame('text/x-php', $response->headers->get('content-type'));
         }
-        $this->assertContains(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
-        $this->assertContains(basename(__FILE__), $response->headers->get('content-disposition'));
+        $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString(basename(__FILE__), $response->headers->get('content-disposition'));
     }
 
     public function testFileAsInline()
@@ -202,8 +202,8 @@ public function testFileAsInline()
         if ($response->headers->get('content-type')) {
             $this->assertSame('text/x-php', $response->headers->get('content-type'));
         }
-        $this->assertContains(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition'));
-        $this->assertContains(basename(__FILE__), $response->headers->get('content-disposition'));
+        $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString(basename(__FILE__), $response->headers->get('content-disposition'));
     }
 
     public function testFileWithOwnFileName()
@@ -219,8 +219,8 @@ public function testFileWithOwnFileName()
         if ($response->headers->get('content-type')) {
             $this->assertSame('text/x-php', $response->headers->get('content-type'));
         }
-        $this->assertContains(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
-        $this->assertContains($fileName, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString($fileName, $response->headers->get('content-disposition'));
     }
 
     public function testFileWithOwnFileNameAsInline()
@@ -236,8 +236,8 @@ public function testFileWithOwnFileNameAsInline()
         if ($response->headers->get('content-type')) {
             $this->assertSame('text/x-php', $response->headers->get('content-type'));
         }
-        $this->assertContains(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition'));
-        $this->assertContains($fileName, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_INLINE, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString($fileName, $response->headers->get('content-disposition'));
     }
 
     public function testFileFromPath()
@@ -252,8 +252,8 @@ public function testFileFromPath()
         if ($response->headers->get('content-type')) {
             $this->assertSame('text/x-php', $response->headers->get('content-type'));
         }
-        $this->assertContains(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
-        $this->assertContains(basename(__FILE__), $response->headers->get('content-disposition'));
+        $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString(basename(__FILE__), $response->headers->get('content-disposition'));
     }
 
     public function testFileFromPathWithCustomizedFileName()
@@ -268,8 +268,8 @@ public function testFileFromPathWithCustomizedFileName()
         if ($response->headers->get('content-type')) {
             $this->assertSame('text/x-php', $response->headers->get('content-type'));
         }
-        $this->assertContains(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
-        $this->assertContains('test.php', $response->headers->get('content-disposition'));
+        $this->assertStringContainsString(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $response->headers->get('content-disposition'));
+        $this->assertStringContainsString('test.php', $response->headers->get('content-disposition'));
     }
 
     public function testFileWhichDoesNotExist()

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -824,9 +824,9 @@ public function testValidationMapping()
 
         $this->assertSame('addYamlMappings', $calls[4][0]);
         $this->assertCount(3, $calls[4][1][0]);
-        $this->assertContains('foo.yml', $calls[4][1][0][0]);
-        $this->assertContains('validation.yml', $calls[4][1][0][1]);
-        $this->assertContains('validation.yaml', $calls[4][1][0][2]);
+        $this->assertStringContainsString('foo.yml', $calls[4][1][0][0]);
+        $this->assertStringContainsString('validation.yml', $calls[4][1][0][1]);
+        $this->assertStringContainsString('validation.yaml', $calls[4][1][0][2]);
     }
 
     public function testFormsCanBeEnabledWithoutCsrfProtection()

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php
@@ -31,8 +31,8 @@ public function testClearPrivatePool()
         $tester->execute(['pools' => ['cache.private_pool']], ['decorated' => false]);
 
         $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
-        $this->assertContains('Clearing cache pool: cache.private_pool', $tester->getDisplay());
-        $this->assertContains('[OK] Cache was successfully cleared.', $tester->getDisplay());
+        $this->assertStringContainsString('Clearing cache pool: cache.private_pool', $tester->getDisplay());
+        $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
     }
 
     public function testClearPublicPool()
@@ -41,8 +41,8 @@ public function testClearPublicPool()
         $tester->execute(['pools' => ['cache.public_pool']], ['decorated' => false]);
 
         $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
-        $this->assertContains('Clearing cache pool: cache.public_pool', $tester->getDisplay());
-        $this->assertContains('[OK] Cache was successfully cleared.', $tester->getDisplay());
+        $this->assertStringContainsString('Clearing cache pool: cache.public_pool', $tester->getDisplay());
+        $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
     }
 
     public function testClearPoolWithCustomClearer()
@@ -51,8 +51,8 @@ public function testClearPoolWithCustomClearer()
         $tester->execute(['pools' => ['cache.pool_with_clearer']], ['decorated' => false]);
 
         $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
-        $this->assertContains('Clearing cache pool: cache.pool_with_clearer', $tester->getDisplay());
-        $this->assertContains('[OK] Cache was successfully cleared.', $tester->getDisplay());
+        $this->assertStringContainsString('Clearing cache pool: cache.pool_with_clearer', $tester->getDisplay());
+        $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
     }
 
     public function testCallClearer()
@@ -61,8 +61,8 @@ public function testCallClearer()
         $tester->execute(['pools' => ['cache.app_clearer']], ['decorated' => false]);
 
         $this->assertSame(0, $tester->getStatusCode(), 'cache:pool:clear exits with 0 in case of success');
-        $this->assertContains('Calling cache clearer: cache.app_clearer', $tester->getDisplay());
-        $this->assertContains('[OK] Cache was successfully cleared.', $tester->getDisplay());
+        $this->assertStringContainsString('Calling cache clearer: cache.app_clearer', $tester->getDisplay());
+        $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
     }
 
     public function testClearUnexistingPool()
@@ -86,7 +86,7 @@ public function testLegacyClearCommand()
 
         $tester->execute(['pools' => []]);
 
-        $this->assertContains('Cache was successfully cleared', $tester->getDisplay());
+        $this->assertStringContainsString('Cache was successfully cleared', $tester->getDisplay());
     }
 
     private function createCommandTester()