Merge pull request #3446 from morozov/phpunit-8.0

Upgraded PHPUnit to 8.0
doctrine · Feb 3, 2019 · 30b9231 · 30b9231
2 parents 1c75231 + 53912cc
commit 30b9231
Show file tree

Hide file tree

Showing 115 changed files with 722 additions and 461 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.phpunit.result.cache
 build/
 logs/
 reports/

diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "doctrine/coding-standard": "^5.0",
         "jetbrains/phpstorm-stubs": "^2018.1.2",
         "phpstan/phpstan": "^0.11.1",
-        "phpunit/phpunit": "^7.4",
+        "phpunit/phpunit": "^8.0",
         "symfony/console": "^2.0.5|^3.0|^4.0",
         "symfony/phpunit-bridge": "^3.4.5|^4.0.5"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/tests/Doctrine/Tests/DBAL/Cache/QueryCacheProfileTest.php b/tests/Doctrine/Tests/DBAL/Cache/QueryCacheProfileTest.php
@@ -33,7 +33,7 @@ class QueryCacheProfileTest extends DbalTestCase
         'driver'   => 'database_driver',
     ];
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->queryCacheProfile = new QueryCacheProfile(self::LIFETIME, self::CACHE_KEY);
     }
@@ -110,7 +110,7 @@ public function testConnectionParamsShouldBeHashed()
         self::assertArrayHasKey('connectionParams', $params);
 
         foreach ($this->connectionParams as $param) {
-            self::assertNotContains($param, $params['connectionParams']);
+            self::assertStringNotContainsString($param, $params['connectionParams']);
         }
     }