Changeset 4947 for trunk/lib/Doctrine

Show
Ignore:
Timestamp:
09/12/08 14:16:05 (4 months ago)
Author:
romanb
Message:

moved entitymanager and entityrepository

Location:
trunk/lib/Doctrine
Files:
2 added
2 removed
12 modified

Legend:

Unmodified
Added
Removed

  • trunk/lib/Doctrine/ClassMetadata.php

    r4934 r4947  
    357357     * @param Doctrine::ORM::Entitymanager $em 
    358358     */ 
    359     public function __construct($entityName, Doctrine_EntityManager $em) 
     359    public function __construct($entityName, Doctrine_ORM_EntityManager $em) 
    360360    { 
    361361        $this->_entityName = $entityName; 

  • trunk/lib/Doctrine/ClassMetadata/Factory.php

    r4930 r4947  
    5252     * @param $driver  The metadata driver to use. 
    5353     */ 
    54     public function __construct(Doctrine_EntityManager $em, $driver) 
     54    public function __construct(Doctrine_ORM_EntityManager $em, $driver) 
    5555    { 
    5656        $this->_em = $em; 

  • trunk/lib/Doctrine/Connection/UnitOfWork.php

    r4930 r4947  
    121121     * @param Doctrine_EntityManager $em 
    122122     */ 
    123     public function __construct(Doctrine_EntityManager $em) 
     123    public function __construct(Doctrine_ORM_EntityManager $em) 
    124124    { 
    125125        $this->_em = $em; 

  • trunk/lib/Doctrine/ORM/Collection.php

    r4944 r4947  
    131131    { 
    132132        $this->_entityBaseType = $entityBaseType; 
    133         $this->_em = Doctrine_EntityManager::getActiveEntityManager(); 
     133        $this->_em = Doctrine_ORM_EntityManager::getActiveEntityManager(); 
    134134 
    135135        if ($keyField !== null) { 
    … …  
    10191019    public function unserialize($serialized) 
    10201020    { 
    1021         $manager = Doctrine_EntityManager::getActiveEntityManager(); 
     1021        $manager = Doctrine_ORM_EntityManager::getActiveEntityManager(); 
    10221022        $connection = $manager->getConnection(); 
    10231023         

  • trunk/lib/Doctrine/ORM/Entity.php

    r4944 r4947  
    205205    { 
    206206        $this->_entityName = get_class($this); 
    207         $this->_em = Doctrine_EntityManager::getActiveEntityManager(); 
     207        $this->_em = Doctrine_ORM_EntityManager::getActiveEntityManager(); 
    208208        $this->_class = $this->_em->getClassMetadata($this->_entityName); 
    209209        $this->_oid = self::$_index++; 

  • trunk/lib/Doctrine/ORM/Exceptions/ORMException.php

    r4946 r4947  
    3535 */ 
    3636class Doctrine_ORM_Exceptions_ORMException extends Doctrine_Common_Exceptions_DoctrineException 
    37 { 
    38  
    39 } 
     37{} 

  • trunk/lib/Doctrine/ORM/Id/AbstractIdGenerator.php

    r4930 r4947  
    1414    protected $_em; 
    1515     
    16     public function __construct(Doctrine_EntityManager $em) 
     16    public function __construct(Doctrine_ORM_EntityManager $em) 
    1717    { 
    1818        $this->_em = $em; 

  • trunk/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php

    r4924 r4947  
    6767     * @param Doctrine_Connection|null $connection 
    6868     */ 
    69     public function __construct(Doctrine_EntityManager $em) 
     69    public function __construct(Doctrine_ORM_EntityManager $em) 
    7070    { 
    7171        $this->_em = $em; 

  • trunk/lib/Doctrine/ORM/Internal/Hydration/ObjectDriver.php

    r4944 r4947  
    4242    private $_em; 
    4343     
    44     public function __construct(Doctrine_EntityManager $em) 
     44    public function __construct(Doctrine_ORM_EntityManager $em) 
    4545    { 
    4646        $this->_nullObject = Doctrine_ORM_Internal_Null::$INSTANCE; 

  • trunk/lib/Doctrine/ORM/Persisters/AbstractEntityPersister.php

    r4930 r4947  
    7575     * Constructs a new EntityPersister. 
    7676     */ 
    77     public function __construct(Doctrine_EntityManager $em, Doctrine_ClassMetadata $classMetadata) 
     77    public function __construct(Doctrine_ORM_EntityManager $em, Doctrine_ClassMetadata $classMetadata) 
    7878    { 
    7979        $this->_em = $em; 

  • trunk/lib/Doctrine/Query.php

    r4924 r4947  
    9494 
    9595 
    96     public function __construct(Doctrine_EntityManager $entityManager) 
     96    public function __construct(Doctrine_ORM_EntityManager $entityManager) 
    9797    { 
    9898        $this->_entityManager = $entityManager; 

  • trunk/lib/Doctrine/Query/SqlBuilder.php

    r4866 r4947  
    4343 
    4444 
    45     public static function fromConnection(Doctrine_EntityManager $entityManager) 
     45    public static function fromConnection(Doctrine_ORM_EntityManager $entityManager) 
    4646    { 
    4747        $connection = $entityManager->getConnection();