RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-31 12:32:59 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] renamed classes to more descriptive names

Browse Source
This commit is contained in:
piccoloprincipe 2009-07-16 14:03:22 +00:00
parent a41bbbd7e1
commit cdc102fc23
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/ORM/EntityManager.php
View File

@ -26,8 +26,8 @@ use Doctrine\Common\DoctrineException;
use Doctrine\DBAL\Connection; use Doctrine\DBAL\Connection;
use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\ClassMetadataFactory;
use Doctrine\ORM\DynamicProxy\Factory as ProxyFactory; use Doctrine\ORM\Proxy\ProxyFactory;
use Doctrine\ORM\DynamicProxy\Generator; use Doctrine\ORM\Proxy\ProxyClassGenerator;
/** /**
* The EntityManager is the central access point to ORM functionality. * The EntityManager is the central access point to ORM functionality.
@ -147,7 +147,7 @@ class EntityManager
$this->_metadataFactory->setCacheDriver($this->_config->getMetadataCacheImpl()); $this->_metadataFactory->setCacheDriver($this->_config->getMetadataCacheImpl());
$this->_unitOfWork = new UnitOfWork($this); $this->_unitOfWork = new UnitOfWork($this);
//FIX: this should be in a factory //FIX: this should be in a factory
$this->_proxyFactory = new ProxyFactory($this, new Generator($this, $this->_config->getCacheDir())); $this->_proxyFactory = new ProxyFactory($this, new ProxyClassGenerator($this, $this->_config->getCacheDir()));
} }
/** /**

7
lib/Doctrine/ORM/DynamicProxy/Generator.php → lib/Doctrine/ORM/Proxy/ProxyClassGenerator.php
View File

@ -19,17 +19,18 @@
* <http://www.doctrine-project.org>. * <http://www.doctrine-project.org>.
*/ */
namespace Doctrine\ORM\DynamicProxy; namespace Doctrine\ORM\Proxy;
use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadata;
/** /**
* The DynamicProxyGenerator is used to generate proxy objects for entities at runtime. * The ProxyClassGenerator is used to generate proxy objects for entities at runtime.
* *
* @author Roman Borschel <roman@code-factory.org> * @author Roman Borschel <roman@code-factory.org>
* @author Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
* @since 2.0 * @since 2.0
*/ */
class Generator class ProxyClassGenerator
{ {
/** The namespace for the generated proxy classes. */ /** The namespace for the generated proxy classes. */
private static $_ns = 'Doctrine\Generated\Proxies\\'; private static $_ns = 'Doctrine\Generated\Proxies\\';

7
lib/Doctrine/ORM/DynamicProxy/Factory.php → lib/Doctrine/ORM/Proxy/ProxyFactory.php
View File

@ -19,7 +19,7 @@
* <http://www.doctrine-project.org>. * <http://www.doctrine-project.org>.
*/ */
namespace Doctrine\ORM\DynamicProxy; namespace Doctrine\ORM\Proxy;
use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManager;
@ -27,9 +27,10 @@ use Doctrine\ORM\EntityManager;
* This Factory is used to create proxy objects for entities at runtime. * This Factory is used to create proxy objects for entities at runtime.
* *
* @author Roman Borschel <roman@code-factory.org> * @author Roman Borschel <roman@code-factory.org>
* @author Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
* @since 2.0 * @since 2.0
*/ */
class Factory class ProxyFactory
{ {
private $_em; private $_em;
private $_generator; private $_generator;
@ -42,7 +43,7 @@ class Factory
* @param EntityManager $em * @param EntityManager $em
* @param Generator $generator * @param Generator $generator
*/ */
public function __construct(EntityManager $em, Generator $generator) public function __construct(EntityManager $em, ProxyClassGenerator $generator)
{ {
$this->_em = $em; $this->_em = $em;
$this->_generator = $generator; $this->_generator = $generator;