Skip to content

D
doctrine-dbal
Unverified Commit d95ce266 authored by Sergei Morozov's avatar Sergei Morozov
Browse files
Options

Merge pull request #3525 from doctrine/exceptions 

Extract exception factory methods into specific exceptions
parents 6555a467 a2abc86b
Show whitespace changes
Inline Side-by-side
Showing with 1451 additions and 811 deletions
lib/Doctrine/DBAL/Cache/ArrayStatement.php
View file @ d95ce266
......@@ -5,8 +5,8 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Cache;
use ArrayIterator;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver\ResultStatement;
use Doctrine\DBAL\Exception\InvalidColumnIndex;
use Doctrine\DBAL\FetchMode;
use InvalidArgumentException;
use IteratorAggregate;
......@@ -149,7 +149,7 @@ class ArrayStatement implements IteratorAggregate, ResultStatement
}
if (! array_key_exists($columnIndex, $row)) {
throw DBALException::invalidColumnIndex($columnIndex, count($row));
throw InvalidColumnIndex::new($columnIndex, count($row));
}
return $row[$columnIndex];
......
lib/Doctrine/DBAL/Cache/CacheException.php
View file @ d95ce266
......@@ -8,19 +8,4 @@ use Doctrine\DBAL\DBALException;
class CacheException extends DBALException
{
/**
* @return \Doctrine\DBAL\Cache\CacheException
*/
public static function noCacheKey()
{
return new self('No cache key was set.');
}
/**
* @return \Doctrine\DBAL\Cache\CacheException
*/
public static function noResultDriverConfigured()
{
return new self('Trying to cache a query but no result driver is configured.');
}
}
lib/Doctrine/DBAL/Cache/Exception/NoCacheKey.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Cache\Exception;
use Doctrine\DBAL\Cache\CacheException;
final class NoCacheKey extends CacheException
{
public static function new() : self
{
return new self('No cache key was set.');
}
}
lib/Doctrine/DBAL/Cache/Exception/NoResultDriverConfigured.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Cache\Exception;
use Doctrine\DBAL\Cache\CacheException;
final class NoResultDriverConfigured extends CacheException
{
public static function new() : self
{
return new self('Trying to cache a query but no result driver is configured.');
}
}
lib/Doctrine/DBAL/Cache/QueryCacheProfile.php
View file @ d95ce266
......@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Cache;
use Doctrine\Common\Cache\Cache;
use Doctrine\DBAL\Cache\Exception\NoCacheKey;
use function hash;
use function serialize;
use function sha1;
......@@ -60,7 +61,7 @@ class QueryCacheProfile
public function getCacheKey()
{
if ($this->cacheKey === null) {
throw CacheException::noCacheKey();
throw NoCacheKey::new();
}
return $this->cacheKey;
......
lib/Doctrine/DBAL/Cache/ResultCacheStatement.php
View file @ d95ce266
......@@ -6,8 +6,8 @@ namespace Doctrine\DBAL\Cache;
use ArrayIterator;
use Doctrine\Common\Cache\Cache;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver\ResultStatement;
use Doctrine\DBAL\Exception\InvalidColumnIndex;
use Doctrine\DBAL\FetchMode;
use InvalidArgumentException;
use IteratorAggregate;
......@@ -192,7 +192,7 @@ class ResultCacheStatement implements IteratorAggregate, ResultStatement
}
if (! array_key_exists($columnIndex, $row)) {
throw DBALException::invalidColumnIndex($columnIndex, count($row));
throw InvalidColumnIndex::new($columnIndex, count($row));
}
return $row[$columnIndex];
......
lib/Doctrine/DBAL/Connection.php
View file @ d95ce266
......@@ -8,6 +8,7 @@ use Closure;
use Doctrine\Common\EventManager;
use Doctrine\DBAL\Cache\ArrayStatement;
use Doctrine\DBAL\Cache\CacheException;
use Doctrine\DBAL\Cache\Exception\NoResultDriverConfigured;
use Doctrine\DBAL\Cache\QueryCacheProfile;
use Doctrine\DBAL\Cache\ResultCacheStatement;
use Doctrine\DBAL\Driver\Connection as DriverConnection;
......@@ -16,7 +17,13 @@ use Doctrine\DBAL\Driver\PingableConnection;
use Doctrine\DBAL\Driver\ResultStatement;
use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
use Doctrine\DBAL\Driver\Statement as DriverStatement;
use Doctrine\DBAL\Exception\CommitFailedRollbackOnly;
use Doctrine\DBAL\Exception\EmptyCriteriaNotAllowed;
use Doctrine\DBAL\Exception\InvalidArgumentException;
use Doctrine\DBAL\Exception\InvalidPlatformType;
use Doctrine\DBAL\Exception\MayNotAlterNestedTransactionWithSavepointsInTransaction;
use Doctrine\DBAL\Exception\NoActiveTransaction;
use Doctrine\DBAL\Exception\SavepointsNotSupported;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
use Doctrine\DBAL\Query\QueryBuilder;
......@@ -198,7 +205,7 @@ class Connection implements DriverConnection
if (isset($params['platform'])) {
if (! $params['platform'] instanceof Platforms\AbstractPlatform) {
throw DBALException::invalidPlatformType($params['platform']);
throw InvalidPlatformType::new($params['platform']);
}
$this->platform = $params['platform'];
......@@ -651,7 +658,7 @@ class Connection implements DriverConnection
public function delete($tableExpression, array $identifier, array $types = [])
{
if (empty($identifier)) {
throw InvalidArgumentException::fromEmptyCriteria();
throw EmptyCriteriaNotAllowed::new();
}
$columns = $values = $conditions = [];
......@@ -924,7 +931,7 @@ class Connection implements DriverConnection
$resultCache = $qcp->getResultCacheDriver() ?? $this->_config->getResultCacheImpl();
if ($resultCache === null) {
throw CacheException::noResultDriverConfigured();
throw NoResultDriverConfigured::new();
}
$connectionParams = $this->getParams();
......@@ -1134,11 +1141,11 @@ class Connection implements DriverConnection
public function setNestTransactionsWithSavepoints($nestTransactionsWithSavepoints)
{
if ($this->transactionNestingLevel > 0) {
throw ConnectionException::mayNotAlterNestedTransactionWithSavepointsInTransaction();
throw MayNotAlterNestedTransactionWithSavepointsInTransaction::new();
}
if (! $this->getDatabasePlatform()->supportsSavepoints()) {
throw ConnectionException::savepointsNotSupported();
throw SavepointsNotSupported::new();
}
$this->nestTransactionsWithSavepoints = (bool) $nestTransactionsWithSavepoints;
......@@ -1200,11 +1207,10 @@ class Connection implements DriverConnection
public function commit() : void
{
if ($this->transactionNestingLevel === 0) {
throw ConnectionException::noActiveTransaction();
throw NoActiveTransaction::new();
}
if ($this->isRollbackOnly) {
throw ConnectionException::commitFailedRollbackOnly();
throw CommitFailedRollbackOnly::new();
}
$result = true;
......@@ -1265,7 +1271,7 @@ class Connection implements DriverConnection
public function rollBack() : void
{
if ($this->transactionNestingLevel === 0) {
throw ConnectionException::noActiveTransaction();
throw NoActiveTransaction::new();
}
$connection = $this->getWrappedConnection();
......@@ -1309,7 +1315,7 @@ class Connection implements DriverConnection
public function createSavepoint($savepoint)
{
if (! $this->getDatabasePlatform()->supportsSavepoints()) {
throw ConnectionException::savepointsNotSupported();
throw SavepointsNotSupported::new();
}
$this->getWrappedConnection()->exec($this->platform->createSavePoint($savepoint));
......@@ -1327,7 +1333,7 @@ class Connection implements DriverConnection
public function releaseSavepoint($savepoint)
{
if (! $this->getDatabasePlatform()->supportsSavepoints()) {
throw ConnectionException::savepointsNotSupported();
throw SavepointsNotSupported::new();
}
if (! $this->platform->supportsReleaseSavepoints()) {
......@@ -1349,7 +1355,7 @@ class Connection implements DriverConnection
public function rollbackSavepoint($savepoint)
{
if (! $this->getDatabasePlatform()->supportsSavepoints()) {
throw ConnectionException::savepointsNotSupported();
throw SavepointsNotSupported::new();
}
$this->getWrappedConnection()->exec($this->platform->rollbackSavePoint($savepoint));
......@@ -1393,7 +1399,7 @@ class Connection implements DriverConnection
public function setRollbackOnly()
{
if ($this->transactionNestingLevel === 0) {
throw ConnectionException::noActiveTransaction();
throw NoActiveTransaction::new();
}
$this->isRollbackOnly = true;
}
......@@ -1408,7 +1414,7 @@ class Connection implements DriverConnection
public function isRollbackOnly()
{
if ($this->transactionNestingLevel === 0) {
throw ConnectionException::noActiveTransaction();
throw NoActiveTransaction::new();
}
return $this->isRollbackOnly;
......
lib/Doctrine/DBAL/ConnectionException.php
View file @ d95ce266
......@@ -6,35 +6,4 @@ namespace Doctrine\DBAL;
class ConnectionException extends DBALException
{
/**
* @return \Doctrine\DBAL\ConnectionException
*/
public static function commitFailedRollbackOnly()
{
return new self('Transaction commit failed because the transaction has been marked for rollback only.');
}
/**
* @return \Doctrine\DBAL\ConnectionException
*/
public static function noActiveTransaction()
{
return new self('There is no active transaction.');
}
/**
* @return \Doctrine\DBAL\ConnectionException
*/
public static function savepointsNotSupported()
{
return new self('Savepoints are not supported by this driver.');
}
/**
* @return \Doctrine\DBAL\ConnectionException
*/
public static function mayNotAlterNestedTransactionWithSavepointsInTransaction()
{
return new self('May not alter the nested transaction with savepoints behavior while a transaction is open.');
}
}
lib/Doctrine/DBAL/DBALException.php
View file @ d95ce266
......@@ -7,130 +7,19 @@ namespace Doctrine\DBAL;
use Doctrine\DBAL\Driver\DriverException as DriverExceptionInterface;
use Doctrine\DBAL\Driver\ExceptionConverterDriver;
use Doctrine\DBAL\Exception\DriverException;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Type;
use Exception;
use Throwable;
use function array_map;
use function bin2hex;
use function get_class;
use function gettype;
use function implode;
use function is_object;
use function is_resource;
use function is_string;
use function json_encode;
use function preg_replace;
use function spl_object_hash;
use function sprintf;
class DBALException extends Exception
{
/**
* @param string $method
*
* @return \Doctrine\DBAL\DBALException
*/
public static function notSupported($method)
{
return new self(sprintf("Operation '%s' is not supported by platform.", $method));
}
public static function invalidPlatformSpecified() : self
{
return new self(
"Invalid 'platform' option specified, need to give an instance of " . AbstractPlatform::class . '.'
);
}
/**
* @param mixed $invalidPlatform
*/
public static function invalidPlatformType($invalidPlatform) : self
{
if (is_object($invalidPlatform)) {
return new self(
sprintf(
"Option 'platform' must be a subtype of '%s', instance of '%s' given",
AbstractPlatform::class,
get_class($invalidPlatform)
)
);
}
return new self(
sprintf(
"Option 'platform' must be an object and subtype of '%s'. Got '%s'",
AbstractPlatform::class,
gettype($invalidPlatform)
)
);
}
/**
* Returns a new instance for an invalid specified platform version.
*
* @param string $version The invalid platform version given.
* @param string $expectedFormat The expected platform version format.
*
* @return DBALException
*/
public static function invalidPlatformVersionSpecified($version, $expectedFormat)
{
return new self(
sprintf(
'Invalid platform version "%s" specified. ' .
'The platform version has to be specified in the format: "%s".',
$version,
$expectedFormat
)
);
}
/**
* @return \Doctrine\DBAL\DBALException
*/
public static function invalidPdoInstance()
{
return new self(
"The 'pdo' option was used in DriverManager::getConnection() but no " .
'instance of PDO was given.'
);
}
/**
* @param string|null $url The URL that was provided in the connection parameters (if any).
*
* @return \Doctrine\DBAL\DBALException
*/
public static function driverRequired($url = null)
{
if ($url) {
return new self(
sprintf(
"The options 'driver' or 'driverClass' are mandatory if a connection URL without scheme " .
'is given to DriverManager::getConnection(). Given URL: %s',
$url
)
);
}
return new self("The options 'driver' or 'driverClass' are mandatory if no PDO " .
'instance is given to DriverManager::getConnection().');
}
/**
* @param string $unknownDriverName
* @param string[] $knownDrivers
*
* @return \Doctrine\DBAL\DBALException
*/
public static function unknownDriver($unknownDriverName, array $knownDrivers)
{
return new self("The given 'driver' " . $unknownDriverName . ' is unknown, ' .
'Doctrine currently supports only the following drivers: ' . implode(', ', $knownDrivers));
}
/**
* @param string $sql
* @param mixed[] $params
......@@ -196,111 +85,4 @@ class DBALException extends Exception
return $json;
}, $params)) . ']';
}
/**
* @param string $wrapperClass
*
* @return \Doctrine\DBAL\DBALException
*/
public static function invalidWrapperClass($wrapperClass)
{
return new self("The given 'wrapperClass' " . $wrapperClass . ' has to be a ' .
'subtype of \Doctrine\DBAL\Connection.');
}
/**
* @param string $driverClass
*
* @return \Doctrine\DBAL\DBALException
*/
public static function invalidDriverClass($driverClass)
{
return new self("The given 'driverClass' " . $driverClass . ' has to implement the ' . Driver::class . ' interface.');
}
/**
* @param string $tableName
*
* @return \Doctrine\DBAL\DBALException
*/
public static function invalidTableName($tableName)
{
return new self('Invalid table name specified: ' . $tableName);
}
/**
* @param string $tableName
*
* @return \Doctrine\DBAL\DBALException
*/
public static function noColumnsSpecifiedForTable($tableName)
{
return new self('No columns specified for table ' . $tableName);
}
/**
* @return \Doctrine\DBAL\DBALException
*/
public static function limitOffsetInvalid()
{
return new self('Invalid Offset in Limit Query, it has to be larger than or equal to 0.');
}
/**
* @param string $name
*
* @return \Doctrine\DBAL\DBALException
*/
public static function typeExists($name)
{
return new self('Type ' . $name . ' already exists.');
}
/**
* @param string $name
*
* @return \Doctrine\DBAL\DBALException
*/
public static function unknownColumnType($name)
{
return new self('Unknown column type "' . $name . '" requested. Any Doctrine type that you use has ' .
'to be registered with \Doctrine\DBAL\Types\Type::addType(). You can get a list of all the ' .
'known types with \Doctrine\DBAL\Types\Type::getTypesMap(). If this error occurs during database ' .
'introspection then you might have forgotten to register all database types for a Doctrine Type. Use ' .
'AbstractPlatform#registerDoctrineTypeMapping() or have your custom types implement ' .
'Type#getMappedDatabaseTypes(). If the type name is empty you might ' .
'have a problem with the cache or forgot some mapping information.');
}
/**
* @param string $name
*
* @return \Doctrine\DBAL\DBALException
*/
public static function typeNotFound($name)
{
return new self('Type to be overwritten ' . $name . ' does not exist.');
}
public static function typeNotRegistered(Type $type) : self
{
return new self(sprintf('Type of the class %s@%s is not registered.', get_class($type), spl_object_hash($type)));
}
public static function typeAlreadyRegistered(Type $type) : self
{
return new self(
sprintf('Type of the class %s@%s is already registered.', get_class($type), spl_object_hash($type))
);
}
public static function invalidColumnIndex(int $index, int $count) : self
{
return new self(sprintf(
'Invalid column index %d. The statement result contains %d column%s.',
$index,
$count,
$count === 1 ? '' : 's'
));
}
}
lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php
View file @ d95ce266
......@@ -8,6 +8,7 @@ use Doctrine\DBAL\Connection;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver;
use Doctrine\DBAL\Exception;
use Doctrine\DBAL\Platforms\Exception\InvalidPlatformVersion;
use Doctrine\DBAL\Platforms\MariaDb1027Platform;
use Doctrine\DBAL\Platforms\MySQL57Platform;
use Doctrine\DBAL\Platforms\MySQL80Platform;
......@@ -148,7 +149,7 @@ abstract class AbstractMySQLDriver implements Driver, ExceptionConverterDriver,
$versionString,
$versionParts
)) {
throw DBALException::invalidPlatformVersionSpecified(
throw InvalidPlatformVersion::new(
$versionString,
'<major_version>.<minor_version>.<patch_version>'
);
......@@ -179,7 +180,7 @@ abstract class AbstractMySQLDriver implements Driver, ExceptionConverterDriver,
$versionString,
$versionParts
)) {
throw DBALException::invalidPlatformVersionSpecified(
throw InvalidPlatformVersion::new(
$versionString,
'^(?:5\.5\.5-)?(mariadb-)?<major_version>.<minor_version>.<patch_version>'
);
......
lib/Doctrine/DBAL/Driver/AbstractPostgreSQLDriver.php
View file @ d95ce266
......@@ -5,9 +5,9 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Driver;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver;
use Doctrine\DBAL\Exception;
use Doctrine\DBAL\Platforms\Exception\InvalidPlatformVersion;
use Doctrine\DBAL\Platforms\PostgreSQL100Platform;
use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
......@@ -82,7 +82,7 @@ abstract class AbstractPostgreSQLDriver implements Driver, ExceptionConverterDri
public function createDatabasePlatformForVersion($version)
{
if (! preg_match('/^(?P<major>\d+)(?:\.(?P<minor>\d+)(?:\.(?P<patch>\d+))?)?/', $version, $versionParts)) {
throw DBALException::invalidPlatformVersionSpecified(
throw InvalidPlatformVersion::new(
$version,
'<major_version>.<minor_version>.<patch_version>'
);
......
lib/Doctrine/DBAL/Driver/AbstractSQLAnywhereDriver.php
View file @ d95ce266
......@@ -5,9 +5,9 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Driver;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver;
use Doctrine\DBAL\Exception;
use Doctrine\DBAL\Platforms\Exception\InvalidPlatformVersion;
use Doctrine\DBAL\Platforms\SQLAnywherePlatform;
use Doctrine\DBAL\Schema\SQLAnywhereSchemaManager;
use Doctrine\DBAL\VersionAwarePlatformDriver;
......@@ -73,7 +73,7 @@ abstract class AbstractSQLAnywhereDriver implements Driver, ExceptionConverterDr
$version,
$versionParts
)) {
throw DBALException::invalidPlatformVersionSpecified(
throw InvalidPlatformVersion::new(
$version,
'<major_version>.<minor_version>.<patch_version>.<build_version>'
);
......
lib/Doctrine/DBAL/Driver/AbstractSQLServerDriver.php
View file @ d95ce266
......@@ -5,8 +5,8 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Driver;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver;
use Doctrine\DBAL\Platforms\Exception\InvalidPlatformVersion;
use Doctrine\DBAL\Platforms\SQLServer2012Platform;
use Doctrine\DBAL\Platforms\SQLServerPlatform;
use Doctrine\DBAL\Schema\SQLServerSchemaManager;
......@@ -29,7 +29,7 @@ abstract class AbstractSQLServerDriver implements Driver, VersionAwarePlatformDr
$version,
$versionParts
)) {
throw DBALException::invalidPlatformVersionSpecified(
throw InvalidPlatformVersion::new(
$version,
'<major_version>.<minor_version>.<patch_version>.<build_version>'
);
......
lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
View file @ d95ce266
......@@ -4,9 +4,9 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Driver\IBMDB2;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver\Statement;
use Doctrine\DBAL\Driver\StatementIterator;
use Doctrine\DBAL\Exception\InvalidColumnIndex;
use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\ParameterType;
use IteratorAggregate;
......@@ -318,7 +318,7 @@ class DB2Statement implements IteratorAggregate, Statement
}
if (! array_key_exists($columnIndex, $row)) {
throw DBALException::invalidColumnIndex($columnIndex, count($row));
throw InvalidColumnIndex::new($columnIndex, count($row));
}
return $row[$columnIndex];
......
lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
View file @ d95ce266
......@@ -4,11 +4,11 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Driver\Mysqli;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver\DriverException;
use Doctrine\DBAL\Driver\Statement;
use Doctrine\DBAL\Driver\StatementIterator;
use Doctrine\DBAL\Exception\InvalidArgumentException;
use Doctrine\DBAL\Exception\InvalidColumnIndex;
use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\ParameterType;
use IteratorAggregate;
......@@ -382,7 +382,7 @@ class MysqliStatement implements IteratorAggregate, Statement
}
if (! array_key_exists($columnIndex, $row)) {
throw DBALException::invalidColumnIndex($columnIndex, count($row));
throw InvalidColumnIndex::new($columnIndex, count($row));
}
return $row[$columnIndex];
......
lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
View file @ d95ce266
......@@ -4,9 +4,9 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Driver\OCI8;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver\Statement;
use Doctrine\DBAL\Driver\StatementIterator;
use Doctrine\DBAL\Exception\InvalidColumnIndex;
use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\ParameterType;
use InvalidArgumentException;
......@@ -492,7 +492,7 @@ class OCI8Statement implements IteratorAggregate, Statement
}
if (! array_key_exists($columnIndex, $row)) {
throw DBALException::invalidColumnIndex($columnIndex, count($row));
throw InvalidColumnIndex::new($columnIndex, count($row));
}
return $row[$columnIndex];
......
lib/Doctrine/DBAL/Driver/PDOStatement.php
View file @ d95ce266
......@@ -4,7 +4,7 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Driver;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Exception\InvalidColumnIndex;
use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\ParameterType;
use IteratorAggregate;
......@@ -186,7 +186,7 @@ class PDOStatement implements IteratorAggregate, Statement
$columnCount = $this->columnCount();
if ($columnIndex < 0 || $columnIndex >= $columnCount) {
throw DBALException::invalidColumnIndex($columnIndex, $columnCount);
throw InvalidColumnIndex::new($columnIndex, $columnCount);
}
}
......
lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php
View file @ d95ce266
......@@ -4,9 +4,9 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Driver\SQLAnywhere;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver\Statement;
use Doctrine\DBAL\Driver\StatementIterator;
use Doctrine\DBAL\Exception\InvalidColumnIndex;
use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\ParameterType;
use IteratorAggregate;
......@@ -260,7 +260,7 @@ class SQLAnywhereStatement implements IteratorAggregate, Statement
}
if (! array_key_exists($columnIndex, $row)) {
throw DBALException::invalidColumnIndex($columnIndex, count($row));
throw InvalidColumnIndex::new($columnIndex, count($row));
}
}
......
lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php
View file @ d95ce266
......@@ -4,9 +4,9 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Driver\SQLSrv;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver\Statement;
use Doctrine\DBAL\Driver\StatementIterator;
use Doctrine\DBAL\Exception\InvalidColumnIndex;
use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\ParameterType;
use IteratorAggregate;
......@@ -391,7 +391,7 @@ class SQLSrvStatement implements IteratorAggregate, Statement
}
if (! array_key_exists($columnIndex, $row)) {
throw DBALException::invalidColumnIndex($columnIndex, count($row));
throw InvalidColumnIndex::new($columnIndex, count($row));
}
return $row[$columnIndex];
......
lib/Doctrine/DBAL/DriverManager.php
View file @ d95ce266
......@@ -15,6 +15,11 @@ use Doctrine\DBAL\Driver\PDOSqlite\Driver as PDOSQLiteDriver;
use Doctrine\DBAL\Driver\PDOSqlsrv\Driver as PDOSQLSrvDriver;
use Doctrine\DBAL\Driver\SQLAnywhere\Driver as SQLAnywhereDriver;
use Doctrine\DBAL\Driver\SQLSrv\Driver as SQLSrvDriver;
use Doctrine\DBAL\Exception\DriverRequired;
use Doctrine\DBAL\Exception\InvalidDriverClass;
use Doctrine\DBAL\Exception\InvalidPdoInstance;
use Doctrine\DBAL\Exception\InvalidWrapperClass;
use Doctrine\DBAL\Exception\UnknownDriver;
use PDO;
use function array_keys;
use function array_map;
......@@ -172,7 +177,7 @@ final class DriverManager
// check for existing pdo object
if (isset($params['pdo']) && ! $params['pdo'] instanceof PDO) {
throw DBALException::invalidPdoInstance();
throw InvalidPdoInstance::new();
}
if (isset($params['pdo'])) {
......@@ -189,7 +194,7 @@ final class DriverManager
$wrapperClass = Connection::class;
if (isset($params['wrapperClass'])) {
if (! is_subclass_of($params['wrapperClass'], $wrapperClass)) {
throw DBALException::invalidWrapperClass($params['wrapperClass']);
throw InvalidWrapperClass::new($params['wrapperClass']);
}
$wrapperClass = $params['wrapperClass'];
......@@ -221,18 +226,18 @@ final class DriverManager
// driver
if (! isset($params['driver']) && ! isset($params['driverClass'])) {
throw DBALException::driverRequired();
throw DriverRequired::new();
}
// check validity of parameters
// driver
if (isset($params['driver']) && ! isset(self::$_driverMap[$params['driver']])) {
throw DBALException::unknownDriver($params['driver'], array_keys(self::$_driverMap));
throw UnknownDriver::new($params['driver'], array_keys(self::$_driverMap));
}
if (isset($params['driverClass']) && ! in_array(Driver::class, class_implements($params['driverClass'], true))) {
throw DBALException::invalidDriverClass($params['driverClass']);
throw InvalidDriverClass::new($params['driverClass']);
}
}
......@@ -433,7 +438,7 @@ final class DriverManager
// If a schemeless connection URL is given, we require a default driver or default custom driver
// as connection parameter.
if (! isset($params['driverClass']) && ! isset($params['driver'])) {
throw DBALException::driverRequired($params['url']);
throw DriverRequired::new($params['url']);
}
return $params;
......
lib/Doctrine/DBAL/Exception/CommitFailedRollbackOnly.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\ConnectionException;
final class CommitFailedRollbackOnly extends ConnectionException
{
public static function new() : self
{
return new self('Transaction commit failed because the transaction has been marked for rollback only.');
}
}
lib/Doctrine/DBAL/Exception/DriverRequired.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\DBALException;
use function sprintf;
final class DriverRequired extends DBALException
{
/**
* @param string|null $url The URL that was provided in the connection parameters (if any).
*/
public static function new(?string $url = null) : self
{
if ($url !== null) {
return new self(
sprintf(
"The options 'driver' or 'driverClass' are mandatory if a connection URL without scheme "
. 'is given to DriverManager::getConnection(). Given URL: %s',
$url
)
);
}
return new self(
"The options 'driver' or 'driverClass' are mandatory if no PDO "
. 'instance is given to DriverManager::getConnection().'
);
}
}
lib/Doctrine/DBAL/Exception/EmptyCriteriaNotAllowed.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
final class EmptyCriteriaNotAllowed extends InvalidArgumentException
{
public static function new() : self
{
return new self('Empty criteria was used, expected non-empty criteria');
}
}
lib/Doctrine/DBAL/Exception/InvalidArgumentException.php
View file @ d95ce266
......@@ -11,11 +11,4 @@ use Doctrine\DBAL\DBALException;
*/
class InvalidArgumentException extends DBALException
{
/**
* @return self
*/
public static function fromEmptyCriteria()
{
return new self('Empty criteria was used, expected non-empty criteria');
}
}
lib/Doctrine/DBAL/Exception/InvalidColumnIndex.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\DBALException;
use function sprintf;
final class InvalidColumnIndex extends DBALException
{
public static function new(int $index, int $count) : self
{
return new self(sprintf(
'Invalid column index %d. The statement result contains %d column%s.',
$index,
$count,
$count === 1 ? '' : 's'
));
}
}
lib/Doctrine/DBAL/Exception/InvalidDriverClass.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver;
use function sprintf;
final class InvalidDriverClass extends DBALException
{
public static function new(string $driverClass) : self
{
return new self(
sprintf(
"The given 'driverClass' %s has to implement the %s interface.",
$driverClass,
Driver::class
)
);
}
}
lib/Doctrine/DBAL/Exception/InvalidPdoInstance.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\DBALException;
final class InvalidPdoInstance extends DBALException
{
public static function new() : self
{
return new self("The 'pdo' option was used in DriverManager::getConnection() but no instance of PDO was given.");
}
}
lib/Doctrine/DBAL/Exception/InvalidPlatformType.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use function get_class;
use function gettype;
use function is_object;
use function sprintf;
final class InvalidPlatformType extends DBALException
{
/**
* @param mixed $invalidPlatform
*/
public static function new($invalidPlatform) : self
{
if (is_object($invalidPlatform)) {
return new self(
sprintf(
"Option 'platform' must be a subtype of '%s', instance of '%s' given",
AbstractPlatform::class,
get_class($invalidPlatform)
)
);
}
return new self(
sprintf(
"Option 'platform' must be an object and subtype of '%s'. Got '%s'",
AbstractPlatform::class,
gettype($invalidPlatform)
)
);
}
}
lib/Doctrine/DBAL/Exception/InvalidWrapperClass.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\DBALException;
use function sprintf;
final class InvalidWrapperClass extends DBALException
{
public static function new(string $wrapperClass) : self
{
return new self(
sprintf(
"The given 'wrapperClass' %s has to be a subtype of %s.",
$wrapperClass,
Connection::class
)
);
}
}
lib/Doctrine/DBAL/Exception/MayNotAlterNestedTransactionWithSavepointsInTransaction.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\ConnectionException;
final class MayNotAlterNestedTransactionWithSavepointsInTransaction extends ConnectionException
{
public static function new() : self
{
return new self('May not alter the nested transaction with savepoints behavior while a transaction is open.');
}
}
lib/Doctrine/DBAL/Exception/MissingSQLParam.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\SQLParserUtilsException;
use function sprintf;
final class MissingSQLParam extends SQLParserUtilsException
{
public static function new(string $paramName) : self
{
return new self(
sprintf('Value for :%1$s not found in params array. Params array key should be "%1$s"', $paramName)
);
}
}
lib/Doctrine/DBAL/Exception/MissingSQLType.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\SQLParserUtilsException;
use function sprintf;
final class MissingSQLType extends SQLParserUtilsException
{
public static function new(string $typeName) : self
{
return new self(
sprintf('Value for :%1$s not found in types array. Types array key should be "%1$s"', $typeName)
);
}
}
lib/Doctrine/DBAL/Exception/NoActiveTransaction.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\ConnectionException;
final class NoActiveTransaction extends ConnectionException
{
public static function new() : self
{
return new self('There is no active transaction.');
}
}
lib/Doctrine/DBAL/Exception/SavepointsNotSupported.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\ConnectionException;
final class SavepointsNotSupported extends ConnectionException
{
public static function new() : self
{
return new self('Savepoints are not supported by this driver.');
}
}
lib/Doctrine/DBAL/Exception/UnknownDriver.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Exception;
use Doctrine\DBAL\DBALException;
use function implode;
use function sprintf;
final class UnknownDriver extends DBALException
{
/**
* @param string[] $knownDrivers
*/
public static function new(string $unknownDriverName, array $knownDrivers) : self
{
return new self(
sprintf(
"The given 'driver' %s is unknown, Doctrine currently supports only the following drivers: %s",
$unknownDriverName,
implode(', ', $knownDrivers)
)
);
}
}
lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
View file @ d95ce266
......@@ -15,6 +15,8 @@ use Doctrine\DBAL\Event\SchemaCreateTableColumnEventArgs;
use Doctrine\DBAL\Event\SchemaCreateTableEventArgs;
use Doctrine\DBAL\Event\SchemaDropTableEventArgs;
use Doctrine\DBAL\Events;
use Doctrine\DBAL\Platforms\Exception\NoColumnsSpecifiedForTable;
use Doctrine\DBAL\Platforms\Exception\NotSupported;
use Doctrine\DBAL\Platforms\Keywords\KeywordList;
use Doctrine\DBAL\Schema\Column;
use Doctrine\DBAL\Schema\ColumnDiff;
......@@ -28,6 +30,7 @@ use Doctrine\DBAL\Schema\TableDiff;
use Doctrine\DBAL\Schema\UniqueConstraint;
use Doctrine\DBAL\TransactionIsolationLevel;
use Doctrine\DBAL\Types;
use Doctrine\DBAL\Types\Exception\TypeNotFound;
use Doctrine\DBAL\Types\Type;
use InvalidArgumentException;
use UnexpectedValueException;
......@@ -326,7 +329,7 @@ abstract class AbstractPlatform
*/
protected function getVarcharTypeDeclarationSQLSnippet($length, $fixed)
{
throw DBALException::notSupported('VARCHARs not supported by Platform.');
throw NotSupported::new('VARCHARs not supported by Platform.');
}
/**
......@@ -341,7 +344,7 @@ abstract class AbstractPlatform
*/
protected function getBinaryTypeDeclarationSQLSnippet($length, $fixed)
{
throw DBALException::notSupported('BINARY/VARBINARY column types are not supported by this platform.');
throw NotSupported::new('BINARY/VARBINARY column types are not supported by this platform.');
}
/**
......@@ -384,7 +387,7 @@ abstract class AbstractPlatform
}
if (! Types\Type::hasType($doctrineType)) {
throw DBALException::typeNotFound($doctrineType);
throw TypeNotFound::new($doctrineType);
}
$dbType = strtolower($dbType);
......@@ -616,7 +619,7 @@ abstract class AbstractPlatform
*/
public function getRegexpExpression() : string
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -832,7 +835,7 @@ abstract class AbstractPlatform
*/
public function getLocateExpression(string $string, string $substring, ?string $start = null) : string
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -967,7 +970,7 @@ abstract class AbstractPlatform
*/
public function getDateDiffExpression(string $date1, string $date2) : string
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -1192,7 +1195,7 @@ abstract class AbstractPlatform
*/
protected function getDateArithmeticIntervalExpression(string $date, string $operator, string $interval, string $unit) : string
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -1429,7 +1432,7 @@ abstract class AbstractPlatform
}
if (count($table->getColumns()) === 0) {
throw DBALException::noColumnsSpecifiedForTable($table->getName());
throw NoColumnsSpecifiedForTable::new($table->getName());
}
$tableName = $table->getQuotedName($this);
......@@ -1567,7 +1570,7 @@ abstract class AbstractPlatform
public function getInlineColumnCommentSQL($comment)
{
if (! $this->supportsInlineColumnComments()) {
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
return 'COMMENT ' . $this->quoteStringLiteral($comment);
......@@ -1638,7 +1641,7 @@ abstract class AbstractPlatform
*/
public function getCreateSequenceSQL(Sequence $sequence)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -1650,7 +1653,7 @@ abstract class AbstractPlatform
*/
public function getAlterSequenceSQL(Sequence $sequence)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -1776,7 +1779,7 @@ abstract class AbstractPlatform
*/
public function getCreateSchemaSQL($schemaName)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -1845,7 +1848,7 @@ abstract class AbstractPlatform
*/
public function getAlterTableSQL(TableDiff $diff)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2666,7 +2669,7 @@ abstract class AbstractPlatform
*/
public function getListDatabasesSQL()
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2678,7 +2681,7 @@ abstract class AbstractPlatform
*/
public function getListNamespacesSQL()
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2690,7 +2693,7 @@ abstract class AbstractPlatform
*/
public function getListSequencesSQL($database)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2702,7 +2705,7 @@ abstract class AbstractPlatform
*/
public function getListTableConstraintsSQL($table)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2715,7 +2718,7 @@ abstract class AbstractPlatform
*/
public function getListTableColumnsSQL($table, $database = null)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2725,7 +2728,7 @@ abstract class AbstractPlatform
*/
public function getListTablesSQL()
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2735,7 +2738,7 @@ abstract class AbstractPlatform
*/
public function getListUsersSQL()
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2749,7 +2752,7 @@ abstract class AbstractPlatform
*/
public function getListViewsSQL($database)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2771,7 +2774,7 @@ abstract class AbstractPlatform
*/
public function getListTableIndexesSQL($table, $currentDatabase = null)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2783,7 +2786,7 @@ abstract class AbstractPlatform
*/
public function getListTableForeignKeysSQL($table)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2796,7 +2799,7 @@ abstract class AbstractPlatform
*/
public function getCreateViewSQL($name, $sql)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2808,7 +2811,7 @@ abstract class AbstractPlatform
*/
public function getDropViewSQL($name)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2822,7 +2825,7 @@ abstract class AbstractPlatform
*/
public function getDropSequenceSQL($sequence)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2834,7 +2837,7 @@ abstract class AbstractPlatform
*/
public function getSequenceNextValSQL($sequenceName)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2848,7 +2851,7 @@ abstract class AbstractPlatform
*/
public function getCreateDatabaseSQL($database)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2862,7 +2865,7 @@ abstract class AbstractPlatform
*/
public function getSetTransactionIsolationSQL($level)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2877,7 +2880,7 @@ abstract class AbstractPlatform
*/
public function getDateTimeTypeDeclarationSQL(array $fieldDeclaration)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2904,7 +2907,7 @@ abstract class AbstractPlatform
*/
public function getDateTypeDeclarationSQL(array $fieldDeclaration)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -2919,7 +2922,7 @@ abstract class AbstractPlatform
*/
public function getTimeTypeDeclarationSQL(array $fieldDeclaration)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -3017,7 +3020,7 @@ abstract class AbstractPlatform
*/
public function getIdentitySequenceName($tableName, $columnName)
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -3151,7 +3154,7 @@ abstract class AbstractPlatform
*/
public function getDefaultSchemaName()
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......@@ -3467,7 +3470,7 @@ abstract class AbstractPlatform
$class = $this->getReservedKeywordsClass();
$keywords = new $class();
if (! $keywords instanceof KeywordList) {
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
// Store the instance so it doesn't need to be generated on every request.
......@@ -3485,7 +3488,7 @@ abstract class AbstractPlatform
*/
protected function getReservedKeywordsClass()
{
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......
lib/Doctrine/DBAL/Platforms/DB2Platform.php
View file @ d95ce266
......@@ -4,7 +4,7 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Platforms;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Platforms\Exception\NotSupported;
use Doctrine\DBAL\Schema\ColumnDiff;
use Doctrine\DBAL\Schema\Identifier;
use Doctrine\DBAL\Schema\Index;
......@@ -483,7 +483,7 @@ class DB2Platform extends AbstractPlatform
public function getIndexDeclarationSQL($name, Index $index)
{
// Index declaration in statements like CREATE TABLE is not supported.
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......
lib/Doctrine/DBAL/Platforms/Exception/InvalidPlatformVersion.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Platforms\Exception;
use Doctrine\DBAL\DBALException;
use function sprintf;
final class InvalidPlatformVersion extends DBALException implements PlatformException
{
/**
* Returns a new instance for an invalid specified platform version.
*
* @param string $version The invalid platform version given.
* @param string $expectedFormat The expected platform version format.
*/
public static function new(string $version, string $expectedFormat) : self
{
return new self(
sprintf(
'Invalid platform version "%s" specified. The platform version has to be specified in the format: "%s".',
$version,
$expectedFormat
)
);
}
}
lib/Doctrine/DBAL/Platforms/Exception/NoColumnsSpecifiedForTable.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Platforms\Exception;
use Doctrine\DBAL\DBALException;
use function sprintf;
final class NoColumnsSpecifiedForTable extends DBALException implements PlatformException
{
public static function new(string $tableName) : self
{
return new self(sprintf('No columns specified for table %s', $tableName));
}
}
lib/Doctrine/DBAL/Platforms/Exception/NotSupported.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Platforms\Exception;
use Doctrine\DBAL\DBALException;
use function sprintf;
final class NotSupported extends DBALException implements PlatformException
{
public static function new(string $method) : self
{
return new self(sprintf('Operation \'%s\' is not supported by platform.', $method));
}
}
lib/Doctrine/DBAL/Platforms/Exception/PlatformException.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Platforms\Exception;
interface PlatformException
{
}
lib/Doctrine/DBAL/Platforms/SQLAnywherePlatform.php
View file @ d95ce266
......@@ -4,8 +4,8 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Platforms;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\LockMode;
use Doctrine\DBAL\Platforms\Exception\NotSupported;
use Doctrine\DBAL\Schema\Column;
use Doctrine\DBAL\Schema\ColumnDiff;
use Doctrine\DBAL\Schema\Constraint;
......@@ -683,7 +683,7 @@ class SQLAnywherePlatform extends AbstractPlatform
public function getIndexDeclarationSQL($name, Index $index)
{
// Index declaration in statements like CREATE TABLE is not supported.
throw DBALException::notSupported(__METHOD__);
throw NotSupported::new(__METHOD__);
}
/**
......
lib/Doctrine/DBAL/Query/Exception/NonUniqueAlias.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Query\Exception;
use Doctrine\DBAL\Query\QueryException;
use function implode;
use function sprintf;
final class NonUniqueAlias extends QueryException
{
/**
* @param string[] $registeredAliases
*/
public static function new(string $alias, array $registeredAliases) : self
{
return new self(
sprintf(
"The given alias '%s' is not unique in FROM and JOIN clause table. "
. 'The currently registered aliases are: %s.',
$alias,
implode(', ', $registeredAliases)
)
);
}
}
lib/Doctrine/DBAL/Query/Exception/UnknownAlias.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Query\Exception;
use Doctrine\DBAL\Query\QueryException;
use function implode;
use function sprintf;
final class UnknownAlias extends QueryException
{
/**
* @param string[] $registeredAliases
*/
public static function new(string $alias, array $registeredAliases) : self
{
return new self(
sprintf(
"The given alias '%s' is not part of any FROM or JOIN clause table. "
. 'The currently registered aliases are: %s.',
$alias,
implode(', ', $registeredAliases)
)
);
}
}
lib/Doctrine/DBAL/Query/QueryBuilder.php
View file @ d95ce266
......@@ -7,6 +7,8 @@ namespace Doctrine\DBAL\Query;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Driver\Statement;
use Doctrine\DBAL\ParameterType;
use Doctrine\DBAL\Query\Exception\NonUniqueAlias;
use Doctrine\DBAL\Query\Exception\UnknownAlias;
use Doctrine\DBAL\Query\Expression\CompositeExpression;
use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
use function array_key_exists;
......@@ -1181,7 +1183,7 @@ class QueryBuilder
{
foreach ($this->sqlParts['join'] as $fromAlias => $joins) {
if (! isset($knownAliases[$fromAlias])) {
throw QueryException::unknownAlias($fromAlias, array_keys($knownAliases));
throw UnknownAlias::new($fromAlias, array_keys($knownAliases));
}
}
}
......@@ -1339,7 +1341,7 @@ class QueryBuilder
if (isset($this->sqlParts['join'][$fromAlias])) {
foreach ($this->sqlParts['join'][$fromAlias] as $join) {
if (array_key_exists($join['joinAlias'], $knownAliases)) {
throw QueryException::nonUniqueAlias($join['joinAlias'], array_keys($knownAliases));
throw NonUniqueAlias::new($join['joinAlias'], array_keys($knownAliases));
}
$sql .= ' ' . strtoupper($join['joinType'])
. ' JOIN ' . $join['joinTable'] . ' ' . $join['joinAlias']
......
lib/Doctrine/DBAL/Query/QueryException.php
View file @ d95ce266
......@@ -5,33 +5,7 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Query;
use Doctrine\DBAL\DBALException;
use function implode;
class QueryException extends DBALException
{
/**
* @param string $alias
* @param string[] $registeredAliases
*
* @return \Doctrine\DBAL\Query\QueryException
*/
public static function unknownAlias($alias, $registeredAliases)
{
return new self("The given alias '" . $alias . "' is not part of " .
'any FROM or JOIN clause table. The currently registered ' .
'aliases are: ' . implode(', ', $registeredAliases) . '.');
}
/**
* @param string $alias
* @param string[] $registeredAliases
*
* @return \Doctrine\DBAL\Query\QueryException
*/
public static function nonUniqueAlias($alias, $registeredAliases)
{
return new self("The given alias '" . $alias . "' is not unique " .
'in FROM and JOIN clause table. The currently registered ' .
'aliases are: ' . implode(', ', $registeredAliases) . '.');
}
}
lib/Doctrine/DBAL/SQLParserUtils.php
View file @ d95ce266
......@@ -4,6 +4,8 @@ declare(strict_types=1);
namespace Doctrine\DBAL;
use Doctrine\DBAL\Exception\MissingSQLParam;
use Doctrine\DBAL\Exception\MissingSQLType;
use const PREG_OFFSET_CAPTURE;
use function array_fill;
use function array_key_exists;
......@@ -285,9 +287,9 @@ class SQLParserUtils
}
if ($isParam) {
throw SQLParserUtilsException::missingParam($paramName);
throw MissingSQLParam::new($paramName);
}
throw SQLParserUtilsException::missingType($paramName);
throw MissingSQLType::new($paramName);
}
}
lib/Doctrine/DBAL/SQLParserUtilsException.php
View file @ d95ce266
......@@ -4,30 +4,9 @@ declare(strict_types=1);
namespace Doctrine\DBAL;
use function sprintf;
/**
* Doctrine\DBAL\ConnectionException
*/
class SQLParserUtilsException extends DBALException
{
/**
* @param string $paramName
*
* @return \Doctrine\DBAL\SQLParserUtilsException
*/
public static function missingParam($paramName)
{
return new self(sprintf('Value for :%1$s not found in params array. Params array key should be "%1$s"', $paramName));
}
/**
* @param string $typeName
*
* @return \Doctrine\DBAL\SQLParserUtilsException
*/
public static function missingType($typeName)
{
return new self(sprintf('Value for :%1$s not found in types array. Types array key should be "%1$s"', $typeName));
}
}
lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
View file @ d95ce266
......@@ -11,6 +11,7 @@ use Doctrine\DBAL\Event\SchemaColumnDefinitionEventArgs;
use Doctrine\DBAL\Event\SchemaIndexDefinitionEventArgs;
use Doctrine\DBAL\Events;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Platforms\Exception\NotSupported;
use Throwable;
use function array_filter;
use function array_intersect;
......@@ -779,7 +780,7 @@ abstract class AbstractSchemaManager
*/
protected function _getPortableSequenceDefinition($sequence)
{
throw DBALException::notSupported('Sequences');
throw NotSupported::new('Sequences');
}
/**
......
lib/Doctrine/DBAL/Schema/Exception/ColumnAlreadyExists.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class ColumnAlreadyExists extends SchemaException
{
public static function new(string $tableName, string $columnName) : self
{
return new self(
sprintf("The column '%s' on table '%s' already exists.", $columnName, $tableName),
self::COLUMN_ALREADY_EXISTS
);
}
}
lib/Doctrine/DBAL/Schema/Exception/ColumnDoesNotExist.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class ColumnDoesNotExist extends SchemaException
{
public static function new(string $columnName, string $table) : self
{
return new self(
sprintf("There is no column with name '%s' on table '%s'.", $columnName, $table),
self::COLUMN_DOESNT_EXIST
);
}
}
lib/Doctrine/DBAL/Schema/Exception/ForeignKeyDoesNotExist.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class ForeignKeyDoesNotExist extends SchemaException
{
public static function new(string $foreignKeyName, string $table) : self
{
return new self(
sprintf("There exists no foreign key with the name '%s' on table '%s'.", $foreignKeyName, $table),
self::FOREIGNKEY_DOESNT_EXIST
);
}
}
lib/Doctrine/DBAL/Schema/Exception/IndexAlreadyExists.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class IndexAlreadyExists extends SchemaException
{
public static function new(string $indexName, string $table) : self
{
return new self(
sprintf("An index with name '%s' was already defined on table '%s'.", $indexName, $table),
self::INDEX_ALREADY_EXISTS
);
}
}
lib/Doctrine/DBAL/Schema/Exception/IndexDoesNotExist.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class IndexDoesNotExist extends SchemaException
{
public static function new(string $indexName, string $table) : self
{
return new self(
sprintf("Index '%s' does not exist on table '%s'.", $indexName, $table),
self::INDEX_DOESNT_EXIST
);
}
}
lib/Doctrine/DBAL/Schema/Exception/IndexNameInvalid.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class IndexNameInvalid extends SchemaException
{
public static function new(string $indexName) : self
{
return new self(
sprintf('Invalid index-name %s given, has to be [a-zA-Z0-9_]', $indexName),
self::INDEX_INVALID_NAME
);
}
}
lib/Doctrine/DBAL/Schema/Exception/InvalidTableName.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class InvalidTableName extends SchemaException
{
public static function new(string $tableName) : self
{
return new self(sprintf('Invalid table name specified: %s', $tableName));
}
}
lib/Doctrine/DBAL/Schema/Exception/NamedForeignKeyRequired.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\ForeignKeyConstraint;
use Doctrine\DBAL\Schema\SchemaException;
use Doctrine\DBAL\Schema\Table;
use function implode;
use function sprintf;
final class NamedForeignKeyRequired extends SchemaException
{
public static function new(Table $localTable, ForeignKeyConstraint $foreignKey) : self
{
return new self(
sprintf(
'The performed schema operation on %s requires a named foreign key, ' .
"but the given foreign key from (%s) onto foreign table '%s' (%s) is currently unnamed.",
$localTable->getName(),
implode(', ', $foreignKey->getColumns()),
$foreignKey->getForeignTableName(),
implode(', ', $foreignKey->getForeignColumns())
)
);
}
}
lib/Doctrine/DBAL/Schema/Exception/NamespaceAlreadyExists.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class NamespaceAlreadyExists extends SchemaException
{
public static function new(string $namespaceName) : self
{
return new self(
sprintf("The namespace with name '%s' already exists.", $namespaceName),
self::NAMESPACE_ALREADY_EXISTS
);
}
}
lib/Doctrine/DBAL/Schema/Exception/SequenceAlreadyExists.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class SequenceAlreadyExists extends SchemaException
{
public static function new(string $sequenceName) : self
{
return new self(
sprintf("The sequence '%s' already exists.", $sequenceName),
self::SEQUENCE_ALREADY_EXISTS
);
}
}
lib/Doctrine/DBAL/Schema/Exception/SequenceDoesNotExist.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class SequenceDoesNotExist extends SchemaException
{
public static function new(string $sequenceName) : self
{
return new self(
sprintf("There exists no sequence with the name '%s'.", $sequenceName),
self::SEQUENCE_DOENST_EXIST
);
}
}
lib/Doctrine/DBAL/Schema/Exception/TableAlreadyExists.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class TableAlreadyExists extends SchemaException
{
public static function new(string $tableName) : self
{
return new self(
sprintf("The table with name '%s' already exists.", $tableName),
self::TABLE_ALREADY_EXISTS
);
}
}
lib/Doctrine/DBAL/Schema/Exception/TableDoesNotExist.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class TableDoesNotExist extends SchemaException
{
public static function new(string $tableName) : self
{
return new self(
sprintf("There is no table with name '%s' in the schema.", $tableName),
self::TABLE_DOESNT_EXIST
);
}
}
lib/Doctrine/DBAL/Schema/Exception/UniqueConstraintDoesNotExist.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Exception;
use Doctrine\DBAL\Schema\SchemaException;
use function sprintf;
final class UniqueConstraintDoesNotExist extends SchemaException
{
public static function new(string $constraintName, string $table) : self
{
return new self(
sprintf("There exists no unique constraint with the name '%s' on table '%s'.", $constraintName, $table),
self::CONSTRAINT_DOESNT_EXIST
);
}
}
lib/Doctrine/DBAL/Schema/Schema.php
View file @ d95ce266
......@@ -5,6 +5,11 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Schema;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Schema\Exception\NamespaceAlreadyExists;
use Doctrine\DBAL\Schema\Exception\SequenceAlreadyExists;
use Doctrine\DBAL\Schema\Exception\SequenceDoesNotExist;
use Doctrine\DBAL\Schema\Exception\TableAlreadyExists;
use Doctrine\DBAL\Schema\Exception\TableDoesNotExist;
use Doctrine\DBAL\Schema\Visitor\CreateSchemaSqlCollector;
use Doctrine\DBAL\Schema\Visitor\DropSchemaSqlCollector;
use Doctrine\DBAL\Schema\Visitor\NamespaceVisitor;
......@@ -104,7 +109,7 @@ class Schema extends AbstractAsset
$tableName = $table->getFullQualifiedName($this->getName());
if (isset($this->_tables[$tableName])) {
throw SchemaException::tableAlreadyExists($tableName);
throw TableAlreadyExists::new($tableName);
}
if ($namespaceName !== null
......@@ -128,7 +133,7 @@ class Schema extends AbstractAsset
$seqName = $sequence->getFullQualifiedName($this->getName());
if (isset($this->_sequences[$seqName])) {
throw SchemaException::sequenceAlreadyExists($seqName);
throw SequenceAlreadyExists::new($seqName);
}
if ($namespaceName !== null
......@@ -171,7 +176,7 @@ class Schema extends AbstractAsset
{
$tableName = $this->getFullQualifiedAssetName($tableName);
if (! isset($this->_tables[$tableName])) {
throw SchemaException::tableDoesNotExist($tableName);
throw TableDoesNotExist::new($tableName);
}
return $this->_tables[$tableName];
......@@ -270,7 +275,7 @@ class Schema extends AbstractAsset
{
$sequenceName = $this->getFullQualifiedAssetName($sequenceName);
if (! $this->hasSequence($sequenceName)) {
throw SchemaException::sequenceDoesNotExist($sequenceName);
throw SequenceDoesNotExist::new($sequenceName);
}
return $this->_sequences[$sequenceName];
......@@ -298,7 +303,7 @@ class Schema extends AbstractAsset
$unquotedNamespaceName = strtolower($this->getUnquotedAssetName($namespaceName));
if (isset($this->namespaces[$unquotedNamespaceName])) {
throw SchemaException::namespaceAlreadyExists($unquotedNamespaceName);
throw NamespaceAlreadyExists::new($unquotedNamespaceName);
}
$this->namespaces[$unquotedNamespaceName] = $namespaceName;
......
lib/Doctrine/DBAL/Schema/SchemaException.php
View file @ d95ce266
......@@ -5,8 +5,6 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Schema;
use Doctrine\DBAL\DBALException;
use function implode;
use function sprintf;
class SchemaException extends DBALException
{
......@@ -22,180 +20,4 @@ class SchemaException extends DBALException
public const FOREIGNKEY_DOESNT_EXIST = 100;
public const CONSTRAINT_DOESNT_EXIST = 110;
public const NAMESPACE_ALREADY_EXISTS = 120;
/**
* @param string $tableName
*
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function tableDoesNotExist($tableName)
{
return new self("There is no table with name '" . $tableName . "' in the schema.", self::TABLE_DOESNT_EXIST);
}
/**
* @param string $indexName
*
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function indexNameInvalid($indexName)
{
return new self(
sprintf('Invalid index-name %s given, has to be [a-zA-Z0-9_]', $indexName),
self::INDEX_INVALID_NAME
);
}
/**
* @param string $indexName
* @param string $table
*
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function indexDoesNotExist($indexName, $table)
{
return new self(
sprintf("Index '%s' does not exist on table '%s'.", $indexName, $table),
self::INDEX_DOESNT_EXIST
);
}
/**
* @param string $indexName
* @param string $table
*
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function indexAlreadyExists($indexName, $table)
{
return new self(
sprintf("An index with name '%s' was already defined on table '%s'.", $indexName, $table),
self::INDEX_ALREADY_EXISTS
);
}
/**
* @param string $columnName
* @param string $table
*
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function columnDoesNotExist($columnName, $table)
{
return new self(
sprintf("There is no column with name '%s' on table '%s'.", $columnName, $table),
self::COLUMN_DOESNT_EXIST
);
}
/**
* @param string $namespaceName
*
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function namespaceAlreadyExists($namespaceName)
{
return new self(
sprintf("The namespace with name '%s' already exists.", $namespaceName),
self::NAMESPACE_ALREADY_EXISTS
);
}
/**
* @param string $tableName
*
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function tableAlreadyExists($tableName)
{
return new self("The table with name '" . $tableName . "' already exists.", self::TABLE_ALREADY_EXISTS);
}
/**
* @param string $tableName
* @param string $columnName
*
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function columnAlreadyExists($tableName, $columnName)
{
return new self(
"The column '" . $columnName . "' on table '" . $tableName . "' already exists.",
self::COLUMN_ALREADY_EXISTS
);
}
/**
* @param string $sequenceName
*
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function sequenceAlreadyExists($sequenceName)
{
return new self("The sequence '" . $sequenceName . "' already exists.", self::SEQUENCE_ALREADY_EXISTS);
}
/**
* @param string $sequenceName
*
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function sequenceDoesNotExist($sequenceName)
{
return new self("There exists no sequence with the name '" . $sequenceName . "'.", self::SEQUENCE_DOENST_EXIST);
}
/**
* @param string $constraintName
* @param string $table
*
* @return self
*/
public static function uniqueConstraintDoesNotExist($constraintName, $table)
{
return new self(sprintf(
'There exists no unique constraint with the name "%s" on table "%s".',
$constraintName,
$table
), self::CONSTRAINT_DOESNT_EXIST);
}
/**
* @param string $fkName
* @param string $table
*
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function foreignKeyDoesNotExist($fkName, $table)
{
return new self(
sprintf("There exists no foreign key with the name '%s' on table '%s'.", $fkName, $table),
self::FOREIGNKEY_DOESNT_EXIST
);
}
/**
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function namedForeignKeyRequired(Table $localTable, ForeignKeyConstraint $foreignKey)
{
return new self(
'The performed schema operation on ' . $localTable->getName() . ' requires a named foreign key, ' .
'but the given foreign key from (' . implode(', ', $foreignKey->getColumns()) . ') onto foreign table ' .
"'" . $foreignKey->getForeignTableName() . "' (" . implode(', ', $foreignKey->getForeignColumns()) . ') is currently ' .
'unnamed.'
);
}
/**
* @param string $changeName
*
* @return \Doctrine\DBAL\Schema\SchemaException
*/
public static function alterTableChangeNotSupported($changeName)
{
return new self(
sprintf("Alter table change not supported, given '%s'", $changeName)
);
}
}
lib/Doctrine/DBAL/Schema/Table.php
View file @ d95ce266
......@@ -5,6 +5,14 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Schema;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Schema\Exception\ColumnAlreadyExists;
use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
use Doctrine\DBAL\Schema\Exception\ForeignKeyDoesNotExist;
use Doctrine\DBAL\Schema\Exception\IndexAlreadyExists;
use Doctrine\DBAL\Schema\Exception\IndexDoesNotExist;
use Doctrine\DBAL\Schema\Exception\IndexNameInvalid;
use Doctrine\DBAL\Schema\Exception\InvalidTableName;
use Doctrine\DBAL\Schema\Exception\UniqueConstraintDoesNotExist;
use Doctrine\DBAL\Schema\Visitor\Visitor;
use Doctrine\DBAL\Types\Type;
use function array_keys;
......@@ -68,7 +76,7 @@ class Table extends AbstractAsset
array $options = []
) {
if (strlen($tableName) === 0) {
throw DBALException::invalidTableName($tableName);
throw InvalidTableName::new($tableName);
}
$this->_setName($tableName);
......@@ -187,7 +195,7 @@ class Table extends AbstractAsset
$indexName = $this->normalizeIdentifier($indexName);
if (! $this->hasIndex($indexName)) {
throw SchemaException::indexDoesNotExist($indexName, $this->_name);
throw IndexDoesNotExist::new($indexName, $this->_name);
}
unset($this->_indexes[$indexName]);
......@@ -235,11 +243,11 @@ class Table extends AbstractAsset
}
if (! $this->hasIndex($oldIndexName)) {
throw SchemaException::indexDoesNotExist($oldIndexName, $this->_name);
throw IndexDoesNotExist::new($oldIndexName, $this->_name);
}
if ($this->hasIndex($normalizedNewIndexName)) {
throw SchemaException::indexAlreadyExists($normalizedNewIndexName, $this->_name);
throw IndexAlreadyExists::new($normalizedNewIndexName, $this->_name);
}
$oldIndex = $this->_indexes[$oldIndexName];
......@@ -411,14 +419,14 @@ class Table extends AbstractAsset
if ($foreignTable instanceof Table) {
foreach ($foreignColumnNames as $columnName) {
if (! $foreignTable->hasColumn($columnName)) {
throw SchemaException::columnDoesNotExist($columnName, $foreignTable->getName());
throw ColumnDoesNotExist::new($columnName, $foreignTable->getName());
}
}
}
foreach ($localColumnNames as $columnName) {
if (! $this->hasColumn($columnName)) {
throw SchemaException::columnDoesNotExist($columnName, $this->_name);
throw ColumnDoesNotExist::new($columnName, $this->_name);
}
}
......@@ -474,7 +482,7 @@ class Table extends AbstractAsset
$constraintName = $this->normalizeIdentifier($constraintName);
if (! $this->hasForeignKey($constraintName)) {
throw SchemaException::foreignKeyDoesNotExist($constraintName, $this->_name);
throw ForeignKeyDoesNotExist::new($constraintName, $this->_name);
}
return $this->_fkConstraints[$constraintName];
......@@ -494,7 +502,7 @@ class Table extends AbstractAsset
$constraintName = $this->normalizeIdentifier($constraintName);
if (! $this->hasForeignKey($constraintName)) {
throw SchemaException::foreignKeyDoesNotExist($constraintName, $this->_name);
throw ForeignKeyDoesNotExist::new($constraintName, $this->_name);
}
unset($this->_fkConstraints[$constraintName]);
......@@ -528,7 +536,7 @@ class Table extends AbstractAsset
$constraintName = $this->normalizeIdentifier($constraintName);
if (! $this->hasUniqueConstraint($constraintName)) {
throw SchemaException::uniqueConstraintDoesNotExist($constraintName, $this->_name);
throw UniqueConstraintDoesNotExist::new($constraintName, $this->_name);
}
return $this->_uniqueConstraints[$constraintName];
......@@ -548,7 +556,7 @@ class Table extends AbstractAsset
$constraintName = $this->normalizeIdentifier($constraintName);
if (! $this->hasUniqueConstraint($constraintName)) {
throw SchemaException::uniqueConstraintDoesNotExist($constraintName, $this->_name);
throw UniqueConstraintDoesNotExist::new($constraintName, $this->_name);
}
unset($this->_uniqueConstraints[$constraintName]);
......@@ -613,7 +621,7 @@ class Table extends AbstractAsset
$columnName = $this->normalizeIdentifier($columnName);
if (! $this->hasColumn($columnName)) {
throw SchemaException::columnDoesNotExist($columnName, $this->_name);
throw ColumnDoesNotExist::new($columnName, $this->_name);
}
return $this->_columns[$columnName];
......@@ -687,7 +695,7 @@ class Table extends AbstractAsset
$indexName = $this->normalizeIdentifier($indexName);
if (! $this->hasIndex($indexName)) {
throw SchemaException::indexDoesNotExist($indexName, $this->_name);
throw IndexDoesNotExist::new($indexName, $this->_name);
}
return $this->_indexes[$indexName];
......@@ -811,7 +819,7 @@ class Table extends AbstractAsset
$columnName = $this->normalizeIdentifier($columnName);
if (isset($this->_columns[$columnName])) {
throw SchemaException::columnAlreadyExists($this->getName(), $columnName);
throw ColumnAlreadyExists::new($this->getName(), $columnName);
}
$this->_columns[$columnName] = $column;
......@@ -841,7 +849,7 @@ class Table extends AbstractAsset
if ((isset($this->_indexes[$indexName]) && ! in_array($indexName, $replacedImplicitIndexes, true)) ||
($this->_primaryKeyName !== false && $indexCandidate->isPrimary())
) {
throw SchemaException::indexAlreadyExists($indexName, $this->_name);
throw IndexAlreadyExists::new($indexName, $this->_name);
}
foreach ($replacedImplicitIndexes as $name) {
......@@ -983,7 +991,7 @@ class Table extends AbstractAsset
private function _createUniqueConstraint(array $columns, $indexName, array $flags = [], array $options = [])
{
if (preg_match('(([^a-zA-Z0-9_]+))', $this->normalizeIdentifier($indexName))) {
throw SchemaException::indexNameInvalid($indexName);
throw IndexNameInvalid::new($indexName);
}
foreach ($columns as $index => $value) {
......@@ -994,7 +1002,7 @@ class Table extends AbstractAsset
}
if (! $this->hasColumn($columnName)) {
throw SchemaException::columnDoesNotExist($columnName, $this->_name);
throw ColumnDoesNotExist::new($columnName, $this->_name);
}
}
......@@ -1016,7 +1024,7 @@ class Table extends AbstractAsset
private function _createIndex(array $columns, $indexName, $isUnique, $isPrimary, array $flags = [], array $options = [])
{
if (preg_match('(([^a-zA-Z0-9_]+))', $this->normalizeIdentifier($indexName))) {
throw SchemaException::indexNameInvalid($indexName);
throw IndexNameInvalid::new($indexName);
}
foreach ($columns as $index => $value) {
......@@ -1027,7 +1035,7 @@ class Table extends AbstractAsset
}
if (! $this->hasColumn($columnName)) {
throw SchemaException::columnDoesNotExist($columnName, $this->_name);
throw ColumnDoesNotExist::new($columnName, $this->_name);
}
}
......
lib/Doctrine/DBAL/Schema/Visitor/DropSchemaSqlCollector.php
View file @ d95ce266
......@@ -5,8 +5,8 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Schema\Visitor;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Schema\Exception\NamedForeignKeyRequired;
use Doctrine\DBAL\Schema\ForeignKeyConstraint;
use Doctrine\DBAL\Schema\SchemaException;
use Doctrine\DBAL\Schema\Sequence;
use Doctrine\DBAL\Schema\Table;
use SplObjectStorage;
......@@ -49,7 +49,7 @@ class DropSchemaSqlCollector extends AbstractVisitor
public function acceptForeignKey(Table $localTable, ForeignKeyConstraint $fkConstraint)
{
if (strlen($fkConstraint->getName()) === 0) {
throw SchemaException::namedForeignKeyRequired($localTable, $fkConstraint);
throw NamedForeignKeyRequired::new($localTable, $fkConstraint);
}
$this->constraints->attach($fkConstraint, $localTable);
......
lib/Doctrine/DBAL/Sharding/Exception/ActiveTransaction.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Sharding\Exception;
use Doctrine\DBAL\Sharding\ShardingException;
final class ActiveTransaction extends ShardingException
{
public static function new() : self
{
return new self('Cannot switch shard during an active transaction.', 1332141766);
}
}
lib/Doctrine/DBAL/Sharding/Exception/MissingDefaultDistributionKey.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Sharding\Exception;
use Doctrine\DBAL\Sharding\ShardingException;
final class MissingDefaultDistributionKey extends ShardingException
{
public static function new() : self
{
return new self('SQLAzure requires a distribution key to be set during sharding configuration.', 1332141329);
}
}
lib/Doctrine/DBAL/Sharding/Exception/MissingDefaultFederationName.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Sharding\Exception;
use Doctrine\DBAL\Sharding\ShardingException;
final class MissingDefaultFederationName extends ShardingException
{
public static function new() : self
{
return new self('SQLAzure requires a federation name to be set during sharding configuration.', 1332141280);
}
}
lib/Doctrine/DBAL/Sharding/Exception/MissingDistributionType.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Sharding\Exception;
use Doctrine\DBAL\Sharding\ShardingException;
final class MissingDistributionType extends ShardingException
{
public static function new() : self
{
return new self("You have to specify a sharding distribution type such as 'integer', 'string', 'guid'.");
}
}
lib/Doctrine/DBAL/Sharding/Exception/NoShardDistributionValue.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Sharding\Exception;
use Doctrine\DBAL\Sharding\ShardingException;
final class NoShardDistributionValue extends ShardingException
{
public static function new() : self
{
return new self('You have to specify a string or integer as shard distribution value.', 1332142103);
}
}
lib/Doctrine/DBAL/Sharding/Exception/NotImplemented.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Sharding\Exception;
use Doctrine\DBAL\Sharding\ShardingException;
final class NotImplemented extends ShardingException
{
public static function new() : self
{
return new self('This functionality is not implemented with this sharding provider.', 1331557937);
}
}
lib/Doctrine/DBAL/Sharding/SQLAzure/SQLAzureShardManager.php
View file @ d95ce266
......@@ -5,6 +5,10 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Sharding\SQLAzure;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Sharding\Exception\ActiveTransaction;
use Doctrine\DBAL\Sharding\Exception\MissingDefaultDistributionKey;
use Doctrine\DBAL\Sharding\Exception\MissingDefaultFederationName;
use Doctrine\DBAL\Sharding\Exception\MissingDistributionType;
use Doctrine\DBAL\Sharding\ShardingException;
use Doctrine\DBAL\Sharding\ShardManager;
use Doctrine\DBAL\Types\Type;
......@@ -43,15 +47,15 @@ class SQLAzureShardManager implements ShardManager
$params = $conn->getParams();
if (! isset($params['sharding']['federationName'])) {
throw ShardingException::missingDefaultFederationName();
throw MissingDefaultFederationName::new();
}
if (! isset($params['sharding']['distributionKey'])) {
throw ShardingException::missingDefaultDistributionKey();
throw MissingDefaultDistributionKey::new();
}
if (! isset($params['sharding']['distributionType'])) {
throw ShardingException::missingDistributionType();
throw MissingDistributionType::new();
}
$this->federationName = $params['sharding']['federationName'];
......@@ -108,7 +112,7 @@ class SQLAzureShardManager implements ShardManager
public function selectGlobal()
{
if ($this->conn->isTransactionActive()) {
throw ShardingException::activeTransaction();
throw ActiveTransaction::new();
}
$sql = 'USE FEDERATION ROOT WITH RESET';
......@@ -122,7 +126,7 @@ class SQLAzureShardManager implements ShardManager
public function selectShard($distributionValue)
{
if ($this->conn->isTransactionActive()) {
throw ShardingException::activeTransaction();
throw ActiveTransaction::new();
}
$platform = $this->conn->getDatabasePlatform();
......
lib/Doctrine/DBAL/Sharding/ShardingException.php
View file @ d95ce266
......@@ -11,51 +11,4 @@ use Doctrine\DBAL\DBALException;
*/
class ShardingException extends DBALException
{
/**
* @return \Doctrine\DBAL\Sharding\ShardingException
*/
public static function notImplemented()
{
return new self('This functionality is not implemented with this sharding provider.', 1331557937);
}
/**
* @return \Doctrine\DBAL\Sharding\ShardingException
*/
public static function missingDefaultFederationName()
{
return new self('SQLAzure requires a federation name to be set during sharding configuration.', 1332141280);
}
/**
* @return \Doctrine\DBAL\Sharding\ShardingException
*/
public static function missingDefaultDistributionKey()
{
return new self('SQLAzure requires a distribution key to be set during sharding configuration.', 1332141329);
}
/**
* @return \Doctrine\DBAL\Sharding\ShardingException
*/
public static function activeTransaction()
{
return new self('Cannot switch shard during an active transaction.', 1332141766);
}
/**
* @return \Doctrine\DBAL\Sharding\ShardingException
*/
public static function noShardDistributionValue()
{
return new self('You have to specify a string or integer as shard distribution value.', 1332142103);
}
/**
* @return \Doctrine\DBAL\Sharding\ShardingException
*/
public static function missingDistributionType()
{
return new self("You have to specify a sharding distribution type such as 'integer', 'string', 'guid'.");
}
}
lib/Doctrine/DBAL/Types/ArrayType.php
View file @ d95ce266
......@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Types;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
use function is_resource;
use function restore_error_handler;
use function serialize;
......@@ -45,8 +46,8 @@ class ArrayType extends Type
$value = is_resource($value) ? stream_get_contents($value) : $value;
set_error_handler(function (int $code, string $message) : bool {
throw ConversionException::conversionFailedUnserialization($this->getName(), $message);
set_error_handler(function (int $code, string $message) use ($value) : bool {
throw ValueNotConvertible::new($value, $this->getName(), $message);
});
try {
......
lib/Doctrine/DBAL/Types/BinaryType.php
View file @ d95ce266
......@@ -6,6 +6,7 @@ namespace Doctrine\DBAL\Types;
use Doctrine\DBAL\ParameterType;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
use function is_resource;
use function is_string;
use function stream_get_contents;
......@@ -37,7 +38,7 @@ class BinaryType extends Type
}
if (! is_string($value)) {
throw ConversionException::conversionFailed($value, Types::BINARY);
throw ValueNotConvertible::new($value, self::BINARY);
}
return $value;
......
lib/Doctrine/DBAL/Types/BlobType.php
View file @ d95ce266
......@@ -6,6 +6,7 @@ namespace Doctrine\DBAL\Types;
use Doctrine\DBAL\ParameterType;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
use function assert;
use function fopen;
use function fseek;
......@@ -44,7 +45,7 @@ class BlobType extends Type
}
if (! is_resource($value)) {
throw ConversionException::conversionFailed($value, Types::BLOB);
throw ValueNotConvertible::new($value, self::BLOB);
}
return $value;
......
lib/Doctrine/DBAL/Types/ConversionException.php
View file @ d95ce266
......@@ -5,108 +5,10 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Types;
use Doctrine\DBAL\DBALException;
use Throwable;
use function get_class;
use function gettype;
use function implode;
use function is_object;
use function is_scalar;
use function is_string;
use function sprintf;
use function strlen;
use function substr;
/**
* Conversion Exception is thrown when the database to PHP conversion fails.
*/
class ConversionException extends DBALException
{
/**
* Thrown when a Database to Doctrine Type Conversion fails.
*
* @param mixed $value
* @param string $toType
*
* @return \Doctrine\DBAL\Types\ConversionException
*/
public static function conversionFailed($value, $toType)
{
$value = is_string($value) && strlen($value) > 32 ? substr($value, 0, 20) . '...' : $value;
return new self('Could not convert database value "' . $value . '" to Doctrine Type ' . $toType);
}
/**
* Thrown when a Database to Doctrine Type Conversion fails and we can make a statement
* about the expected format.
*
* @param mixed $value
* @param string $toType
* @param string $expectedFormat
*
* @return \Doctrine\DBAL\Types\ConversionException
*/
public static function conversionFailedFormat($value, $toType, $expectedFormat, ?Throwable $previous = null)
{
$value = is_string($value) && strlen($value) > 32 ? substr($value, 0, 20) . '...' : $value;
return new self(
'Could not convert database value "' . $value . '" to Doctrine Type ' .
$toType . '. Expected format: ' . $expectedFormat,
0,
$previous
);
}
/**
* Thrown when the PHP value passed to the converter was not of the expected type.
*
* @param mixed $value
* @param string $toType
* @param string[] $possibleTypes
*
* @return \Doctrine\DBAL\Types\ConversionException
*/
public static function conversionFailedInvalidType($value, $toType, array $possibleTypes)
{
$actualType = is_object($value) ? get_class($value) : gettype($value);
if (is_scalar($value)) {
return new self(sprintf(
"Could not convert PHP value '%s' of type '%s' to type '%s'. Expected one of the following types: %s",
$value,
$actualType,
$toType,
implode(', ', $possibleTypes)
));
}
return new self(sprintf(
"Could not convert PHP value of type '%s' to type '%s'. Expected one of the following types: %s",
$actualType,
$toType,
implode(', ', $possibleTypes)
));
}
public static function conversionFailedSerialization($value, $format, $error)
{
$actualType = is_object($value) ? get_class($value) : gettype($value);
return new self(sprintf(
"Could not convert PHP type '%s' to '%s', as an '%s' error was triggered by the serialization",
$actualType,
$format,
$error
));
}
public static function conversionFailedUnserialization(string $format, string $error) : self
{
return new self(sprintf(
"Could not convert database value to '%s' as an error was triggered by the unserialization: '%s'",
$format,
$error
));
}
}
lib/Doctrine/DBAL/Types/DateImmutableType.php
View file @ d95ce266
......@@ -6,6 +6,8 @@ namespace Doctrine\DBAL\Types;
use DateTimeImmutable;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\InvalidFormat;
use Doctrine\DBAL\Types\Exception\InvalidType;
/**
* Immutable type of {@see DateType}.
......@@ -33,7 +35,7 @@ class DateImmutableType extends DateType
return $value->format($platform->getDateFormatString());
}
throw ConversionException::conversionFailedInvalidType(
throw InvalidType::new(
$value,
$this->getName(),
['null', DateTimeImmutable::class]
......@@ -52,7 +54,7 @@ class DateImmutableType extends DateType
$dateTime = DateTimeImmutable::createFromFormat('!' . $platform->getDateFormatString(), $value);
if (! $dateTime) {
throw ConversionException::conversionFailedFormat(
throw InvalidFormat::new(
$value,
$this->getName(),
$platform->getDateFormatString()
......
lib/Doctrine/DBAL/Types/DateIntervalType.php
View file @ d95ce266
......@@ -6,6 +6,8 @@ namespace Doctrine\DBAL\Types;
use DateInterval;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\InvalidFormat;
use Doctrine\DBAL\Types\Exception\InvalidType;
use Throwable;
use function substr;
......@@ -47,7 +49,7 @@ class DateIntervalType extends Type
return $value->format(self::FORMAT);
}
throw ConversionException::conversionFailedInvalidType($value, $this->getName(), ['null', 'DateInterval']);
throw InvalidType::new($value, $this->getName(), ['null', 'DateInterval']);
}
/**
......@@ -75,7 +77,7 @@ class DateIntervalType extends Type
return $interval;
} catch (Throwable $exception) {
throw ConversionException::conversionFailedFormat($value, $this->getName(), self::FORMAT, $exception);
throw InvalidFormat::new($value, $this->getName(), self::FORMAT, $exception);
}
}
......
lib/Doctrine/DBAL/Types/DateTimeImmutableType.php
View file @ d95ce266
......@@ -6,6 +6,8 @@ namespace Doctrine\DBAL\Types;
use DateTimeImmutable;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\InvalidFormat;
use Doctrine\DBAL\Types\Exception\InvalidType;
use function date_create_immutable;
/**
......@@ -34,7 +36,7 @@ class DateTimeImmutableType extends DateTimeType
return $value->format($platform->getDateTimeFormatString());
}
throw ConversionException::conversionFailedInvalidType(
throw InvalidType::new(
$value,
$this->getName(),
['null', DateTimeImmutable::class]
......@@ -57,7 +59,7 @@ class DateTimeImmutableType extends DateTimeType
}
if (! $dateTime) {
throw ConversionException::conversionFailedFormat(
throw InvalidFormat::new(
$value,
$this->getName(),
$platform->getDateTimeFormatString()
......
lib/Doctrine/DBAL/Types/DateTimeType.php
View file @ d95ce266
......@@ -7,6 +7,8 @@ namespace Doctrine\DBAL\Types;
use DateTime;
use DateTimeInterface;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\InvalidFormat;
use Doctrine\DBAL\Types\Exception\InvalidType;
use function date_create;
/**
......@@ -43,7 +45,7 @@ class DateTimeType extends Type implements PhpDateTimeMappingType
return $value->format($platform->getDateTimeFormatString());
}
throw ConversionException::conversionFailedInvalidType($value, $this->getName(), ['null', 'DateTime']);
throw InvalidType::new($value, $this->getName(), ['null', 'DateTime']);
}
/**
......@@ -62,7 +64,7 @@ class DateTimeType extends Type implements PhpDateTimeMappingType
}
if (! $val) {
throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getDateTimeFormatString());
throw InvalidFormat::new($value, $this->getName(), $platform->getDateTimeFormatString());
}
return $val;
......
lib/Doctrine/DBAL/Types/DateTimeTzImmutableType.php
View file @ d95ce266
......@@ -6,6 +6,8 @@ namespace Doctrine\DBAL\Types;
use DateTimeImmutable;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\InvalidFormat;
use Doctrine\DBAL\Types\Exception\InvalidType;
/**
* Immutable type of {@see DateTimeTzType}.
......@@ -33,7 +35,7 @@ class DateTimeTzImmutableType extends DateTimeTzType
return $value->format($platform->getDateTimeTzFormatString());
}
throw ConversionException::conversionFailedInvalidType(
throw InvalidType::new(
$value,
$this->getName(),
['null', DateTimeImmutable::class]
......@@ -52,7 +54,7 @@ class DateTimeTzImmutableType extends DateTimeTzType
$dateTime = DateTimeImmutable::createFromFormat($platform->getDateTimeTzFormatString(), $value);
if (! $dateTime) {
throw ConversionException::conversionFailedFormat(
throw InvalidFormat::new(
$value,
$this->getName(),
$platform->getDateTimeTzFormatString()
......
lib/Doctrine/DBAL/Types/DateTimeTzType.php
View file @ d95ce266
......@@ -7,6 +7,8 @@ namespace Doctrine\DBAL\Types;
use DateTime;
use DateTimeInterface;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\InvalidFormat;
use Doctrine\DBAL\Types\Exception\InvalidType;
/**
* DateTime type saving additional timezone information.
......@@ -55,7 +57,7 @@ class DateTimeTzType extends Type implements PhpDateTimeMappingType
return $value->format($platform->getDateTimeTzFormatString());
}
throw ConversionException::conversionFailedInvalidType($value, $this->getName(), ['null', 'DateTime']);
throw InvalidType::new($value, $this->getName(), ['null', 'DateTime']);
}
/**
......@@ -69,7 +71,7 @@ class DateTimeTzType extends Type implements PhpDateTimeMappingType
$val = DateTime::createFromFormat($platform->getDateTimeTzFormatString(), $value);
if (! $val) {
throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getDateTimeTzFormatString());
throw InvalidFormat::new($value, $this->getName(), $platform->getDateTimeTzFormatString());
}
return $val;
......
lib/Doctrine/DBAL/Types/DateType.php
View file @ d95ce266
......@@ -7,6 +7,8 @@ namespace Doctrine\DBAL\Types;
use DateTime;
use DateTimeInterface;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\InvalidFormat;
use Doctrine\DBAL\Types\Exception\InvalidType;
/**
* Type that maps an SQL DATE to a PHP Date object.
......@@ -42,7 +44,7 @@ class DateType extends Type
return $value->format($platform->getDateFormatString());
}
throw ConversionException::conversionFailedInvalidType($value, $this->getName(), ['null', 'DateTime']);
throw InvalidType::new($value, $this->getName(), ['null', 'DateTime']);
}
/**
......@@ -56,7 +58,7 @@ class DateType extends Type
$val = DateTime::createFromFormat('!' . $platform->getDateFormatString(), $value);
if (! $val) {
throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getDateFormatString());
throw InvalidFormat::new($value, $this->getName(), $platform->getDateFormatString());
}
return $val;
......
lib/Doctrine/DBAL/Types/Exception/InvalidFormat.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Types\Exception;
use Doctrine\DBAL\Types\ConversionException;
use Throwable;
use function sprintf;
use function strlen;
use function substr;
/**
* Thrown when a Database to Doctrine Type Conversion fails and we can make a statement
* about the expected format.
*/
final class InvalidFormat extends ConversionException implements TypesException
{
public static function new(
string $value,
string $toType,
?string $expectedFormat,
?Throwable $previous = null
) : self {
return new self(
sprintf(
'Could not convert database value "%s" to Doctrine Type %s. Expected format: %s',
strlen($value) > 32 ? substr($value, 0, 20) . '...' : $value,
$toType,
$expectedFormat ?? ''
),
0,
$previous
);
}
}
lib/Doctrine/DBAL/Types/Exception/InvalidType.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Types\Exception;
use Doctrine\DBAL\Types\ConversionException;
use function get_class;
use function gettype;
use function implode;
use function is_object;
use function is_scalar;
use function sprintf;
/**
* Thrown when the PHP value passed to the converter was not of the expected type.
*/
final class InvalidType extends ConversionException implements TypesException
{
/**
* @param mixed $value
* @param string[] $possibleTypes
*
* @todo split into two methods
* @todo sanitize value
*/
public static function new($value, string $toType, array $possibleTypes) : self
{
$actualType = is_object($value) ? get_class($value) : gettype($value);
if (is_scalar($value)) {
return new self(
sprintf(
"Could not convert PHP value '%s' of type '%s' to type '%s'. Expected one of the following types: %s",
$value,
$actualType,
$toType,
implode(', ', $possibleTypes)
)
);
}
return new self(
sprintf(
"Could not convert PHP value of type '%s' to type '%s'. Expected one of the following types: %s",
$actualType,
$toType,
implode(', ', $possibleTypes)
)
);
}
}
lib/Doctrine/DBAL/Types/Exception/SerializationFailed.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Types\Exception;
use Doctrine\DBAL\Types\ConversionException;
use function get_class;
use function gettype;
use function is_object;
use function sprintf;
final class SerializationFailed extends ConversionException implements TypesException
{
/**
* @param mixed $value
*/
public static function new($value, string $format, string $error) : self
{
$actualType = is_object($value) ? get_class($value) : gettype($value);
return new self(
sprintf(
"Could not convert PHP type '%s' to '%s', as an '%s' error was triggered by the serialization",
$actualType,
$format,
$error
)
);
}
}
lib/Doctrine/DBAL/Types/Exception/TypeAlreadyRegistered.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Types\Exception;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Types\Type;
use function get_class;
use function spl_object_hash;
use function sprintf;
final class TypeAlreadyRegistered extends DBALException implements TypesException
{
public static function new(Type $type) : self
{
return new self(sprintf(
'Type of the class %s@%s is already registered.',
get_class($type),
spl_object_hash($type)
));
}
}
lib/Doctrine/DBAL/Types/Exception/TypeNotFound.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Types\Exception;
use Doctrine\DBAL\DBALException;
use function sprintf;
final class TypeNotFound extends DBALException implements TypesException
{
public static function new(string $name) : self
{
return new self(sprintf('Type to be overwritten %s does not exist.', $name));
}
}
lib/Doctrine/DBAL/Types/Exception/TypeNotRegistered.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Types\Exception;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Types\Type;
use function get_class;
use function spl_object_hash;
use function sprintf;
final class TypeNotRegistered extends DBALException implements TypesException
{
public static function new(Type $type) : self
{
return new self(sprintf('Type of the class %s@%s is not registered.', get_class($type), spl_object_hash($type)));
}
}
lib/Doctrine/DBAL/Types/Exception/TypesAlreadyExists.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Types\Exception;
use Doctrine\DBAL\DBALException;
use function sprintf;
final class TypesAlreadyExists extends DBALException implements TypesException
{
public static function new(string $name) : self
{
return new self(sprintf('Type %s already exists.', $name));
}
}
lib/Doctrine/DBAL/Types/Exception/TypesException.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Types\Exception;
interface TypesException
{
}
lib/Doctrine/DBAL/Types/Exception/UnknownColumnType.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Types\Exception;
use Doctrine\DBAL\DBALException;
use function sprintf;
final class UnknownColumnType extends DBALException implements TypesException
{
public static function new(string $name) : self
{
return new self(
sprintf(
'Unknown column type "%s" requested. Any Doctrine type that you use has '
. 'to be registered with \Doctrine\DBAL\Types\Type::addType(). You can get a list of all the '
. 'known types with \Doctrine\DBAL\Types\Type::getTypesMap(). If this error occurs during database '
. 'introspection then you might have forgotten to register all database types for a Doctrine Type. '
. 'Use AbstractPlatform#registerDoctrineTypeMapping() or have your custom types implement '
. 'Type#getMappedDatabaseTypes(). If the type name is empty you might '
. 'have a problem with the cache or forgot some mapping information.',
$name
)
);
}
}
lib/Doctrine/DBAL/Types/Exception/ValueNotConvertible.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\DBAL\Types\Exception;
use Doctrine\DBAL\Types\ConversionException;
use function is_string;
use function sprintf;
use function strlen;
use function substr;
/**
* Thrown when a Database to Doctrine Type Conversion fails.
*/
final class ValueNotConvertible extends ConversionException implements TypesException
{
public static function new($value, $toType, ?string $message = null) : self
{
if ($message !== null) {
return new self(
sprintf(
"Could not convert database value to '%s' as an error was triggered by the unserialization: '%s'",
$toType,
$message
)
);
}
return new self(
sprintf(
'Could not convert database value "%s" to Doctrine Type %s',
is_string($value) && strlen($value) > 32 ? substr($value, 0, 20) . '...' : $value,
$toType
)
);
}
}
lib/Doctrine/DBAL/Types/JsonType.php
View file @ d95ce266
......@@ -5,6 +5,8 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Types;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\SerializationFailed;
use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
use const JSON_ERROR_NONE;
use function is_resource;
use function json_decode;
......@@ -38,7 +40,7 @@ class JsonType extends Type
$encoded = json_encode($value);
if (json_last_error() !== JSON_ERROR_NONE) {
throw ConversionException::conversionFailedSerialization($value, 'json', json_last_error_msg());
throw SerializationFailed::new($value, 'json', json_last_error_msg());
}
return $encoded;
......@@ -60,7 +62,7 @@ class JsonType extends Type
$val = json_decode($value, true);
if (json_last_error() !== JSON_ERROR_NONE) {
throw ConversionException::conversionFailed($value, $this->getName());
throw ValueNotConvertible::new($value, $this->getName());
}
return $val;
......
lib/Doctrine/DBAL/Types/ObjectType.php
View file @ d95ce266
......@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Types;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
use function is_resource;
use function restore_error_handler;
use function serialize;
......@@ -44,8 +45,8 @@ class ObjectType extends Type
$value = is_resource($value) ? stream_get_contents($value) : $value;
set_error_handler(function (int $code, string $message) : bool {
throw ConversionException::conversionFailedUnserialization($this->getName(), $message);
set_error_handler(function (int $code, string $message) use ($value) : bool {
throw ValueNotConvertible::new($value, $this->getName(), $message);
});
try {
......
lib/Doctrine/DBAL/Types/TimeImmutableType.php
View file @ d95ce266
......@@ -6,6 +6,8 @@ namespace Doctrine\DBAL\Types;
use DateTimeImmutable;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\InvalidFormat;
use Doctrine\DBAL\Types\Exception\InvalidType;
/**
* Immutable type of {@see TimeType}.
......@@ -33,7 +35,7 @@ class TimeImmutableType extends TimeType
return $value->format($platform->getTimeFormatString());
}
throw ConversionException::conversionFailedInvalidType(
throw InvalidType::new(
$value,
$this->getName(),
['null', DateTimeImmutable::class]
......@@ -52,7 +54,7 @@ class TimeImmutableType extends TimeType
$dateTime = DateTimeImmutable::createFromFormat('!' . $platform->getTimeFormatString(), $value);
if (! $dateTime) {
throw ConversionException::conversionFailedFormat(
throw InvalidFormat::new(
$value,
$this->getName(),
$platform->getTimeFormatString()
......
lib/Doctrine/DBAL/Types/TimeType.php
View file @ d95ce266
......@@ -7,6 +7,8 @@ namespace Doctrine\DBAL\Types;
use DateTime;
use DateTimeInterface;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\InvalidFormat;
use Doctrine\DBAL\Types\Exception\InvalidType;
/**
* Type that maps an SQL TIME to a PHP DateTime object.
......@@ -42,7 +44,7 @@ class TimeType extends Type
return $value->format($platform->getTimeFormatString());
}
throw ConversionException::conversionFailedInvalidType($value, $this->getName(), ['null', 'DateTime']);
throw InvalidType::new($value, $this->getName(), ['null', 'DateTime']);
}
/**
......@@ -56,7 +58,7 @@ class TimeType extends Type
$val = DateTime::createFromFormat('!' . $platform->getTimeFormatString(), $value);
if (! $val) {
throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getTimeFormatString());
throw InvalidFormat::new($value, $this->getName(), $platform->getTimeFormatString());
}
return $val;
......
lib/Doctrine/DBAL/Types/TypeRegistry.php
View file @ d95ce266
......@@ -5,6 +5,11 @@ declare(strict_types=1);
namespace Doctrine\DBAL\Types;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Types\Exception\TypeAlreadyRegistered;
use Doctrine\DBAL\Types\Exception\TypeNotFound;
use Doctrine\DBAL\Types\Exception\TypeNotRegistered;
use Doctrine\DBAL\Types\Exception\TypesAlreadyExists;
use Doctrine\DBAL\Types\Exception\UnknownColumnType;
use function array_search;
use function in_array;
......@@ -27,7 +32,7 @@ final class TypeRegistry
public function get(string $name) : Type
{
if (! isset($this->instances[$name])) {
throw DBALException::unknownColumnType($name);
throw UnknownColumnType::new($name);
}
return $this->instances[$name];
......@@ -43,7 +48,7 @@ final class TypeRegistry
$name = $this->findTypeName($type);
if ($name === null) {
throw DBALException::typeNotRegistered($type);
throw TypeNotRegistered::new($type);
}
return $name;
......@@ -65,11 +70,11 @@ final class TypeRegistry
public function register(string $name, Type $type) : void
{
if (isset($this->instances[$name])) {
throw DBALException::typeExists($name);
throw TypesAlreadyExists::new($name);
}
if ($this->findTypeName($type) !== null) {
throw DBALException::typeAlreadyRegistered($type);
throw TypeAlreadyRegistered::new($type);
}
$this->instances[$name] = $type;
......@@ -83,11 +88,11 @@ final class TypeRegistry
public function override(string $name, Type $type) : void
{
if (! isset($this->instances[$name])) {
throw DBALException::typeNotFound($name);
throw TypeNotFound::new($name);
}
if (! in_array($this->findTypeName($type), [$name, null], true)) {
throw DBALException::typeAlreadyRegistered($type);
throw TypeAlreadyRegistered::new($type);
}
$this->instances[$name] = $type;
......
lib/Doctrine/DBAL/Types/VarDateTimeImmutableType.php
View file @ d95ce266
......@@ -6,6 +6,8 @@ namespace Doctrine\DBAL\Types;
use DateTimeImmutable;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\InvalidType;
use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
use function date_create_immutable;
/**
......@@ -34,7 +36,7 @@ class VarDateTimeImmutableType extends VarDateTimeType
return $value->format($platform->getDateTimeFormatString());
}
throw ConversionException::conversionFailedInvalidType(
throw InvalidType::new(
$value,
$this->getName(),
['null', DateTimeImmutable::class]
......@@ -53,7 +55,7 @@ class VarDateTimeImmutableType extends VarDateTimeType
$dateTime = date_create_immutable($value);
if (! $dateTime) {
throw ConversionException::conversionFailed($value, $this->getName());
throw ValueNotConvertible::new($value, $this->getName());
}
return $dateTime;
......
lib/Doctrine/DBAL/Types/VarDateTimeType.php
View file @ d95ce266
......@@ -6,6 +6,7 @@ namespace Doctrine\DBAL\Types;
use DateTime;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
use function date_create;
/**
......@@ -28,7 +29,7 @@ class VarDateTimeType extends DateTimeType
$val = date_create($value);
if (! $val) {
throw ConversionException::conversionFailed($value, $this->getName());
throw ValueNotConvertible::new($value, $this->getName());
}
return $val;
......
tests/Doctrine/Tests/DBAL/DBALExceptionTest.php
View file @ d95ce266
......@@ -8,6 +8,8 @@ use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Driver;
use Doctrine\DBAL\Driver\DriverException as InnerDriverException;
use Doctrine\DBAL\Exception\DriverException;
use Doctrine\DBAL\Exception\DriverRequired;
use Doctrine\DBAL\Exception\InvalidPlatformType;
use Doctrine\Tests\DbalTestCase;
use Exception;
use stdClass;
......@@ -49,7 +51,7 @@ class DBALExceptionTest extends DbalTestCase
public function testDriverRequiredWithUrl() : void
{
$url = 'mysql://localhost';
$exception = DBALException::driverRequired($url);
$exception = DriverRequired::new($url);
self::assertInstanceOf(DBALException::class, $exception);
self::assertSame(
......@@ -67,7 +69,7 @@ class DBALExceptionTest extends DbalTestCase
*/
public function testInvalidPlatformTypeObject() : void
{
$exception = DBALException::invalidPlatformType(new stdClass());
$exception = InvalidPlatformType::new(new stdClass());
self::assertSame(
"Option 'platform' must be a subtype of 'Doctrine\DBAL\Platforms\AbstractPlatform', instance of 'stdClass' given",
......@@ -80,7 +82,7 @@ class DBALExceptionTest extends DbalTestCase
*/
public function testInvalidPlatformTypeScalar() : void
{
$exception = DBALException::invalidPlatformType('some string');
$exception = InvalidPlatformType::new('some string');
self::assertSame(
"Option 'platform' must be an object and subtype of 'Doctrine\DBAL\Platforms\AbstractPlatform'. Got 'string'",
......
tests/Doctrine/Tests/DBAL/Exception/DriverRequiredTest.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\Tests\DBAL\Exception;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Exception\DriverRequired;
use PHPUnit\Framework\TestCase;
use function sprintf;
class DriverRequiredTest extends TestCase
{
public function testDriverRequiredWithUrl() : void
{
$url = 'mysql://localhost';
$exception = DriverRequired::new($url);
self::assertInstanceOf(DBALException::class, $exception);
self::assertSame(
sprintf(
"The options 'driver' or 'driverClass' are mandatory if a connection URL without scheme " .
'is given to DriverManager::getConnection(). Given URL: %s',
$url
),
$exception->getMessage()
);
}
}
tests/Doctrine/Tests/DBAL/Exception/InvalidArgumentExceptionTest.php → tests/Doctrine/Tests/DBAL/Exception/EmptyCriteriaNotAllowedTest.php
View file @ d95ce266
......@@ -4,19 +4,15 @@ declare(strict_types=1);
namespace Doctrine\Tests\DBAL\Exception;
use Doctrine\DBAL\Exception\EmptyCriteriaNotAllowed;
use Doctrine\DBAL\Exception\InvalidArgumentException;
use PHPUnit\Framework\TestCase;
/**
* Tests for {@see \Doctrine\DBAL\Exception\InvalidArgumentException}
*
* @covers \Doctrine\DBAL\Exception\InvalidArgumentException
*/
class InvalidArgumentExceptionTest extends TestCase
class EmptyCriteriaNotAllowedTest extends TestCase
{
public function testFromEmptyCriteria() : void
public function testNew() : void
{
$exception = InvalidArgumentException::fromEmptyCriteria();
$exception = EmptyCriteriaNotAllowed::new();
self::assertInstanceOf(InvalidArgumentException::class, $exception);
self::assertSame('Empty criteria was used, expected non-empty criteria', $exception->getMessage());
......
tests/Doctrine/Tests/DBAL/Exception/InvalidColumnIndexTest.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\Tests\DBAL\Exception;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Exception\InvalidColumnIndex;
use PHPUnit\Framework\TestCase;
class InvalidColumnIndexTest extends TestCase
{
public function testNew() : void
{
$exception = InvalidColumnIndex::new(5, 1);
self::assertInstanceOf(DBALException::class, $exception);
self::assertSame('Invalid column index 5. The statement result contains 1 column.', $exception->getMessage());
}
public function testNewPlural() : void
{
$exception = InvalidColumnIndex::new(5, 2);
self::assertInstanceOf(DBALException::class, $exception);
self::assertSame('Invalid column index 5. The statement result contains 2 columns.', $exception->getMessage());
}
}
tests/Doctrine/Tests/DBAL/Exception/InvalidPlatformTypeTest.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\Tests\DBAL\Exception;
use Doctrine\DBAL\Exception\InvalidPlatformType;
use PHPUnit\Framework\TestCase;
use stdClass;
class InvalidPlatformTypeTest extends TestCase
{
/**
* @group #2821
*/
public function testInvalidPlatformTypeObject() : void
{
$exception = InvalidPlatformType::new(new stdClass());
self::assertSame(
"Option 'platform' must be a subtype of 'Doctrine\DBAL\Platforms\AbstractPlatform', instance of 'stdClass' given",
$exception->getMessage()
);
}
/**
* @group #2821
*/
public function testInvalidPlatformTypeScalar() : void
{
$exception = InvalidPlatformType::new('some string');
self::assertSame(
"Option 'platform' must be an object and subtype of 'Doctrine\DBAL\Platforms\AbstractPlatform'. Got 'string'",
$exception->getMessage()
);
}
}
tests/Doctrine/Tests/DBAL/Types/ConversionExceptionTest.php
View file @ d95ce266
......@@ -5,6 +5,8 @@ declare(strict_types=1);
namespace Doctrine\Tests\DBAL\Types;
use Doctrine\DBAL\Types\ConversionException;
use Doctrine\DBAL\Types\Exception\InvalidFormat;
use Doctrine\DBAL\Types\Exception\InvalidType;
use Exception;
use PHPUnit\Framework\TestCase;
use stdClass;
......@@ -19,7 +21,7 @@ class ConversionExceptionTest extends TestCase
*/
public function testConversionFailedInvalidTypeWithScalar($scalarValue) : void
{
$exception = ConversionException::conversionFailedInvalidType($scalarValue, 'foo', ['bar', 'baz']);
$exception = InvalidType::new($scalarValue, 'foo', ['bar', 'baz']);
self::assertInstanceOf(ConversionException::class, $exception);
self::assertRegExp(
......@@ -36,7 +38,7 @@ class ConversionExceptionTest extends TestCase
*/
public function testConversionFailedInvalidTypeWithNonScalar($nonScalar) : void
{
$exception = ConversionException::conversionFailedInvalidType($nonScalar, 'foo', ['bar', 'baz']);
$exception = InvalidType::new($nonScalar, 'foo', ['bar', 'baz']);
self::assertInstanceOf(ConversionException::class, $exception);
self::assertRegExp(
......@@ -50,7 +52,7 @@ class ConversionExceptionTest extends TestCase
{
$previous = new Exception();
$exception = ConversionException::conversionFailedFormat('foo', 'bar', 'baz', $previous);
$exception = InvalidFormat::new('foo', 'bar', 'baz', $previous);
self::assertInstanceOf(ConversionException::class, $exception);
self::assertSame($previous, $exception->getPrevious());
......
tests/Doctrine/Tests/DBAL/Types/Exception/TypeAlreadyRegisteredTest.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\Tests\DBAL\Types\Exception;
use Doctrine\DBAL\Types\Exception\TypeAlreadyRegistered;
use Doctrine\DBAL\Types\Exception\TypesException;
use Doctrine\DBAL\Types\Type;
use PHPUnit\Framework\TestCase;
use function preg_match;
class TypeAlreadyRegisteredTest extends TestCase
{
public function testNew() : void
{
$exception = TypeAlreadyRegistered::new(Type::getType('string'));
self::assertInstanceOf(TypesException::class, $exception);
self::assertTrue(preg_match('/Type of the class Doctrine\\\DBAL\\\Types\\\StringType@([0-9a-zA-Z]+) is already registered./', $exception->getMessage()) === 1);
}
}
tests/Doctrine/Tests/DBAL/Types/Exception/TypeNotRegisteredTest.php 0 → 100644
View file @ d95ce266
<?php
declare(strict_types=1);
namespace Doctrine\Tests\DBAL\Types\Exception;
use Doctrine\DBAL\Types\Exception\TypeNotRegistered;
use Doctrine\DBAL\Types\Exception\TypesException;
use Doctrine\DBAL\Types\Type;
use PHPUnit\Framework\TestCase;
use function preg_match;
class TypeNotRegisteredTest extends TestCase
{
public function testNew() : void
{
$exception = TypeNotRegistered::new(Type::getType('string'));
self::assertInstanceOf(TypesException::class, $exception);
self::assertTrue(preg_match('/Type of the class Doctrine\\\DBAL\\\Types\\\StringType@([0-9a-zA-Z]+) is not registered./', $exception->getMessage()) === 1);
}
}
tests/Doctrine/Tests/DBAL/Types/ObjectTest.php
View file @ d95ce266
......@@ -41,6 +41,7 @@ class ObjectTest extends DbalTestCase
{
$this->expectException(ConversionException::class);
$this->expectExceptionMessage("Could not convert database value to 'object' as an error was triggered by the unserialization: 'unserialize(): Error at offset 0 of 7 bytes'");
$this->type->convertToPHPValue('abcdefg', $this->platform);
}
......
tests/Doctrine/Tests/DBAL/Types/TypeRegistryTest.php
View file @ d95ce266
......@@ -7,6 +7,7 @@ namespace Doctrine\Tests\DBAL\Types;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Types\BinaryType;
use Doctrine\DBAL\Types\BlobType;
use Doctrine\DBAL\Types\Exception\TypeNotRegistered;
use Doctrine\DBAL\Types\StringType;
use Doctrine\DBAL\Types\TextType;
use Doctrine\DBAL\Types\TypeRegistry;
......@@ -64,7 +65,7 @@ class TypeRegistryTest extends TestCase
$this->registry->lookupName($this->otherTestType)
);
$this->expectException(DBALException::class);
$this->expectException(TypeNotRegistered::class);
$this->registry->lookupName(new TextType());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment