Merge 86195ac0f9 into 8e8418a017

PHPBB-17530

phpBB/phpbb/db/doctrine/case_insensitive_string.php

@@ -15,8 +15,8 @@ namespace phpbb\db\doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
-use phpbb\db\middleware\postgresql\platform as postgresql_platform;
 use phpbb\db\middleware\oracle\platform as oracle_platform;
+use phpbb\db\middleware\postgresql\platform as postgresql_platform;
 
 /**
  * Case-insensitive string type (only supported by Postgres).

phpBB/phpbb/db/doctrine/connection_parameter_factory.php

@@ -13,8 +13,6 @@
 
 namespace phpbb\db\doctrine;
 
-use InvalidArgumentException;
-
 /**
  * Helper class to generate Doctrine DBAL configuration.
  */
@@ -32,7 +30,7 @@ class connection_parameter_factory
 	 *
 	 * @return array Doctrine DBAL connection parameters.
 	 *
-	 * @throws InvalidArgumentException If a required parameter is empty or null.
+	 * @throws \InvalidArgumentException If a required parameter is empty or null.
 	 */
 	public static function get_configuration(
 		string $driver,
@@ -68,7 +66,7 @@ class connection_parameter_factory
 	 *
 	 * @return array Doctrine's DBAL configuration for SQLite.
 	 *
-	 * @throws InvalidArgumentException If a required parameter is empty or null.
+	 * @throws \InvalidArgumentException If a required parameter is empty or null.
 	 */
 	private static function build_connection_parameters(
 		array $params,
@@ -87,7 +85,7 @@ class connection_parameter_factory
 
 		if (empty($user) || empty($name))
 		{
-			throw new InvalidArgumentException('Required database parameter is not set.');
+			throw new \InvalidArgumentException('Required database parameter is not set.');
 		}
 
 		$params = array_merge($params, [

phpBB/phpbb/db/middleware/mysql/middleware.php

@@ -13,8 +13,8 @@
 
 namespace phpbb\db\middleware\mysql;
 
-use phpbb\db\middleware\mysql\driver as mysql_driver;
 use Doctrine\DBAL\Driver;
+use phpbb\db\middleware\mysql\driver as mysql_driver;
 
 /**
  * MySQL Doctrine middleware.

phpBB/phpbb/db/middleware/oracle/middleware.php

@@ -13,8 +13,8 @@
 
 namespace phpbb\db\middleware\oracle;
 
-use phpbb\db\middleware\oracle\driver as oracle_driver;
 use Doctrine\DBAL\Driver;
+use phpbb\db\middleware\oracle\driver as oracle_driver;
 
 /**
  * Oracle Doctrine middleware.

phpBB/phpbb/db/middleware/postgresql/middleware.php

@@ -13,8 +13,8 @@
 
 namespace phpbb\db\middleware\postgresql;
 
-use phpbb\db\middleware\postgresql\driver as postgresql_driver;
 use Doctrine\DBAL\Driver;
+use phpbb\db\middleware\postgresql\driver as postgresql_driver;
 
 /**
  * PostgreSQL Doctrine middleware.

phpBB/phpbb/db/middleware/sqlsrv/middleware.php

@@ -13,8 +13,8 @@
 
 namespace phpbb\db\middleware\sqlsrv;
 
-use phpbb\db\middleware\sqlsrv\driver as sqlsrv_driver;
 use Doctrine\DBAL\Driver;
+use phpbb\db\middleware\sqlsrv\driver as sqlsrv_driver;
 
 /**
  * Microsoft SQL server Doctrine middleware.