Migrate configuration files

doctrine · Feb 26, 2023 · 6f0294d · 6f0294d
1 parent 234df41
commit 6f0294d
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 73 deletions.
diff --git a/ci/github/phpunit/mysqli.xml b/ci/github/phpunit/mysqli.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
          colors="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
-         convertDeprecationsToExceptions="true"
+         cacheDirectory=".phpunit.cache"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -28,11 +27,11 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory suffix=".php">../../../lib/Doctrine</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
     <groups>
         <exclude>

diff --git a/ci/github/phpunit/pdo_mysql.xml b/ci/github/phpunit/pdo_mysql.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
          colors="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
-         convertDeprecationsToExceptions="true"
+         cacheDirectory=".phpunit.cache"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -28,12 +27,11 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory suffix=".php">../../../lib/Doctrine</directory>
-        </whitelist>
-    </filter>
-
+        </include>
+    </coverage>
 
     <groups>
         <exclude>

diff --git a/ci/github/phpunit/pdo_pgsql.xml b/ci/github/phpunit/pdo_pgsql.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
          colors="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
-         convertDeprecationsToExceptions="true"
+         cacheDirectory=".phpunit.cache"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -25,11 +24,11 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory suffix=".php">../../../lib/Doctrine</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
     <groups>
         <exclude>

diff --git a/ci/github/phpunit/pgsql.xml b/ci/github/phpunit/pgsql.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
          colors="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
-         convertDeprecationsToExceptions="true"
+         cacheDirectory=".phpunit.cache"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -25,11 +24,11 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory suffix=".php">../../../lib/Doctrine</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
     <groups>
         <exclude>

diff --git a/ci/github/phpunit/sqlite3.xml b/ci/github/phpunit/sqlite3.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
          colors="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
-         convertDeprecationsToExceptions="true"
+         cacheDirectory=".phpunit.cache"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -23,11 +22,11 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory suffix=".php">../../../lib/Doctrine</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
     <groups>
         <exclude>

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -12,12 +12,11 @@
            Example: phpunit -c mysqlconf.xml AllTests
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
          colors="true"
-         verbose="false"
          failOnRisky="true"
-         convertDeprecationsToExceptions="true"
          bootstrap="./tests/Doctrine/Tests/TestInit.php"
+         cacheDirectory=".phpunit.cache"
 >
     <testsuites>
         <testsuite name="Doctrine ORM Test Suite">
@@ -31,42 +30,38 @@
             <group>locking_functional</group>
         </exclude>
     </groups>
+    <php>
+        <ini name="error_reporting" value="-1"/>
+        <!-- "Real" test database -->
+        <var name="db_driver" value="pdo_sqlite"/>
+        <var name="db_memory" value="true"/>
+        <!-- to use another database driver / credentials, provide them like so:
+          <var name="db_driver" value="pdo_mysql"/>
+          <var name="db_host" value="localhost" />
+          <var name="db_user" value="root" />
+          <var name="db_password" value="" />
+          <var name="db_dbname" value="doctrine_tests" />
+          <var name="db_port" value="3306"/>-->
+        <!--<var name="db_event_subscribers" value="Doctrine\DBAL\Event\Listeners\OracleSessionInit">-->
+        <!--
+         At the start of each test run, we will drop and recreate the test database.
 
-  <php>
-    <ini name="error_reporting" value="-1" />
-    <!-- "Real" test database -->
-    <var name="db_driver" value="pdo_sqlite"/>
-    <var name="db_memory" value="true"/>
-      <!-- to use another database driver / credentials, provide them like so:
-      <var name="db_driver" value="pdo_mysql"/>
-      <var name="db_host" value="localhost" />
-      <var name="db_user" value="root" />
-      <var name="db_password" value="" />
-      <var name="db_dbname" value="doctrine_tests" />
-      <var name="db_port" value="3306"/>-->
-    <!--<var name="db_event_subscribers" value="Doctrine\DBAL\Event\Listeners\OracleSessionInit">-->
+         By default we assume that the `db_` config above has unrestricted access to the provided database
+         platform.
 
-    <!--
-     At the start of each test run, we will drop and recreate the test database.
+         If you prefer, you can provide a restricted user above and a separate `privileged_db` config
+         block to provide details of a privileged connection to use for the setup / teardown actions.
 
-     By default we assume that the `db_` config above has unrestricted access to the provided database
-     platform.
-
-     If you prefer, you can provide a restricted user above and a separate `privileged_db` config
-     block to provide details of a privileged connection to use for the setup / teardown actions.
-
-     Note that these configurations are not merged - if you specify a `privileged_db_driver` then
-     you must also specify all the other options that your driver requires.
-
-    <var name="privileged_db_driver" value="pdo_mysql"/>
-    <var name="privileged_db_host" value="localhost" />
-    <var name="privileged_db_user" value="root" />
-    <var name="privileged_db_password" value="" />
-    <var name="privileged_db_dbname" value="doctrine_tests_tmp" />
-    <var name="privileged_db_port" value="3306"/>
-    -->
-
-    <env name="COLUMNS" value="120"/>
-  </php>
+         Note that these configurations are not merged - if you specify a `privileged_db_driver` then
+         you must also specify all the other options that your driver requires.
 
+        <var name="privileged_db_driver" value="pdo_mysql"/>
+        <var name="privileged_db_host" value="localhost" />
+        <var name="privileged_db_user" value="root" />
+        <var name="privileged_db_password" value="" />
+        <var name="privileged_db_dbname" value="doctrine_tests_tmp" />
+        <var name="privileged_db_port" value="3306"/>
+        -->
+        <env name="COLUMNS" value="120"/>
+    </php>
 </phpunit>