Classify persisters into more granular namespaces.

doctrine · Jan 15, 2015 · 49e8b3b · 49e8b3b
1 parent 0b2fb7f
commit 49e8b3b
Show file tree

Hide file tree

Showing 42 changed files with 183 additions and 178 deletions.
diff --git a/lib/Doctrine/ORM/Cache/CacheFactory.php b/lib/Doctrine/ORM/Cache/CacheFactory.php
@@ -22,9 +22,8 @@
 
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\EntityManagerInterface;
-
-use Doctrine\ORM\Persisters\CollectionPersister;
-use Doctrine\ORM\Persisters\EntityPersister;
+use Doctrine\ORM\Persisters\Collection\CollectionPersister;
+use Doctrine\ORM\Persisters\Entity\EntityPersister;
 
 /**
  * Contract for building second level cache regions components.
@@ -37,22 +36,22 @@ interface CacheFactory
     /**
      * Build an entity persister for the given entity metadata.
      *
-     * @param \Doctrine\ORM\EntityManagerInterface     $em        The entity manager.
-     * @param \Doctrine\ORM\Persisters\EntityPersister $persister The entity persister that will be cached.
-     * @param \Doctrine\ORM\Mapping\ClassMetadata      $metadata  The entity metadata.
+     * @param \Doctrine\ORM\EntityManagerInterface            $em        The entity manager.
+     * @param \Doctrine\ORM\Persisters\Entity\EntityPersister $persister The entity persister that will be cached.
+     * @param \Doctrine\ORM\Mapping\ClassMetadata             $metadata  The entity metadata.
      *
-     * @return \Doctrine\ORM\Cache\Persister\CachedEntityPersister
+     * @return \Doctrine\ORM\Cache\Persister\Entity\CachedEntityPersister
      */
     public function buildCachedEntityPersister(EntityManagerInterface $em, EntityPersister $persister, ClassMetadata $metadata);
 
     /**
      * Build a collection persister for the given relation mapping.
      *
-     * @param \Doctrine\ORM\EntityManagerInterface         $em        The entity manager.
-     * @param \Doctrine\ORM\Persisters\CollectionPersister $persister The collection persister that will be cached.
-     * @param array                                        $mapping   The association mapping.
+     * @param \Doctrine\ORM\EntityManagerInterface                    $em        The entity manager.
+     * @param \Doctrine\ORM\Persisters\Collection\CollectionPersister $persister The collection persister that will be cached.
+     * @param array                                                   $mapping   The association mapping.
      *
-     * @return \Doctrine\ORM\Cache\Persister\CachedCollectionPersister
+     * @return \Doctrine\ORM\Cache\Persister\Collection\CachedCollectionPersister
      */
     public function buildCachedCollectionPersister(EntityManagerInterface $em, CollectionPersister $persister, array $mapping);
 

diff --git a/lib/Doctrine/ORM/Cache/DefaultCacheFactory.php b/lib/Doctrine/ORM/Cache/DefaultCacheFactory.php
@@ -29,14 +29,14 @@
 use Doctrine\ORM\Cache\Region\DefaultRegion;
 use Doctrine\ORM\Cache\Region\FileLockRegion;
 use Doctrine\ORM\Cache\Region\UpdateTimestampCache;
-use Doctrine\ORM\Persisters\EntityPersister;
-use Doctrine\ORM\Persisters\CollectionPersister;
-use Doctrine\ORM\Cache\Persister\ReadOnlyCachedEntityPersister;
-use Doctrine\ORM\Cache\Persister\ReadWriteCachedEntityPersister;
-use Doctrine\ORM\Cache\Persister\ReadOnlyCachedCollectionPersister;
-use Doctrine\ORM\Cache\Persister\ReadWriteCachedCollectionPersister;
-use Doctrine\ORM\Cache\Persister\NonStrictReadWriteCachedEntityPersister;
-use Doctrine\ORM\Cache\Persister\NonStrictReadWriteCachedCollectionPersister;
+use Doctrine\ORM\Persisters\Entity\EntityPersister;
+use Doctrine\ORM\Persisters\Collection\CollectionPersister;
+use Doctrine\ORM\Cache\Persister\Entity\ReadOnlyCachedEntityPersister;
+use Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister;
+use Doctrine\ORM\Cache\Persister\Collection\ReadOnlyCachedCollectionPersister;
+use Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister;
+use Doctrine\ORM\Cache\Persister\Entity\NonStrictReadWriteCachedEntityPersister;
+use Doctrine\ORM\Cache\Persister\Collection\NonStrictReadWriteCachedCollectionPersister;
 
 /**
  * @since   2.5

diff --git a/...Persister/AbstractCollectionPersister.php → ...ollection/AbstractCollectionPersister.php b/...Persister/AbstractCollectionPersister.php → ...ollection/AbstractCollectionPersister.php
@@ -18,12 +18,12 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Cache\Persister;
+namespace Doctrine\ORM\Cache\Persister\Collection;
 
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Cache\EntityCacheKey;
 use Doctrine\ORM\Cache\CollectionCacheKey;
-use Doctrine\ORM\Persisters\CollectionPersister;
+use Doctrine\ORM\Persisters\Collection\CollectionPersister;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Cache\Region;
@@ -46,7 +46,7 @@ abstract class AbstractCollectionPersister implements CachedCollectionPersister
     protected $metadataFactory;
 
     /**
-     * @var \Doctrine\ORM\Persisters\CollectionPersister
+     * @var \Doctrine\ORM\Persisters\Collection\CollectionPersister
      */
     protected $persister;
 
@@ -91,10 +91,10 @@ abstract class AbstractCollectionPersister implements CachedCollectionPersister
     protected $cacheLogger;
 
     /**
-     * @param \Doctrine\ORM\Persisters\CollectionPersister $persister   The collection persister that will be cached.
-     * @param \Doctrine\ORM\Cache\Region                   $region      The collection region.
-     * @param \Doctrine\ORM\EntityManagerInterface         $em          The entity manager.
-     * @param array                                        $association The association mapping.
+     * @param \Doctrine\ORM\Persisters\Collection\CollectionPersister $persister   The collection persister that will be cached.
+     * @param \Doctrine\ORM\Cache\Region                              $region      The collection region.
+     * @param \Doctrine\ORM\EntityManagerInterface                    $em          The entity manager.
+     * @param array                                                   $association The association mapping.
      */
     public function __construct(CollectionPersister $persister, Region $region, EntityManagerInterface $em, array $association)
     {

diff --git a/...e/Persister/CachedCollectionPersister.php → .../Collection/CachedCollectionPersister.php b/...e/Persister/CachedCollectionPersister.php → .../Collection/CachedCollectionPersister.php
@@ -18,10 +18,11 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Cache\Persister;
+namespace Doctrine\ORM\Cache\Persister\Collection;
 
 use Doctrine\ORM\Cache\CollectionCacheKey;
-use Doctrine\ORM\Persisters\CollectionPersister;
+use Doctrine\ORM\Cache\Persister\CachedPersister;
+use Doctrine\ORM\Persisters\Collection\CollectionPersister;
 use Doctrine\ORM\PersistentCollection;
 
 /**

diff --git a/...ictReadWriteCachedCollectionPersister.php → ...ictReadWriteCachedCollectionPersister.php b/...ictReadWriteCachedCollectionPersister.php → ...ictReadWriteCachedCollectionPersister.php
@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Cache\Persister;
+namespace Doctrine\ORM\Cache\Persister\Collection;
 
 use Doctrine\ORM\Cache\CollectionCacheKey;
 use Doctrine\ORM\PersistentCollection;

diff --git a/...ter/ReadOnlyCachedCollectionPersister.php → ...ion/ReadOnlyCachedCollectionPersister.php b/...ter/ReadOnlyCachedCollectionPersister.php → ...ion/ReadOnlyCachedCollectionPersister.php
@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Cache\Persister;
+namespace Doctrine\ORM\Cache\Persister\Collection;
 
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Cache\CacheException;

diff --git a/...er/ReadWriteCachedCollectionPersister.php → ...on/ReadWriteCachedCollectionPersister.php b/...er/ReadWriteCachedCollectionPersister.php → ...on/ReadWriteCachedCollectionPersister.php
@@ -18,11 +18,10 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Cache\Persister;
+namespace Doctrine\ORM\Cache\Persister\Collection;
 
-use Doctrine\ORM\Persisters\CollectionPersister;
+use Doctrine\ORM\Persisters\Collection\CollectionPersister;
 use Doctrine\ORM\EntityManagerInterface;
-
 use Doctrine\ORM\Cache\CollectionCacheKey;
 use Doctrine\ORM\Cache\ConcurrentRegion;
 use Doctrine\ORM\PersistentCollection;
@@ -34,10 +33,10 @@
 class ReadWriteCachedCollectionPersister extends AbstractCollectionPersister
 {
     /**
-     * @param \Doctrine\ORM\Persisters\CollectionPersister $persister   The collection persister that will be cached.
-     * @param \Doctrine\ORM\Cache\ConcurrentRegion         $region      The collection region.
-     * @param \Doctrine\ORM\EntityManagerInterface         $em          The entity manager.
-     * @param array                                        $association The association mapping.
+     * @param \Doctrine\ORM\Persisters\Collection\CollectionPersister $persister   The collection persister that will be cached.
+     * @param \Doctrine\ORM\Cache\ConcurrentRegion                    $region      The collection region.
+     * @param \Doctrine\ORM\EntityManagerInterface                    $em          The entity manager.
+     * @param array                                                   $association The association mapping.
      */
     public function __construct(CollectionPersister $persister, ConcurrentRegion $region, EntityManagerInterface $em, array $association)
     {

diff --git a/...che/Persister/AbstractEntityPersister.php → ...sister/Entity/AbstractEntityPersister.php b/...che/Persister/AbstractEntityPersister.php → ...sister/Entity/AbstractEntityPersister.php
@@ -18,18 +18,19 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Cache\Persister;
+namespace Doctrine\ORM\Cache\Persister\Entity;
 
 use Doctrine\ORM\Cache;
 use Doctrine\ORM\Cache\Region;
 use Doctrine\ORM\Cache\EntityCacheKey;
 use Doctrine\ORM\Cache\CollectionCacheKey;
 use Doctrine\ORM\Cache\TimestampCacheKey;
 use Doctrine\ORM\Cache\QueryCacheKey;
+use Doctrine\ORM\Cache\Persister\CachedPersister;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Persisters\EntityPersister;
+use Doctrine\ORM\Persisters\Entity\EntityPersister;
 
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\Common\Collections\Criteria;
@@ -51,7 +52,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister
     protected $metadataFactory;
 
     /**
-     * @var \Doctrine\ORM\Persisters\EntityPersister
+     * @var \Doctrine\ORM\Persisters\Entity\EntityPersister
      */
     protected $persister;
 
@@ -108,10 +109,10 @@ abstract class AbstractEntityPersister implements CachedEntityPersister
     protected $joinedAssociations;
 
     /**
-     * @param \Doctrine\ORM\Persisters\EntityPersister $persister The entity persister to cache.
-     * @param \Doctrine\ORM\Cache\Region               $region    The entity cache region.
-     * @param \Doctrine\ORM\EntityManagerInterface     $em        The entity manager.
-     * @param \Doctrine\ORM\Mapping\ClassMetadata      $class     The entity metadata.
+     * @param \Doctrine\ORM\Persisters\Entity\EntityPersister $persister The entity persister to cache.
+     * @param \Doctrine\ORM\Cache\Region                      $region    The entity cache region.
+     * @param \Doctrine\ORM\EntityManagerInterface            $em        The entity manager.
+     * @param \Doctrine\ORM\Mapping\ClassMetadata             $class     The entity metadata.
      */
     public function __construct(EntityPersister $persister, Region $region, EntityManagerInterface $em, ClassMetadata $class)
     {

diff --git a/...Cache/Persister/CachedEntityPersister.php → ...ersister/Entity/CachedEntityPersister.php b/...Cache/Persister/CachedEntityPersister.php → ...ersister/Entity/CachedEntityPersister.php
@@ -18,10 +18,11 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Cache\Persister;
+namespace Doctrine\ORM\Cache\Persister\Entity;
 
 use Doctrine\ORM\Cache\EntityCacheKey;
-use Doctrine\ORM\Persisters\EntityPersister;
+use Doctrine\ORM\Cache\Persister\CachedPersister;
+use Doctrine\ORM\Persisters\Entity\EntityPersister;
 
 /**
  * Interface for second level cache entity persisters.

diff --git a/...nStrictReadWriteCachedEntityPersister.php → ...nStrictReadWriteCachedEntityPersister.php b/...nStrictReadWriteCachedEntityPersister.php → ...nStrictReadWriteCachedEntityPersister.php
@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Cache\Persister;
+namespace Doctrine\ORM\Cache\Persister\Entity;
 
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\ORM\Cache\EntityCacheKey;

diff --git a/...rsister/ReadOnlyCachedEntityPersister.php → .../Entity/ReadOnlyCachedEntityPersister.php b/...rsister/ReadOnlyCachedEntityPersister.php → .../Entity/ReadOnlyCachedEntityPersister.php
@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Cache\Persister;
+namespace Doctrine\ORM\Cache\Persister\Entity;
 
 use Doctrine\ORM\Cache\CacheException;
 use Doctrine\Common\Util\ClassUtils;

diff --git a/...sister/ReadWriteCachedEntityPersister.php → ...Entity/ReadWriteCachedEntityPersister.php b/...sister/ReadWriteCachedEntityPersister.php → ...Entity/ReadWriteCachedEntityPersister.php
@@ -18,12 +18,11 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Cache\Persister;
+namespace Doctrine\ORM\Cache\Persister\Entity;
 
-use Doctrine\ORM\Persisters\EntityPersister;
+use Doctrine\ORM\Persisters\Entity\EntityPersister;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\EntityManagerInterface;
-
 use Doctrine\ORM\Cache\ConcurrentRegion;
 use Doctrine\ORM\Cache\EntityCacheKey;
 
@@ -36,10 +35,10 @@
 class ReadWriteCachedEntityPersister extends AbstractEntityPersister
 {
     /**
-     * @param \Doctrine\ORM\Persister\EntityPersister $persister The entity persister to cache.
-     * @param \Doctrine\ORM\Cache\ConcurrentRegion    $region    The entity cache region.
-     * @param \Doctrine\ORM\EntityManagerInterface    $em        The entity manager.
-     * @param \Doctrine\ORM\Mapping\ClassMetadata     $class     The entity metadata.
+     * @param \Doctrine\ORM\Persister\Entity\EntityPersister $persister The entity persister to cache.
+     * @param \Doctrine\ORM\Cache\ConcurrentRegion           $region    The entity cache region.
+     * @param \Doctrine\ORM\EntityManagerInterface           $em        The entity manager.
+     * @param \Doctrine\ORM\Mapping\ClassMetadata            $class     The entity metadata.
      */
     public function __construct(EntityPersister $persister, ConcurrentRegion $region, EntityManagerInterface $em, ClassMetadata $class)
     {

diff --git a/lib/Doctrine/ORM/LazyCriteriaCollection.php b/lib/Doctrine/ORM/LazyCriteriaCollection.php
@@ -23,8 +23,8 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\Selectable;
-use Doctrine\ORM\Persisters\BasicEntityPersister;
-use Doctrine\ORM\Persisters\EntityPersister;
+use Doctrine\ORM\Persisters\Entity\BasicEntityPersister;
+use Doctrine\ORM\Persisters\Entity\EntityPersister;
 
 /**
  * A lazy collection that allow a fast count when using criteria object

diff --git a/...ersisters/AbstractCollectionPersister.php → ...ollection/AbstractCollectionPersister.php b/...ersisters/AbstractCollectionPersister.php → ...ollection/AbstractCollectionPersister.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Persisters;
+namespace Doctrine\ORM\Persisters\Collection;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\UnitOfWork;

diff --git a/...ne/ORM/Persisters/CollectionPersister.php → ...isters/Collection/CollectionPersister.php b/...ne/ORM/Persisters/CollectionPersister.php → ...isters/Collection/CollectionPersister.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Persisters;
+namespace Doctrine\ORM\Persisters\Collection;
 
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\PersistentCollection;

diff --git a/...ne/ORM/Persisters/ManyToManyPersister.php → ...isters/Collection/ManyToManyPersister.php b/...ne/ORM/Persisters/ManyToManyPersister.php → ...isters/Collection/ManyToManyPersister.php
@@ -17,10 +17,12 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Persisters;
+namespace Doctrine\ORM\Persisters\Collection;
 
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\Persisters\SqlExpressionVisitor;
+use Doctrine\ORM\Persisters\SqlValueVisitor;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Query;
 

diff --git a/...ine/ORM/Persisters/OneToManyPersister.php → ...sisters/Collection/OneToManyPersister.php b/...ine/ORM/Persisters/OneToManyPersister.php → ...sisters/Collection/OneToManyPersister.php
@@ -17,11 +17,10 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Persisters;
+namespace Doctrine\ORM\Persisters\Collection;
 
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\PersistentCollection;
-use Doctrine\ORM\UnitOfWork;
 
 /**
  * Persister for one-to-many collections.

diff --git a/...rs/AbstractEntityInheritancePersister.php → ...ty/AbstractEntityInheritancePersister.php b/...rs/AbstractEntityInheritancePersister.php → ...ty/AbstractEntityInheritancePersister.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Persisters;
+namespace Doctrine\ORM\Persisters\Entity;
 
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\DBAL\Types\Type;

diff --git a/...e/ORM/Persisters/BasicEntityPersister.php → ...ersisters/Entity/BasicEntityPersister.php b/...e/ORM/Persisters/BasicEntityPersister.php → ...ersisters/Entity/BasicEntityPersister.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Persisters;
+namespace Doctrine\ORM\Persisters\Entity;
 
 use Doctrine\DBAL\LockMode;
 use Doctrine\DBAL\Types\Type;
@@ -31,6 +31,8 @@
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\Persisters\SqlExpressionVisitor;
+use Doctrine\ORM\Persisters\SqlValueVisitor;
 use Doctrine\ORM\Utility\IdentifierFlattener;
 
 use Doctrine\Common\Util\ClassUtils;

diff --git a/...ctrine/ORM/Persisters/EntityPersister.php → ...ORM/Persisters/Entity/EntityPersister.php b/...ctrine/ORM/Persisters/EntityPersister.php → ...ORM/Persisters/Entity/EntityPersister.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Persisters;
+namespace Doctrine\ORM\Persisters\Entity;
 
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\Common\Collections\Criteria;

diff --git a/...RM/Persisters/JoinedSubclassPersister.php → ...isters/Entity/JoinedSubclassPersister.php b/...RM/Persisters/JoinedSubclassPersister.php → ...isters/Entity/JoinedSubclassPersister.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Persisters;
+namespace Doctrine\ORM\Persisters\Entity;
 
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query\ResultSetMapping;

diff --git a/...e/ORM/Persisters/SingleTablePersister.php → ...ersisters/Entity/SingleTablePersister.php b/...e/ORM/Persisters/SingleTablePersister.php → ...ersisters/Entity/SingleTablePersister.php
@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Persisters;
+namespace Doctrine\ORM\Persisters\Entity;
 
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\Common\Collections\Criteria;