RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Implementing initial Doctrine\Common\Persistence interfaces.

Browse source
This commit is contained in:
Jonathan H. Wage 2011-02-15 20:02:45 -06:00
parent 64088fce5d
commit 68a4099684
4 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Doctrine/ORM/EntityManager.php
View file

@ -21,6 +21,7 @@ namespace Doctrine\ORM;
use Closure, Exception, use Closure, Exception,
Doctrine\Common\EventManager, Doctrine\Common\EventManager,
Doctrine\Common\Persistence\ObjectManager,
Doctrine\DBAL\Connection, Doctrine\DBAL\Connection,
Doctrine\DBAL\LockMode, Doctrine\DBAL\LockMode,
Doctrine\ORM\Mapping\ClassMetadata, Doctrine\ORM\Mapping\ClassMetadata,
@ -37,7 +38,7 @@ use Closure, Exception,
* @author Jonathan Wage <jonwage@gmail.com> * @author Jonathan Wage <jonwage@gmail.com>
* @author Roman Borschel <roman@code-factory.org> * @author Roman Borschel <roman@code-factory.org>
*/ */
class EntityManager class EntityManager implements ObjectManager
{ {
/** /**
* The used Configuration. * The used Configuration.

3
lib/Doctrine/ORM/EntityRepository.php
View file

@ -20,6 +20,7 @@
namespace Doctrine\ORM; namespace Doctrine\ORM;
use Doctrine\DBAL\LockMode; use Doctrine\DBAL\LockMode;
use Doctrine\Common\Persistence\ObjectRepository;
/** /**
* An EntityRepository serves as a repository for entities with generic as well as * An EntityRepository serves as a repository for entities with generic as well as
@ -34,7 +35,7 @@ use Doctrine\DBAL\LockMode;
* @author Jonathan Wage <jonwage@gmail.com> * @author Jonathan Wage <jonwage@gmail.com>
* @author Roman Borschel <roman@code-factory.org> * @author Roman Borschel <roman@code-factory.org>
*/ */
class EntityRepository class EntityRepository implements ObjectRepository
{ {
/** /**
* @var string * @var string

15
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View file

@ -19,6 +19,7 @@
namespace Doctrine\ORM\Mapping; namespace Doctrine\ORM\Mapping;
use Doctrine\Common\Persistence\Mapping\ClassMetadata;
use ReflectionClass; use ReflectionClass;
/** /**
@ -39,7 +40,7 @@ use ReflectionClass;
* @author Jonathan H. Wage <jonwage@gmail.com> * @author Jonathan H. Wage <jonwage@gmail.com>
* @since 2.0 * @since 2.0
*/ */
class ClassMetadataInfo class ClassMetadataInfo implements ClassMetadata
{ {
/* The inheritance mapping types */ /* The inheritance mapping types */
/** /**
@ -778,7 +779,7 @@ class ClassMetadataInfo
$mapping['isOwningSide'] = false; $mapping['isOwningSide'] = false;
} }
if (isset($mapping['id']) && $mapping['id'] === true && $mapping['type'] & ClassMetadata::TO_MANY) { if (isset($mapping['id']) && $mapping['id'] === true && $mapping['type'] & self::TO_MANY) {
throw MappingException::illegalToManyIdentifierAssoaction($this->name, $mapping['fieldName']); throw MappingException::illegalToManyIdentifierAssoaction($this->name, $mapping['fieldName']);
} }
@ -1024,6 +1025,16 @@ class ClassMetadataInfo
$this->isIdentifierComposite = (count($this->identifier) > 1); $this->isIdentifierComposite = (count($this->identifier) > 1);
} }
/**
* Gets the mapped identifier field of this class.
*
* @return string $identifier
*/
public function getIdentifier()
{
return $this->identifier;
}
/** /**
* Checks whether the class has a (mapped) field with a certain name. * Checks whether the class has a (mapped) field with a certain name.
* *

2
lib/vendor/doctrine-common vendored

@ -1 +1 @@
Subproject commit 9d414673bb007e61977341d78745fc5aa316a92b Subproject commit 1b112962b09d799237b1b73caf3c838b46d976de