Upgrade PHPUnit

homersimpsons · homersimpsons · commit a07db901ca70 · 2021-12-29T16:41:26.000+01:00
diff --git a/composer.json b/composer.json
@@ -43,9 +43,9 @@
         "ext-intl": "*"
     },
     "require-dev" : {
-        "phpunit/phpunit": "^8.5.8",
+        "phpunit/phpunit": "^9.5",
         "php-coveralls/php-coveralls": "^2.1",
-        "wa72/simplelogger" : "^1.0",
+        "wa72/simplelogger": "^1.0",
         "friendsofphp/php-cs-fixer": "^2.16.4",
         "symfony/process": "^3 || ^4 || ^5",
         "thecodingmachine/tdbm-fluid-schema-builder": "^1.0.0",
@@ -71,12 +71,21 @@
     "scripts": {
         "phpstan": "php -d memory_limit=3G vendor/bin/phpstan analyse src -c phpstan.neon --no-progress -vvv",
         "require-checker": "composer-require-checker check --config-file=composer-require-checker.json",
-        "test": "phpunit",
+        "test": "XDEBUG_MODE=coverage phpunit",
         "csfix": "php-cs-fixer fix src/ && php-cs-fixer fix tests/",
         "cscheck": "php-cs-fixer fix src/ --dry-run --stop-on-violation && php-cs-fixer fix tests/ --dry-run --stop-on-violation ",
-        "ci": ["@cscheck", "@phpstan", "@test", "@require-checker"],
-        "post-install-cmd": ["@composer bin all install --ansi"],
-        "post-update-cmd": ["@composer bin all update --ansi"]
+        "ci": [
+            "@cscheck",
+            "@phpstan",
+            "@test",
+            "@require-checker"
+        ],
+        "post-install-cmd": [
+            "@composer bin all install --ansi"
+        ],
+        "post-update-cmd": [
+            "@composer bin all update --ansi"
+        ]
     },
     "extra": {
         "branch-alias": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 
 <phpunit
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
@@ -21,25 +21,25 @@
 
     <php>
         <!-- "Real" test database -->
-        <var name="db_host" value="localhost" />
-        <var name="db_username" value="root" />
-        <var name="db_password" value="" />
-        <var name="db_name" value="tdbm_testcase" />
+        <var name="db_host" value="localhost"/>
+        <var name="db_username" value="root"/>
+        <var name="db_password" value=""/>
+        <var name="db_name" value="tdbm_testcase"/>
         <var name="db_port" value="3306"/>
         <var name="db_driver" value="pdo_mysql"/>
     </php>
 
-    <filter>
-  		<whitelist processUncoveredFilesFromWhitelist="true">
-    		<directory suffix=".php">src/</directory>
-    		<exclude>
-                <directory suffix=".php">src/Test</directory>
-                <file>src/Schema/LockFileSchemaManager.php</file>
-    		</exclude>
-  		</whitelist>
-	</filter>
-    <logging>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+        <exclude>
+            <directory suffix=".php">src/Test</directory>
+            <file>src/Schema/LockFileSchemaManager.php</file>
+        </exclude>
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+            <html outputDirectory="build/coverage"/>
+        </report>
+    </coverage>
 </phpunit>
diff --git a/tests/TDBMDaoGeneratorTest.php b/tests/TDBMDaoGeneratorTest.php
@@ -149,7 +149,7 @@ public function testDaoGeneration(): void
 
         $this->tdbmDaoGenerator->generateAllDaosAndBeans();
 
-        $this->assertFileNotExists($dummyFile);
+        $this->assertFileDoesNotExist($dummyFile);
 
         //Check that the lock file was generated
         $this->assertFileExists($schemaFilePath);
diff --git a/tests/TDBMServiceTest.php b/tests/TDBMServiceTest.php
@@ -836,7 +836,7 @@ public function testBuildFilterFromFilterBagIterator(): void
         $tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
 
         [$sql, $parameters, $counter] = $tdbmService->buildFilterFromFilterBag(new \ArrayIterator(['id' => 1]), self::getConnection()->getDatabasePlatform());
-        $this->assertRegExp('/\(.id. = :tdbmparam1\)/', $sql);
+        $this->assertMatchesRegularExpression('/\(.id. = :tdbmparam1\)/', $sql);
         $this->assertEquals($parameters['tdbmparam1'], 1);
     }
 
diff --git a/vendor-bin/couscous/composer.lock b/vendor-bin/couscous/composer.lock
diff --git a/vendor-bin/require-checker/composer.lock b/vendor-bin/require-checker/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -836,7 +836,7 @@ public function testBuildFilterFromFilterBagIterator(): void`
`836`	`836`	`$tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));`
`837`	`837`
`838`	`838`	`[$sql, $parameters, $counter] = $tdbmService->buildFilterFromFilterBag(new \ArrayIterator(['id' => 1]), self::getConnection()->getDatabasePlatform());`
`839`		`- $this->assertRegExp('/\(.id. = :tdbmparam1\)/', $sql);`
	`839`	`+ $this->assertMatchesRegularExpression('/\(.id. = :tdbmparam1\)/', $sql);`
`840`	`840`	`$this->assertEquals($parameters['tdbmparam1'], 1);`
`841`	`841`	`}`
`842`	`842`