Move exceptions in an Exception sub-namespace

datasage · Apr 12, 2018 · 28e7e53 · 28e7e53
1 parent 46d342d
commit 28e7e53
Show file tree

Hide file tree

Showing 65 changed files with 128 additions and 111 deletions.
diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php
@@ -8,7 +8,7 @@
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
 use Doctrine\DBAL\Driver\Statement;
-use Doctrine\ORM\Cache\InvalidResultCacheDriver;
+use Doctrine\ORM\Cache\Exception\InvalidResultCacheDriver;
 use Doctrine\ORM\Cache\Logging\CacheLogger;
 use Doctrine\ORM\Cache\QueryCacheKey;
 use Doctrine\ORM\Cache\TimestampCacheKey;

diff --git a/lib/Doctrine/ORM/Cache/DefaultQueryCache.php b/lib/Doctrine/ORM/Cache/DefaultQueryCache.php
@@ -5,9 +5,9 @@
 namespace Doctrine\ORM\Cache;
 
 use Doctrine\ORM\Cache;
-use Doctrine\ORM\Cache\FeatureNotImplemented;
+use Doctrine\ORM\Cache\Exception\FeatureNotImplemented;
 use Doctrine\ORM\Cache\Logging\CacheLogger;
-use Doctrine\ORM\Cache\NonCacheableEntity;
+use Doctrine\ORM\Cache\Exception\NonCacheableEntity;
 use Doctrine\ORM\Cache\Persister\CachedPersister;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\AssociationMetadata;

diff --git a/lib/Doctrine/ORM/Cache/CacheException.php → ...ne/ORM/Cache/Exception/CacheException.php b/lib/Doctrine/ORM/Cache/CacheException.php → ...ne/ORM/Cache/Exception/CacheException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Cache;
+namespace Doctrine\ORM\Cache\Exception;
 
 use Doctrine\ORM\ORMException;
 use function sprintf;

diff --git a/.../Cache/CannotUpdateReadOnlyCollection.php → ...eption/CannotUpdateReadOnlyCollection.php b/.../Cache/CannotUpdateReadOnlyCollection.php → ...eption/CannotUpdateReadOnlyCollection.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Cache;
+namespace Doctrine\ORM\Cache\Exception;
 
 class CannotUpdateReadOnlyCollection extends \Exception implements CacheException
 {

diff --git a/.../ORM/Cache/CannotUpdateReadOnlyEntity.php → .../Exception/CannotUpdateReadOnlyEntity.php b/.../ORM/Cache/CannotUpdateReadOnlyEntity.php → .../Exception/CannotUpdateReadOnlyEntity.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Cache;
+namespace Doctrine\ORM\Cache\Exception;
 
 class CannotUpdateReadOnlyEntity extends \Exception implements CacheException
 {

diff --git a/...trine/ORM/Cache/FeatureNotImplemented.php → ...Cache/Exception/FeatureNotImplemented.php b/...trine/ORM/Cache/FeatureNotImplemented.php → ...Cache/Exception/FeatureNotImplemented.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Cache;
+namespace Doctrine\ORM\Cache\Exception;
 
 class FeatureNotImplemented extends \Exception implements CacheException
 {

diff --git a/...ne/ORM/Cache/InvalidResultCacheDriver.php → ...he/Exception/InvalidResultCacheDriver.php b/...ne/ORM/Cache/InvalidResultCacheDriver.php → ...he/Exception/InvalidResultCacheDriver.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Cache;
+namespace Doctrine\ORM\Cache\Exception;
 
 final class InvalidResultCacheDriver extends \Exception implements CacheException
 {

diff --git a/.../ORM/Cache/MetadataCacheNotConfigured.php → .../Exception/MetadataCacheNotConfigured.php b/.../ORM/Cache/MetadataCacheNotConfigured.php → .../Exception/MetadataCacheNotConfigured.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Cache;
+namespace Doctrine\ORM\Cache\Exception;
 
 final class MetadataCacheNotConfigured extends \Exception implements CacheException
 {

diff --git a/...e/MetadataCacheUsesNonPersistentCache.php → ...n/MetadataCacheUsesNonPersistentCache.php b/...e/MetadataCacheUsesNonPersistentCache.php → ...n/MetadataCacheUsesNonPersistentCache.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Cache;
+namespace Doctrine\ORM\Cache\Exception;
 
 use Doctrine\Common\Cache\Cache;
 

diff --git a/...Doctrine/ORM/Cache/NonCacheableEntity.php → ...RM/Cache/Exception/NonCacheableEntity.php b/...Doctrine/ORM/Cache/NonCacheableEntity.php → ...RM/Cache/Exception/NonCacheableEntity.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Cache;
+namespace Doctrine\ORM\Cache\Exception;
 
 class NonCacheableEntity extends \Exception implements CacheException
 {

diff --git a/...M/Cache/NonCacheableEntityAssociation.php → ...ception/NonCacheableEntityAssociation.php b/...M/Cache/NonCacheableEntityAssociation.php → ...ception/NonCacheableEntityAssociation.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Cache;
+namespace Doctrine\ORM\Cache\Exception;
 
 class NonCacheableEntityAssociation extends \Exception implements CacheException
 {

diff --git a/...ine/ORM/Cache/QueryCacheNotConfigured.php → ...che/Exception/QueryCacheNotConfigured.php b/...ine/ORM/Cache/QueryCacheNotConfigured.php → ...che/Exception/QueryCacheNotConfigured.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Cache;
+namespace Doctrine\ORM\Cache\Exception;
 
 final class QueryCacheNotConfigured extends \Exception implements CacheException
 {

diff --git a/...ache/QueryCacheUsesNonPersistentCache.php → ...tion/QueryCacheUsesNonPersistentCache.php b/...ache/QueryCacheUsesNonPersistentCache.php → ...tion/QueryCacheUsesNonPersistentCache.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Cache;
+namespace Doctrine\ORM\Cache\Exception;
 
 use Doctrine\Common\Cache\Cache;
 

diff --git a/lib/Doctrine/ORM/Cache/LockException.php b/lib/Doctrine/ORM/Cache/LockException.php
@@ -4,9 +4,11 @@
 
 namespace Doctrine\ORM\Cache;
 
+use Doctrine\ORM\Cache\Exception\CacheException;
+
 /**
  * Lock exception for cache.
  */
-class LockException implements CacheException
+class LockException extends \RuntimeException implements CacheException
 {
 }
diff --git a/lib/Doctrine/ORM/Cache/Persister/Collection/ReadOnlyCachedCollectionPersister.php b/lib/Doctrine/ORM/Cache/Persister/Collection/ReadOnlyCachedCollectionPersister.php
@@ -4,7 +4,7 @@
 
 namespace Doctrine\ORM\Cache\Persister\Collection;
 
-use Doctrine\ORM\Cache\CannotUpdateReadOnlyCollection;
+use Doctrine\ORM\Cache\Exception\CannotUpdateReadOnlyCollection;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Utility\StaticClassNameConverter;
 

diff --git a/lib/Doctrine/ORM/Cache/Persister/Entity/ReadOnlyCachedEntityPersister.php b/lib/Doctrine/ORM/Cache/Persister/Entity/ReadOnlyCachedEntityPersister.php
@@ -4,7 +4,7 @@
 
 namespace Doctrine\ORM\Cache\Persister\Entity;
 
-use Doctrine\ORM\Cache\CannotUpdateReadOnlyEntity;
+use Doctrine\ORM\Cache\Exception\CannotUpdateReadOnlyEntity;
 use Doctrine\ORM\Utility\StaticClassNameConverter;
 
 /**

diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
@@ -12,12 +12,12 @@
 use Doctrine\Common\Persistence\ObjectRepository;
 use Doctrine\DBAL\Configuration as DBALConfiguration;
 use Doctrine\ORM\Cache\CacheConfiguration;
-use Doctrine\ORM\Cache\MetadataCacheNotConfigured;
-use Doctrine\ORM\Cache\MetadataCacheUsesNonPersistentCache;
-use Doctrine\ORM\Cache\QueryCacheNotConfigured;
-use Doctrine\ORM\Cache\QueryCacheUsesNonPersistentCache;
-use Doctrine\ORM\Configuration\InvalidEntityRepository;
-use Doctrine\ORM\Configuration\ProxyClassesAlwaysRegenerating;
+use Doctrine\ORM\Cache\Exception\MetadataCacheNotConfigured;
+use Doctrine\ORM\Cache\Exception\MetadataCacheUsesNonPersistentCache;
+use Doctrine\ORM\Cache\Exception\QueryCacheNotConfigured;
+use Doctrine\ORM\Cache\Exception\QueryCacheUsesNonPersistentCache;
+use Doctrine\ORM\Exception\InvalidEntityRepository;
+use Doctrine\ORM\Exception\ProxyClassesAlwaysRegenerating;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
 use Doctrine\ORM\Mapping\DefaultEntityListenerResolver;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;

diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php
@@ -10,12 +10,12 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\LockMode;
-use Doctrine\ORM\EntityManager\EntityManagerClosed;
-use Doctrine\ORM\EntityManager\InvalidHydrationMode;
-use Doctrine\ORM\EntityManager\MismatchedEventManager;
-use Doctrine\ORM\EntityManager\MissingIdentifierField;
-use Doctrine\ORM\EntityManager\MissingMappingDriverImplementation;
-use Doctrine\ORM\EntityManager\UnrecognizedIdentifierFields;
+use Doctrine\ORM\Exception\EntityManagerClosed;
+use Doctrine\ORM\Exception\InvalidHydrationMode;
+use Doctrine\ORM\Exception\MismatchedEventManager;
+use Doctrine\ORM\Exception\MissingIdentifierField;
+use Doctrine\ORM\Exception\MissingMappingDriverImplementation;
+use Doctrine\ORM\Exception\UnrecognizedIdentifierFields;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
 use Doctrine\ORM\Proxy\Factory\ProxyFactory;
 use Doctrine\ORM\Proxy\Factory\StaticProxyFactory;

diff --git a/lib/Doctrine/ORM/EntityRepository.php b/lib/Doctrine/ORM/EntityRepository.php
@@ -11,7 +11,7 @@
 use Doctrine\Common\Util\Inflector;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
-use Doctrine\ORM\Repository\InvalidMagicMethodCall;
+use Doctrine\ORM\Repository\Exception\InvalidMagicMethodCall;
 use function array_slice;
 use function lcfirst;
 use function sprintf;

diff --git a/lib/Doctrine/ORM/ConfigurationException.php → .../ORM/Exception/ConfigurationException.php b/lib/Doctrine/ORM/ConfigurationException.php → .../ORM/Exception/ConfigurationException.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM;
+namespace Doctrine\ORM\Exception;
+
+use Doctrine\ORM\ORMException;
 
 interface ConfigurationException extends ORMException
 {

diff --git a/...ORM/EntityManager/EntityManagerClosed.php → ...ine/ORM/Exception/EntityManagerClosed.php b/...ORM/EntityManager/EntityManagerClosed.php → ...ine/ORM/Exception/EntityManagerClosed.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\EntityManager;
+namespace Doctrine\ORM\Exception;
 
-use Doctrine\ORM\ManagerException;
+use Doctrine\ORM\Exception\ManagerException;
 
 final class EntityManagerClosed extends \Exception implements ManagerException
 {

diff --git a/...Configuration/InvalidEntityRepository.php → ...ORM/Exception/InvalidEntityRepository.php b/...Configuration/InvalidEntityRepository.php → ...ORM/Exception/InvalidEntityRepository.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Configuration;
+namespace Doctrine\ORM\Exception;
 
 use Doctrine\Common\Persistence\ObjectRepository;
-use Doctrine\ORM\ConfigurationException;
+use Doctrine\ORM\Exception\ConfigurationException;
 
 final class InvalidEntityRepository extends \Exception implements ConfigurationException
 {

diff --git a/...RM/EntityManager/InvalidHydrationMode.php → ...ne/ORM/Exception/InvalidHydrationMode.php b/...RM/EntityManager/InvalidHydrationMode.php → ...ne/ORM/Exception/InvalidHydrationMode.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\EntityManager;
+namespace Doctrine\ORM\Exception;
 
-use Doctrine\ORM\ManagerException;
+use Doctrine\ORM\Exception\ManagerException;
 
 final class InvalidHydrationMode extends \Exception implements ManagerException
 {

diff --git a/lib/Doctrine/ORM/ManagerException.php → ...ctrine/ORM/Exception/ManagerException.php b/lib/Doctrine/ORM/ManagerException.php → ...ctrine/ORM/Exception/ManagerException.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM;
+namespace Doctrine\ORM\Exception;
+
+use Doctrine\ORM\ORMException;
 
 interface ManagerException extends ORMException
 {

diff --git a/.../EntityManager/MismatchedEventManager.php → .../ORM/Exception/MismatchedEventManager.php b/.../EntityManager/MismatchedEventManager.php → .../ORM/Exception/MismatchedEventManager.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\EntityManager;
+namespace Doctrine\ORM\Exception;
 
-use Doctrine\ORM\ManagerException;
+use Doctrine\ORM\Exception\ManagerException;
 
 final class MismatchedEventManager extends \Exception implements ManagerException
 {

diff --git a/.../EntityManager/MissingIdentifierField.php → .../ORM/Exception/MissingIdentifierField.php b/.../EntityManager/MissingIdentifierField.php → .../ORM/Exception/MissingIdentifierField.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\EntityManager;
+namespace Doctrine\ORM\Exception;
 
-use Doctrine\ORM\ManagerException;
+use Doctrine\ORM\Exception\ManagerException;
 
 final class MissingIdentifierField extends \Exception implements ManagerException
 {

diff --git a/...er/MissingMappingDriverImplementation.php → ...on/MissingMappingDriverImplementation.php b/...er/MissingMappingDriverImplementation.php → ...on/MissingMappingDriverImplementation.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\EntityManager;
+namespace Doctrine\ORM\Exception;
 
-use Doctrine\ORM\ManagerException;
+use Doctrine\ORM\Exception\ManagerException;
 
 final class MissingMappingDriverImplementation extends \Exception implements ManagerException
 {

diff --git a/lib/Doctrine/ORM/NotSupported.php → lib/Doctrine/ORM/Exception/NotSupported.php b/lib/Doctrine/ORM/NotSupported.php → lib/Doctrine/ORM/Exception/NotSupported.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM;
+namespace Doctrine\ORM\Exception;
 
 final class NotSupported extends \Exception implements ORMException
 {

diff --git a/lib/Doctrine/ORM/PersisterException.php → ...rine/ORM/Exception/PersisterException.php b/lib/Doctrine/ORM/PersisterException.php → ...rine/ORM/Exception/PersisterException.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM;
+namespace Doctrine\ORM\Exception;
+
+use Doctrine\ORM\ORMException;
 
 interface PersisterException extends ORMException
 {

diff --git a/...ration/ProxyClassesAlwaysRegenerating.php → ...eption/ProxyClassesAlwaysRegenerating.php b/...ration/ProxyClassesAlwaysRegenerating.php → ...eption/ProxyClassesAlwaysRegenerating.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Configuration;
+namespace Doctrine\ORM\Exception;
 
-use Doctrine\ORM\ConfigurationException;
+use Doctrine\ORM\Exception\ConfigurationException;
 
 final class ProxyClassesAlwaysRegenerating extends \Exception implements ConfigurationException
 {

diff --git a/lib/Doctrine/ORM/RepositoryException.php → ...ine/ORM/Exception/RepositoryException.php b/lib/Doctrine/ORM/RepositoryException.php → ...ine/ORM/Exception/RepositoryException.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM;
+namespace Doctrine\ORM\Exception;
+
+use Doctrine\ORM\ORMException;
 
 /**
  * This interface should be implemented by all exceptions in the Repository

diff --git a/lib/Doctrine/ORM/SchemaToolException.php → ...ine/ORM/Exception/SchemaToolException.php b/lib/Doctrine/ORM/SchemaToolException.php → ...ine/ORM/Exception/SchemaToolException.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM;
+namespace Doctrine\ORM\Exception;
+
+use Doctrine\ORM\ORMException;
 
 interface SchemaToolException extends ORMException
 {

diff --git a/...ctrine/ORM/UnexpectedAssociationValue.php → .../Exception/UnexpectedAssociationValue.php b/...ctrine/ORM/UnexpectedAssociationValue.php → .../Exception/UnexpectedAssociationValue.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM;
+namespace Doctrine\ORM\Exception;
 
-use Doctrine\ORM\Cache\CacheException;
+use Doctrine\ORM\Cache\Exception\CacheException;
 
 final class UnexpectedAssociationValue extends \Exception implements CacheException
 {

diff --git a/.../Configuration/UnknownEntityNamespace.php → .../ORM/Exception/UnknownEntityNamespace.php b/.../Configuration/UnknownEntityNamespace.php → .../ORM/Exception/UnknownEntityNamespace.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\Configuration;
+namespace Doctrine\ORM\Exception;
 
-use Doctrine\ORM\ConfigurationException;
+use Doctrine\ORM\Exception\ConfigurationException;
 
 final class UnknownEntityNamespace extends \Exception implements ConfigurationException
 {

diff --git a/...yManager/UnrecognizedIdentifierFields.php → ...xception/UnrecognizedIdentifierFields.php b/...yManager/UnrecognizedIdentifierFields.php → ...xception/UnrecognizedIdentifierFields.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\ORM\EntityManager;
+namespace Doctrine\ORM\Exception;
 
-use Doctrine\ORM\ManagerException;
+use Doctrine\ORM\Exception\ManagerException;
 
 final class UnrecognizedIdentifierFields extends \Exception implements ManagerException
 {

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -4,8 +4,8 @@
 
 namespace Doctrine\ORM\Mapping;
 
-use Doctrine\ORM\Cache\CacheException;
-use Doctrine\ORM\Cache\NonCacheableEntityAssociation;
+use Doctrine\ORM\Cache\Exception\CacheException;
+use Doctrine\ORM\Cache\Exception\NonCacheableEntityAssociation;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\Factory\NamingStrategy;
 use Doctrine\ORM\Reflection\ReflectionService;