Changeset 4963 for trunk/lib/Doctrine

Timestamp:

09/13/08 11:36:58 (4 months ago)

Author:

romanb

Message:

removed some more legacy

Location:

trunk/lib/Doctrine

Files:

• ORM/ActiveEntity.php (modified) (4 diffs)
• ORM/EntityRepository.php (modified) (5 diffs)
• Query/Filter.php (deleted)
• Query/Registry (deleted)
• Query/Registry.php (deleted)
• Query/Tokenizer.php (deleted)

trunk/lib/Doctrine/ORM/ActiveEntity.php

@@ -22 +22 @@
     public function save()
     {
-        // TODO: Forward to EntityManager. There: registerNew() OR registerDirty() on UnitOfWork.
         $this->_em->save($this);
-    }
-    
-    /**
-     * Execute a SQL REPLACE query. A REPLACE query is identical to a INSERT
-     * query, except that if there is already a row in the table with the same
-     * key field values, the REPLACE query just updates its values instead of
-     * inserting a new row.
-     *
-     * The REPLACE type of query does not make part of the SQL standards. Since
-     * practically only MySQL and SQLIte implement it natively, this type of
-     * query isemulated through this method for other DBMS using standard types
-     * of queries inside a transaction to assure the atomicity of the operation.
-     *
-     * @param Doctrine_Connection $conn             optional connection parameter
-     * @throws Doctrine_Connection_Exception        if some of the key values was null
-     * @throws Doctrine_Connection_Exception        if there were no key fields
-     * @throws Doctrine_Connection_Exception        if something fails at database level
-     * @return integer                              number of rows affected
-     * @todo ActiveEntity method.
-     */
-    public function replace()
-    {
-        return $this->_em->replace(
-                $this->_class,
-                $this->getPrepared(),
-                $this->_id);
     }
     
@@ -214 +187 @@
      *
      * @return boolean  TRUE on success, FALSE on failure.
-     * @todo ActiveRecord method.
      */
     public function delete()
     {
-        // TODO: Forward to EntityManager. There: registerRemoved() on UnitOfWork
         return $this->_em->remove($this);
     }
@@ -269 +240 @@
      * @param array $ids        the identifiers of the related records
      * @return Doctrine_Entity  this object
-     * @todo ActiveEntity method.
      */
     public function unlink($alias, $ids = array())
@@ -323 +293 @@
      * @param array $ids        the identifiers of the related records
      * @return Doctrine_Entity  this object
-     * @todo ActiveEntity method.
      */
     public function link($alias, array $ids)

trunk/lib/Doctrine/ORM/EntityRepository.php

@@ -27 +27 @@
  * Provides basic finder methods, common to all repositories.
  *
- * @package     Doctrine
- * @subpackage  EntityRepository
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link        www.phpdoctrine.org
+ * @link        www.doctrine-project.org
  * @since       2.0
  * @version     $Revision$
@@ -41 +39 @@
     protected $_classMetadata;
     
-    public function __construct($entityName, Doctrine_ClassMetadata $classMetadata)
+    public function __construct($entityName, Doctrine_ORM_Mapping_ClassMetadata $classMetadata)
     {
         $this->_entityName = $entityName;
@@ -71 +69 @@
     public function clear()
     {
-        $this->_em->unitOfWork->clearIdentitiesForEntity($this->_classMetadata->getRootClassName());
+        $this->_em->getUnitOfWork()->clearIdentitiesForEntity($this->_classMetadata->getRootClassName());
     }
     
@@ -186 +184 @@
      *
      * @return void
-     * @throws Doctrine_Mapper_Exception  If the method called is an invalid find* method
+     * @throws BadMethodCallException  If the method called is an invalid find* method
      *                                    or no find* method at all and therefore an invalid
      *                                    method call.
@@ -199 +197 @@
             $method = 'findOneBy';
         } else {
-            throw new Doctrine_Mapper_Exception("Undefined method '$method'.");
+            throw new BadMethodCallException("Undefined method '$method'.");
         }