[ticket/17530] Better classes naming

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\phpbb_postgresql_platform;
-use phpbb\db\middleware\oracle\phpbb_oracle_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).
@@ -30,7 +30,7 @@ class case_insensitive_string extends Type
 	 */
 	public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
 	{
-		if ($platform instanceof phpbb_postgresql_platform)
+		if ($platform instanceof postgresql_platform)
 		{
 			return 'varchar_ci';
 		}
@@ -39,7 +39,7 @@ class case_insensitive_string extends Type
 		// we used 3 times larger capacity for strings on oracle for unicode strings
 		// as on other platforms. This is not the case with varchar_ci, which uses
 		// the same length as other platforms.
-		if ($platform instanceof phpbb_oracle_platform)
+		if ($platform instanceof oracle_platform)
 		{
 			return $platform->getAsciiStringTypeDeclarationSQL($column);
 		}

phpBB/phpbb/db/doctrine/connection_factory.php

@@ -20,10 +20,10 @@ use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Types\Type;
 use InvalidArgumentException;
 use phpbb\config_php_file;
-use phpbb\db\middleware\mysql\phpbb_mysql_middleware;
-use phpbb\db\middleware\oracle\phpbb_oracle_middleware;
-use phpbb\db\middleware\postgresql\phpbb_postgresql_middleware;
-use phpbb\db\middleware\sqlsrv\phpbb_sqlsrv_middleware;
+use phpbb\db\middleware\mysql\middleware as mysql_middleware;
+use phpbb\db\middleware\oracle\middleware as oracle_middleware;
+use phpbb\db\middleware\postgresql\middleware as postgresql_middleware;
+use phpbb\db\middleware\sqlsrv\middleware as sqlsrv_middleware;
 use phpbb\exception\runtime_exception;
 
 /**
@@ -101,10 +101,10 @@ class connection_factory
 
 		$middleware = match($driver)
 		{
-			'pdo_mysql', 'mysqli'	=> [new phpbb_mysql_middleware()],
-			'pdo_oci', 'oci8'		=> [new phpbb_oracle_middleware()],
-			'pdo_pgsql', 'pgsql'	=> [new phpbb_postgresql_middleware()],
-			'pdo_sqlsrv', 'sqlsrv'	=> [new phpbb_sqlsrv_middleware()],
+			'pdo_mysql', 'mysqli'	=> [new mysql_middleware()],
+			'pdo_oci', 'oci8'		=> [new oracle_middleware()],
+			'pdo_pgsql', 'pgsql'	=> [new postgresql_middleware()],
+			'pdo_sqlsrv', 'sqlsrv'	=> [new sqlsrv_middleware()],
 			default	=> [],
 		};
 

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/driver.php

@@ -19,13 +19,13 @@ use Doctrine\DBAL\Driver\Middleware\AbstractDriverMiddleware;
  * MySQL Doctrine driver middleware.
  * Makes use of phpBB's MySQL specific platform.
  */
-class phpbb_mysql_driver extends AbstractDriverMiddleware
+class driver extends AbstractDriverMiddleware
 {
 	/**
 	 * {@inheritDoc}
 	 */
 	public function createDatabasePlatformForVersion($version)
 	{
-		return new phpbb_mysql_platform();
+		return new platform();
 	}
 }

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

@@ -14,15 +14,16 @@
 namespace phpbb\db\middleware\mysql;
 
 use Doctrine\DBAL\Driver;
+use phpbb\db\middleware\mysql\driver as mysql_driver;
 
 /**
  * MySQL Doctrine middleware.
  * Makes use of phpBB's MySQL specific platform.
  */
-class phpbb_mysql_middleware implements Driver\Middleware
+class middleware implements Driver\Middleware
 {
 	public function wrap(Driver $driver): Driver
 	{
-		return new phpbb_mysql_driver($driver);
+		return new mysql_driver($driver);
 	}
 }

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

@@ -23,7 +23,7 @@ use Doctrine\DBAL\Schema\TableDiff;
  * If it's indexed as primary key, it should be declared as NOT NULL
  * because MySQL primary key columns cannot be NULL.
  */
-class phpbb_mysql_platform extends AbstractMySQLPlatform
+class platform extends AbstractMySQLPlatform
 {
 	/**
 	 * {@inheritDoc}

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

@@ -21,14 +21,14 @@ use Doctrine\DBAL\Platforms\AbstractPlatform;
  * Oracle Doctrine driver middleware.
  * Makes use of phpBB's Oracle specific platform.
  */
-class phpbb_oracle_driver extends AbstractDriverMiddleware
+class driver extends AbstractDriverMiddleware
 {
 	/**
 	 * {@inheritDoc}
 	 */
 	public function getSchemaManager(DoctrineConnection $conn, AbstractPlatform $platform)
 	{
-		return new phpbb_oracle_schema_manager($conn, $platform);
+		return new schema_manager($conn, $platform);
 	}
 
 	/**
@@ -36,6 +36,6 @@ class phpbb_oracle_driver extends AbstractDriverMiddleware
 	 */
 	public function createDatabasePlatformForVersion($version)
 	{
-		return new phpbb_oracle_platform();
+		return new platform();
 	}
 }

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

@@ -14,15 +14,16 @@
 namespace phpbb\db\middleware\oracle;
 
 use Doctrine\DBAL\Driver;
+use phpbb\db\middleware\oracle\driver as oracle_driver;
 
 /**
  * Oracle Doctrine middleware.
  * Makes use of phpBB's Oracle specific platform.
  */
-class phpbb_oracle_middleware implements Driver\Middleware
+class middleware implements Driver\Middleware
 {
 	public function wrap(Driver $driver): Driver
 	{
-		return new phpbb_oracle_driver($driver);
+		return new oracle_driver($driver);
 	}
 }

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

@@ -21,7 +21,7 @@ use Doctrine\DBAL\Schema\Table;
 /**
  * Oracle specific schema restrictions for BC.
  */
-class phpbb_oracle_platform extends OraclePlatform
+class platform extends OraclePlatform
 {
 	/**
 	 * {@inheritDoc}

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

@@ -18,7 +18,7 @@ use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\OracleSchemaManager;
 use Doctrine\DBAL\Schema\Table;
 
-class phpbb_oracle_schema_manager extends OracleSchemaManager
+class schema_manager extends OracleSchemaManager
 {
 	/**
 	 * {@inheritdoc}

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

@@ -19,13 +19,13 @@ use Doctrine\DBAL\Driver\Middleware\AbstractDriverMiddleware;
  * PostgreSQL Doctrine driver middleware.
  * Makes use of phpBB's PostgreSQL specific platform.
  */
-class phpbb_postgresql_driver extends AbstractDriverMiddleware
+class driver extends AbstractDriverMiddleware
 {
 	/**
 	 * {@inheritDoc}
 	 */
 	public function createDatabasePlatformForVersion($version)
 	{
-		return new phpbb_postgresql_platform();
+		return new platform();
 	}
 }

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

@@ -14,15 +14,16 @@
 namespace phpbb\db\middleware\postgresql;
 
 use Doctrine\DBAL\Driver;
+use phpbb\db\middleware\postgresql\driver as postgresql_driver;
 
 /**
  * PostgreSQL Doctrine middleware.
  * Makes use of phpBB's PostgreSQL specific platform.
  */
-class phpbb_postgresql_middleware implements Driver\Middleware
+class middleware implements Driver\Middleware
 {
 	public function wrap(Driver $driver): Driver
 	{
-		return new phpbb_postgresql_driver($driver);
+		return new postgresql_driver($driver);
 	}
 }

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

@@ -31,7 +31,7 @@ use Doctrine\DBAL\Types\Type;
  * to stay compatible with the existing DB we have to change its
  * naming and not ours.
  */
-class phpbb_postgresql_platform extends PostgreSQLPlatform
+class platform extends PostgreSQLPlatform
 {
 	/**
 	 * {@inheritdoc}

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

@@ -19,13 +19,13 @@ use Doctrine\DBAL\Driver\Middleware\AbstractDriverMiddleware;
  * Microsoft SQL server Doctrine driver middleware.
  * Makes use of phpBB's SQL Server specific platform.
  */
-class phpbb_sqlsrv_driver extends AbstractDriverMiddleware
+class driver extends AbstractDriverMiddleware
 {
 	/**
 	 * {@inheritDoc}
 	 */
 	public function createDatabasePlatformForVersion($version)
 	{
-		return new phpbb_sqlsrv_platform();
+		return new platform();
 	}
 }

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

@@ -14,15 +14,16 @@
 namespace phpbb\db\middleware\sqlsrv;
 
 use Doctrine\DBAL\Driver;
+use phpbb\db\middleware\sqlsrv\driver as sqlsrv_driver;
 
 /**
  * Microsoft SQL server Doctrine middleware.
  * Makes use of phpBB's SQL Server specific platform.
  */
-class phpbb_sqlsrv_middleware implements Driver\Middleware
+class middleware implements Driver\Middleware
 {
 	public function wrap(Driver $driver): Driver
 	{
-		return new phpbb_sqlsrv_driver($driver);
+		return new sqlsrv_driver($driver);
 	}
 }

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

@@ -20,7 +20,7 @@ use Doctrine\DBAL\Schema\TableDiff;
 /**
  * SQLServer specific schema restrictions for BC.
  */
-class phpbb_sqlsrv_platform extends SQLServerPlatform
+class platform extends SQLServerPlatform
 {
 	/**
 	 * {@inheritDoc}