From b505a27370a531acf0ffdd4a428e994de8d5aa80 Mon Sep 17 00:00:00 2001
From: "Roman S. Borschel" <roman.borschel@googlemail.com>
Date: Mon, 26 Apr 2010 13:12:46 +0200
Subject: [PATCH] Renamed StandardEntityPersister to BasicEntityPersister

---
 .../ORM/Persisters/AbstractEntityInheritancePersister.php  | 2 +-
 ...tandardEntityPersister.php => BasicEntityPersister.php} | 7 +++----
 lib/Doctrine/ORM/Persisters/UnionSubclassPersister.php     | 2 +-
 lib/Doctrine/ORM/UnitOfWork.php                            | 2 +-
 tests/Doctrine/Tests/Mocks/EntityPersisterMock.php         | 2 +-
 tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)
 rename lib/Doctrine/ORM/Persisters/{StandardEntityPersister.php => BasicEntityPersister.php} (99%)

diff --git a/lib/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php b/lib/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php
index d75855c02..512f636e2 100644
--- a/lib/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php
+++ b/lib/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php
@@ -30,7 +30,7 @@ use Doctrine\ORM\Mapping\ClassMetadata,
  * @author Roman Borschel <roman@code-factory.org>
  * @since 2.0
  */
-abstract class AbstractEntityInheritancePersister extends StandardEntityPersister
+abstract class AbstractEntityInheritancePersister extends BasicEntityPersister
 {
     /**
      * Map from column names to class names that declare the field the column is mapped to.
diff --git a/lib/Doctrine/ORM/Persisters/StandardEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
similarity index 99%
rename from lib/Doctrine/ORM/Persisters/StandardEntityPersister.php
rename to lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
index 29c04c09d..9b8609850 100644
--- a/lib/Doctrine/ORM/Persisters/StandardEntityPersister.php
+++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
@@ -70,9 +70,8 @@ use PDO,
  * @author Roman Borschel <roman@code-factory.org>
  * @author Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
  * @since 2.0
- * @todo Rename: BasicEntityPersister
  */
-class StandardEntityPersister
+class BasicEntityPersister
 {
     /**
      * Metadata object that describes the mapping of the mapped entity class.
@@ -159,7 +158,7 @@ class StandardEntityPersister
     protected $_sqlTableAliases = array();
 
     /**
-     * Initializes a new <tt>StandardEntityPersister</tt> that uses the given EntityManager
+     * Initializes a new <tt>BasicEntityPersister</tt> that uses the given EntityManager
      * and persists instances of the class described by the given ClassMetadata descriptor.
      * 
      * @param Doctrine\ORM\EntityManager $em
@@ -828,7 +827,7 @@ class StandardEntityPersister
      * an entity in this persister.
      *
      * Subclasses should override this method to alter or change the select column
-     * list SQL fragment. Note that in the implementation of StandardEntityPersister
+     * list SQL fragment. Note that in the implementation of BasicEntityPersister
      * the resulting SQL fragment is generated only once and cached in {@link _selectColumnListSql}.
      * Subclasses may or may not do the same.
      * 
diff --git a/lib/Doctrine/ORM/Persisters/UnionSubclassPersister.php b/lib/Doctrine/ORM/Persisters/UnionSubclassPersister.php
index 6afc51b4b..b2e683a27 100644
--- a/lib/Doctrine/ORM/Persisters/UnionSubclassPersister.php
+++ b/lib/Doctrine/ORM/Persisters/UnionSubclassPersister.php
@@ -2,7 +2,7 @@
 
 namespace Doctrine\ORM\Persisters;
 
-class UnionSubclassPersister extends StandardEntityPersister
+class UnionSubclassPersister extends BasicEntityPersister
 {
     
 }
\ No newline at end of file
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 9cfbeda75..4a0c5663f 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1966,7 +1966,7 @@ class UnitOfWork implements PropertyChangedListener
         if ( ! isset($this->_persisters[$entityName])) {
             $class = $this->_em->getClassMetadata($entityName);
             if ($class->isInheritanceTypeNone()) {
-                $persister = new Persisters\StandardEntityPersister($this->_em, $class);
+                $persister = new Persisters\BasicEntityPersister($this->_em, $class);
             } else if ($class->isInheritanceTypeSingleTable()) {
                 $persister = new Persisters\SingleTablePersister($this->_em, $class);
             } else if ($class->isInheritanceTypeJoined()) {
diff --git a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php
index 2bf42fe9b..aa43081a8 100644
--- a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php
+++ b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php
@@ -5,7 +5,7 @@ namespace Doctrine\Tests\Mocks;
 /**
  * EntityPersister implementation used for mocking during tests.
  */
-class EntityPersisterMock extends \Doctrine\ORM\Persisters\StandardEntityPersister
+class EntityPersisterMock extends \Doctrine\ORM\Persisters\BasicEntityPersister
 {
     private $_inserts = array();
     private $_updates = array();
diff --git a/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php b/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php
index 9445af133..fcf07cfa0 100644
--- a/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php
@@ -156,7 +156,7 @@ class ProxyClassGeneratorTest extends \Doctrine\Tests\OrmTestCase
     
     protected function _getMockPersister()
     {
-        $persister = $this->getMock('Doctrine\ORM\Persisters\StandardEntityPersister', array('load'), array(), '', false);
+        $persister = $this->getMock('Doctrine\ORM\Persisters\BasicEntityPersister', array('load'), array(), '', false);
         return $persister;
     }
 }