Update test files for phpBB4 skeletons

Author: iMattPro

skeleton/phpunit.xml.dist.twig

@@ -47,26 +47,12 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
 		 backupGlobals="true"
-		 backupStaticAttributes="false"
 		 colors="true"
-		 convertErrorsToExceptions="true"
-		 convertNoticesToExceptions="true"
-		 convertWarningsToExceptions="true"
 		 processIsolation="false"
 		 stopOnFailure="false"
 		 cacheResult="false"
 		 bootstrap="../../../../tests/bootstrap.php"
->
-	<coverage>
-		<include>
-			<directory suffix=".php">./</directory>
-		</include>
-		<exclude>
-			<directory suffix=".php">./language/</directory>
-			<directory suffix=".php">./migrations/</directory>
-			<directory suffix=".php">./tests/</directory>
-		</exclude>
-	</coverage>
+		 backupStaticProperties="false">
 	<testsuites>
 		<testsuite name="Extension Test Suite">
 			<directory suffix="_test.php">./tests</directory>
@@ -76,5 +62,17 @@
 			<directory suffix="_test.php">./tests/functional/</directory>
 		</testsuite>
 	</testsuites>
+	<source restrictDeprecations="true"
+			restrictNotices="true"
+			restrictWarnings="true">
+		<include>
+			<directory suffix=".php">./</directory>
+		</include>
+		<exclude>
+			<directory suffix=".php">./language/</directory>
+			<directory suffix=".php">./migrations/</directory>
+			<directory suffix=".php">./tests/</directory>
+		</exclude>
+	</source>
 </phpunit>
 {% endif %}

skeleton/tests/dbal/simple_test.php.twig

@@ -52,7 +52,7 @@ class simple_test extends \phpbb_database_test_case
 		{
 			// This is how to instantiate db_tools in phpBB 3.2
 			$factory = new \phpbb\db\tools\factory();
-			$db_tools = $factory->get($this->db);
+			$db_tools = $factory->get({% if skeleton_version_compare(REQUIREMENTS.phpbb_version_min, "4.0", "<") %}$this->db{% else %}$this->new_doctrine_dbal(){% endif %});
 		}
 
 		$this->assertTrue($db_tools->sql_column_exists(USERS_TABLE, 'user_{{ EXTENSION.extension_name|lower }}'), 'Asserting that column "user_{{ EXTENSION.extension_name|lower }}" exists');