Merge pull request #541 from alexislefebvre/allow-phpunit-8

Allow PHPUnit 8
liip · Nov 3, 2019 · d3f7238 · d3f7238
2 parents 22317d2 + 66d0789
commit d3f7238
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 71 deletions.
diff --git a/composer.json b/composer.json
@@ -17,14 +17,14 @@
     "require": {
         "php": "^7.1",
         "doctrine/annotations": "^1.3",
+        "phpunit/phpunit": "^7.5.0 || ^8.0",
         "symfony/browser-kit": "^3.4 || ^4.1",
         "symfony/framework-bundle": "^3.4 || ^4.1"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^1.8",
         "doctrine/orm": "^2.6",
-        "phpunit/phpunit": "^6.1 || ^7.0",
-        "symfony/monolog-bundle": "^3.1",
+        "symfony/monolog-bundle": "^3.2",
         "symfony/phpunit-bridge": "^3.4 || ^4.1",
         "symfony/symfony": "^3.4 || ^4.1",
         "twig/twig": "^2.0"

diff --git a/doc/basic.md b/doc/basic.md
@@ -103,7 +103,7 @@ Get the content of an URL:
 $content = $this->fetchContent('/contact');
 
 // `filter()` can't be used since the output is HTML code, check the content directly
-$this->assertContains(
+$this->assertStringContainsString(
     '<h1>LiipFunctionalTestBundle</h1>',
     $content
 );

diff --git a/doc/examples.md b/doc/examples.md
@@ -77,7 +77,7 @@ class ExampleFunctionalTest extends WebTestCase
         $this->assertSame('Hello foo!', $content);
 
         // check if the logout button is shown
-        $this->assertContains('logout', $content);
+        $this->assertStringContainsString('logout', $content);
     }
 
     public function test404Page(): void
@@ -88,7 +88,7 @@ class ExampleFunctionalTest extends WebTestCase
     public function testLoginPage(): void
     {
         $content = $this->fetchContent('/', 'GET', false);
-        $this->assertContains('login', $content);
+        $this->assertStringContainsString('login', $content);
     }
 
     public function testValidationErrors(): void

diff --git a/src/Test/ValidationErrorsConstraint.php b/src/Test/ValidationErrorsConstraint.php
@@ -30,7 +30,6 @@ public function __construct(array $expect)
     {
         $this->expect = $expect;
         sort($this->expect);
-        parent::__construct();
     }
 
     /**

diff --git a/tests/Command/CommandConfigTest.php b/tests/Command/CommandConfigTest.php
@@ -42,10 +42,10 @@ public function testRunCommand(): void
         $this->assertInstanceOf(CommandTester::class, $this->commandTester);
 
         // Test values from configuration
-        $this->assertContains('Environment: test', $this->commandTester->getDisplay());
-        $this->assertContains('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Environment: test', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
 
-        $this->assertInternalType('boolean', $this->getDecorated());
+        $this->assertIsBool($this->getDecorated());
         $this->assertFalse($this->getDecorated());
     }
 }
diff --git a/tests/Command/CommandTest.php b/tests/Command/CommandTest.php
@@ -31,11 +31,11 @@ public function testRunCommandWithoutOptionsAndReuseKernel(): void
         $this->commandTester = $this->runCommand('liipfunctionaltestbundle:test');
 
         // Test default values
-        $this->assertContains('Environment: test', $this->commandTester->getDisplay());
-        $this->assertContains('Verbosity level: NORMAL', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Environment: test', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: NORMAL', $this->commandTester->getDisplay());
         $this->assertFalse($this->commandTester->getInput()->isInteractive());
 
-        $this->assertInternalType('boolean', $this->getDecorated());
+        $this->assertIsBool($this->getDecorated());
         $this->assertTrue($this->getDecorated());
 
         // Run command and reuse kernel
@@ -44,8 +44,8 @@ public function testRunCommandWithoutOptionsAndReuseKernel(): void
         $this->assertInstanceOf(CommandTester::class, $this->commandTester);
         $this->assertEquals(0, $this->commandTester->getStatusCode());
 
-        $this->assertContains('Environment: test', $this->commandTester->getDisplay());
-        $this->assertContains('Verbosity level: NORMAL', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Environment: test', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: NORMAL', $this->commandTester->getDisplay());
     }
 
     public function testRunCommandWithInputs(): void
@@ -79,10 +79,10 @@ public function testRunCommandWithoutOptionsAndNotReuseKernel(): void
         $this->assertEquals(0, $this->commandTester->getStatusCode());
 
         // Test default values
-        $this->assertContains('Environment: test', $this->commandTester->getDisplay());
-        $this->assertContains('Verbosity level: NORMAL', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Environment: test', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: NORMAL', $this->commandTester->getDisplay());
 
-        $this->assertInternalType('boolean', $this->getDecorated());
+        $this->assertIsBool($this->getDecorated());
         $this->assertTrue($this->getDecorated());
 
         // Run command and not reuse kernel
@@ -91,8 +91,8 @@ public function testRunCommandWithoutOptionsAndNotReuseKernel(): void
 
         $this->assertInstanceOf(CommandTester::class, $this->commandTester);
 
-        $this->assertContains('Environment: prod', $this->commandTester->getDisplay());
-        $this->assertContains('Verbosity level: NORMAL', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Environment: prod', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: NORMAL', $this->commandTester->getDisplay());
     }
 
     public function testRunCommandWithoutDecoration(): void
@@ -105,9 +105,9 @@ public function testRunCommandWithoutDecoration(): void
         $this->assertInstanceOf(CommandTester::class, $this->commandTester);
         $this->assertEquals(0, $this->commandTester->getStatusCode());
 
-        $this->assertContains('Verbosity level: NORMAL', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: NORMAL', $this->commandTester->getDisplay());
 
-        $this->assertInternalType('boolean', $this->getDecorated());
+        $this->assertIsBool($this->getDecorated());
         $this->assertFalse($this->getDecorated());
     }
 
@@ -117,7 +117,7 @@ public function testRunCommandVerbosityQuiet(): void
         $this->assertSame(OutputInterface::VERBOSITY_QUIET, $this->getVerbosityLevel());
 
         $this->isDecorated(false);
-        $this->assertInternalType('boolean', $this->getDecorated());
+        $this->assertIsBool($this->getDecorated());
         $this->assertFalse($this->getDecorated());
 
         $this->commandTester = $this->runCommand('liipfunctionaltestbundle:test');
@@ -126,10 +126,10 @@ public function testRunCommandVerbosityQuiet(): void
         $this->assertEquals(0, $this->commandTester->getStatusCode());
 
         $this->assertEmpty($this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: NORMAL', $this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: VERBOSE', $this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: DEBUG', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: NORMAL', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: DEBUG', $this->commandTester->getDisplay());
     }
 
     public function testRunCommandVerbosityImplicitlyNormal(): void
@@ -138,18 +138,18 @@ public function testRunCommandVerbosityImplicitlyNormal(): void
         $this->assertSame(OutputInterface::VERBOSITY_NORMAL, $this->getVerbosityLevel());
 
         $this->isDecorated(false);
-        $this->assertInternalType('boolean', $this->getDecorated());
+        $this->assertIsBool($this->getDecorated());
         $this->assertFalse($this->getDecorated());
 
         $this->commandTester = $this->runCommand('liipfunctionaltestbundle:test');
         $this->assertEquals(0, $this->commandTester->getStatusCode());
 
         $this->assertInstanceOf(CommandTester::class, $this->commandTester);
 
-        $this->assertContains('Verbosity level: NORMAL', $this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: VERBOSE', $this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: DEBUG', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: NORMAL', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: DEBUG', $this->commandTester->getDisplay());
     }
 
     public function testRunCommandVerbosityExplicitlyNormal(): void
@@ -163,10 +163,10 @@ public function testRunCommandVerbosityExplicitlyNormal(): void
 
         $this->assertInstanceOf(CommandTester::class, $this->commandTester);
 
-        $this->assertContains('Verbosity level: NORMAL', $this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: VERBOSE', $this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: DEBUG', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: NORMAL', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: DEBUG', $this->commandTester->getDisplay());
     }
 
     public function testRunCommandVerbosityVerbose(): void
@@ -179,10 +179,10 @@ public function testRunCommandVerbosityVerbose(): void
 
         $this->assertInstanceOf(CommandTester::class, $this->commandTester);
 
-        $this->assertContains('Verbosity level: NORMAL', $this->commandTester->getDisplay());
-        $this->assertContains('Verbosity level: VERBOSE', $this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: DEBUG', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: NORMAL', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: DEBUG', $this->commandTester->getDisplay());
     }
 
     public function testRunCommandVerbosityVeryVerbose(): void
@@ -191,18 +191,18 @@ public function testRunCommandVerbosityVeryVerbose(): void
         $this->assertSame(OutputInterface::VERBOSITY_VERY_VERBOSE, $this->getVerbosityLevel());
 
         $this->isDecorated(false);
-        $this->assertInternalType('boolean', $this->getDecorated());
+        $this->assertIsBool($this->getDecorated());
         $this->assertFalse($this->getDecorated());
 
         $this->commandTester = $this->runCommand('liipfunctionaltestbundle:test');
         $this->assertEquals(0, $this->commandTester->getStatusCode());
 
         $this->assertInstanceOf(CommandTester::class, $this->commandTester);
 
-        $this->assertContains('Verbosity level: NORMAL', $this->commandTester->getDisplay());
-        $this->assertContains('Verbosity level: VERBOSE', $this->commandTester->getDisplay());
-        $this->assertContains('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
-        $this->assertNotContains('Verbosity level: DEBUG', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: NORMAL', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringNotContainsString('Verbosity level: DEBUG', $this->commandTester->getDisplay());
     }
 
     public function testRunCommandVerbosityDebug(): void
@@ -211,18 +211,18 @@ public function testRunCommandVerbosityDebug(): void
         $this->assertSame(OutputInterface::VERBOSITY_DEBUG, $this->getVerbosityLevel());
 
         $this->isDecorated(false);
-        $this->assertInternalType('boolean', $this->getDecorated());
+        $this->assertIsBool($this->getDecorated());
         $this->assertFalse($this->getDecorated());
 
         $this->commandTester = $this->runCommand('liipfunctionaltestbundle:test');
         $this->assertEquals(0, $this->commandTester->getStatusCode());
 
         $this->assertInstanceOf(CommandTester::class, $this->commandTester);
 
-        $this->assertContains('Verbosity level: NORMAL', $this->commandTester->getDisplay());
-        $this->assertContains('Verbosity level: VERBOSE', $this->commandTester->getDisplay());
-        $this->assertContains('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
-        $this->assertContains('Verbosity level: DEBUG', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: NORMAL', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: VERY_VERBOSE', $this->commandTester->getDisplay());
+        $this->assertStringContainsString('Verbosity level: DEBUG', $this->commandTester->getDisplay());
     }
 
     public function testRunCommandStatusCode(): void
@@ -234,13 +234,12 @@ public function testRunCommandStatusCode(): void
         $this->assertEquals(10, $this->commandTester->getStatusCode());
     }
 
-    /**
-     * @expectedException \OutOfBoundsException
-     */
     public function testRunCommandVerbosityOutOfBound(): void
     {
         $this->setVerbosityLevel('foobar');
 
+        $this->expectException(\OutOfBoundsException::class);
+
         $this->runCommand('liipfunctionaltestbundle:test');
     }
 

diff --git a/tests/Command/ParatestCommandTest.php b/tests/Command/ParatestCommandTest.php
@@ -47,12 +47,12 @@ public function testParatest(): void
             'options' => 'Tests/Test/WebTestCaseTest.php',
         ]);
 
-        $this->assertContains('Running phpunit in 3 processes with vendor/bin/phpunit', $content);
-        $this->assertContains('Initial schema created', $content);
-        $this->assertNotContains('Error : Install paratest first', $content);
-        $this->assertContains('Done...Running test.', $content);
+        $this->assertStringContainsString('Running phpunit in 3 processes with vendor/bin/phpunit', $content);
+        $this->assertStringContainsString('Initial schema created', $content);
+        $this->assertStringNotContainsString('Error : Install paratest first', $content);
+        $this->assertStringContainsString('Done...Running test.', $content);
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             'OK (22 tests, 69 assertions)',
             $content
         );

diff --git a/tests/Test/WebTestCaseConfigTest.php b/tests/Test/WebTestCaseConfigTest.php
@@ -145,8 +145,6 @@ public function testIndexAuthenticationLoginAs(): void
      *
      * There will be 2 queries, in the configuration the limit is 1,
      * an Exception will be thrown.
-     *
-     * @expectedException \Liip\FunctionalTestBundle\Exception\AllowedQueriesExceededException
      */
     public function testAllowedQueriesExceededException(): void
     {
@@ -160,6 +158,8 @@ public function testAllowedQueriesExceededException(): void
         // One another query to load the second user.
         $path = '/user/2';
 
+        $this->expectException(\Liip\FunctionalTestBundle\Exception\AllowedQueriesExceededException::class);
+
         $this->client->request('GET', $path);
     }
 
@@ -170,8 +170,6 @@ public function testAllowedQueriesExceededException(): void
      *
      * There will be 1 query, in the annotation the limit is 0,
      * an Exception will be thrown.
-     *
-     * @expectedException \Liip\FunctionalTestBundle\Exception\AllowedQueriesExceededException
      */
     public function testAnnotationAndException(): void
     {
@@ -180,6 +178,8 @@ public function testAnnotationAndException(): void
         // One query to load the second user
         $path = '/user/1';
 
+        $this->expectException(\Liip\FunctionalTestBundle\Exception\AllowedQueriesExceededException::class);
+
         $this->client->request('GET', $path);
     }
 }
diff --git a/tests/Test/WebTestCaseTest.php b/tests/Test/WebTestCaseTest.php
@@ -67,7 +67,7 @@ public function testGetUrl(): void
             ]
         );
 
-        $this->assertInternalType('string', $path);
+        $this->assertIsString($path);
 
         $this->assertSame($path, '/user/1?get_parameter=abc');
     }
@@ -152,9 +152,9 @@ public function testAssertStatusCodeException(): void
         try {
             $this->assertStatusCode(-1, $this->client);
         } catch (AssertionFailedError $e) {
-            $this->assertContains('No route found for "GET /9999"', $e->getMessage());
-            $this->assertContains('Symfony\Component\HttpKernel\EventListener\RouterListener->onKernelRequest(', $e->getMessage());
-            $this->assertContains('Failed asserting that 404 matches expected -1.', $e->getMessage());
+            $this->assertStringContainsString('No route found for "GET /9999"', $e->getMessage());
+            $this->assertStringContainsString('Symfony\Component\HttpKernel\EventListener\RouterListener->onKernelRequest(', $e->getMessage());
+            $this->assertStringContainsString('Failed asserting that 404 matches expected -1.', $e->getMessage());
 
             return;
         }
@@ -211,9 +211,9 @@ public function testIndexFetchContent(): void
 
         $content = $this->fetchContent($path);
 
-        $this->assertInternalType('string', $content);
+        $this->assertIsString($content);
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<h1>LiipFunctionalTestBundle</h1>',
             $content
         );
@@ -285,7 +285,7 @@ public function testForm(): void
 
         $this->assertStatusCode(200, $this->client);
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             'Name submitted.',
             $crawler->filter('div.flash-notice')->text()
         );
@@ -318,16 +318,14 @@ public function testFormWithEmbed(): void
 
         $this->assertStatusCode(200, $this->client);
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             'Name submitted.',
             $crawler->filter('div.flash-notice')->text()
         );
     }
 
     /**
      * @depends testForm
-     *
-     * @expectedException \PHPUnit\Framework\ExpectationFailedException
      */
     public function testFormWithException(): void
     {
@@ -342,6 +340,8 @@ public function testFormWithException(): void
 
         $this->assertStatusCode(200, $this->client);
 
+        $this->expectException(\PHPUnit\Framework\ExpectationFailedException::class);
+
         $this->assertValidationErrors([''], $this->client->getContainer());
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ public function __construct(array $expect) @@
         {
             $this->expect = $expect;
             sort($this->expect);
-            parent::__construct();
         }
         /**
@@ Expand Down @@