removed some more legacy

lib/Doctrine/ORM/ActiveEntity.php

@@ -21,36 +21,9 @@ class Doctrine_ORM_ActiveEntity extends Doctrine_ORM_Entity
      */
     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);
-    }
-    
     /**
      * Creates an array representation of the object's data.
      *
@@ -213,11 +186,9 @@ class Doctrine_ORM_ActiveEntity extends Doctrine_ORM_Entity
      * Deletes the persistent state of the entity.
      *
      * @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);
     }
     
@@ -268,7 +239,6 @@ class Doctrine_ORM_ActiveEntity extends Doctrine_ORM_Entity
      * @param string $alias     related component alias
      * @param array $ids        the identifiers of the related records
      * @return Doctrine_Entity  this object
-     * @todo ActiveEntity method.
      */
     public function unlink($alias, $ids = array())
     {
@@ -322,7 +292,6 @@ class Doctrine_ORM_ActiveEntity extends Doctrine_ORM_Entity
      * @param string $alias     related component alias
      * @param array $ids        the identifiers of the related records
      * @return Doctrine_Entity  this object
-     * @todo ActiveEntity method.
      */
     public function link($alias, array $ids)
     {

lib/Doctrine/ORM/EntityRepository.php

@@ -26,10 +26,8 @@
  * Base class for all custom user-defined repositories.
  * 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$
  * @author      Roman Borschel <roman@code-factory.org>
@@ -40,7 +38,7 @@ class Doctrine_ORM_EntityRepository
     protected $_em;
     protected $_classMetadata;
     
-    public function __construct($entityName, Doctrine_ClassMetadata $classMetadata)
+    public function __construct($entityName, Doctrine_ORM_Mapping_ClassMetadata $classMetadata)
     {
         $this->_entityName = $entityName;
         $this->_em = $classMetadata->getConnection();
@@ -70,7 +68,7 @@ class Doctrine_ORM_EntityRepository
      */
     public function clear()
     {
-        $this->_em->unitOfWork->clearIdentitiesForEntity($this->_classMetadata->getRootClassName());
+        $this->_em->getUnitOfWork()->clearIdentitiesForEntity($this->_classMetadata->getRootClassName());
     }
     
     /**
@@ -185,7 +183,7 @@ class Doctrine_ORM_EntityRepository
      * findById, findByContactId, etc.
      *
      * @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.
      */
@@ -198,7 +196,7 @@ class Doctrine_ORM_EntityRepository
             $by = substr($method, 9, strlen($method));
             $method = 'findOneBy';
         } else {
-            throw new Doctrine_Mapper_Exception("Undefined method '$method'.");
+            throw new BadMethodCallException("Undefined method '$method'.");
         }
         
         if (isset($by)) {

lib/Doctrine/Query/Filter.php

-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-/**
- * Doctrine_Query_Filter
- *
- * @package     Doctrine
- * @subpackage  Query
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link        www.phpdoctrine.org
- * @since       1.0
- * @version     $Revision$
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- */
-class Doctrine_Query_Filter implements Doctrine_Query_Filter_Interface
-{
-    /**
-     * preQuery
-     *
-     * Method for listening the preQuery method of Doctrine_Query and
-     * hooking into the query building procedure, doing any custom / specialized
-     * query building procedures that are neccessary.
-     *
-     * @return void
-     */
-    public function preQuery(Doctrine_Query $query)
-    {
-    
-    }
-
-    /**
-     * postQuery
-     *
-     * Method for listening the postQuery method of Doctrine_Query and
-     * to hook into the query building procedure, doing any custom / specialized
-     * post query procedures (for example logging) that are neccessary.
-     *
-     * @param Doctrine_Query $query
-     * @return void
-     */
-    public function postQuery(Doctrine_Query $query)
-    {
-    
-    }
-}
\ No newline at end of file

lib/Doctrine/Query/Registry.php

-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-/**
- * Doctrine_Query_Registry
- *
- * @package     Doctrine
- * @subpackage  Query
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link        www.phpdoctrine.org
- * @since       1.0
- * @version     $Revision$
- * @todo Remove
- */
-class Doctrine_Query_Registry
-{
-    protected $_queries = array();
-
-    public function add($key, $query)
-    {
-    	if (strpos($key, '/') === false) {
-            $this->_queries[$key] = $query;
-        } else {
-            // namespace found
-            
-            $e = explode('/', $key);
-
-            $this->_queries[$e[0]][$e[1]] = $query;
-        }
-    }
-    
-    public function get($key, $namespace = null)
-    {
-        if (isset($namespace)) {
-            if ( ! isset($this->_queries[$namespace][$key])) {
-                throw new Doctrine_Query_Registry_Exception('A query with the name ' . $namespace . '/' . $key . ' does not exist.');
-            }
-            $query = $this->_queries[$namespace][$key];
-        } else {
-            if ( ! isset($this->_queries[$key])) {
-                try {
-                    throw new Exception();
-                } catch (Exception $e) {
-                    echo $e->getTraceAsString() ."<br /><br />";
-                }
-                throw new Doctrine_Query_Registry_Exception('A query with the name ' . $key . ' does not exist.');
-            }
-            $query = $this->_queries[$key];
-        }
-        
-        if ( ! ($query instanceof Doctrine_Query)) {
-            $query = Doctrine_Query::create()->parseQuery($query);
-        }
-        
-        return $query;
-    }
-}
\ No newline at end of file

lib/Doctrine/Query/Registry/Exception.php

-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-/**
- * Doctrine_Query_Exception
- *
- * @package     Doctrine
- * @subpackage  Query
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link        www.phpdoctrine.org
- * @since       1.0
- * @version     $Revision$
- * @todo Remove
- */
-class Doctrine_Query_Registry_Exception extends Doctrine_Query_Exception
-{ }
\ No newline at end of file