RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 06:03:15 +03:00
Code Issues Projects Releases Wiki Activity

Change repository type for EntityRepository

Browse Source
This commit is contained in:
Fabio B. Silva 2011-09-08 17:21:06 -03:00
parent 43ccd9ead6
commit 3707b34cbb
4 changed files with 9 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Doctrine/ORM/Configuration.php
View File

@ -522,13 +522,13 @@ class Configuration extends \Doctrine\DBAL\Configuration
*
* @since 2.2
* @param string $className
* @throws ORMException If not implements Doctrine\Common\Persistence\ObjectRepository
* @throws ORMException If not is a Doctrine\ORM\EntityRepository
*/
public function setDefaultRepositoryClassName($className)
{
$class = new \ReflectionClass($className);
if (!$class->implementsInterface('Doctrine\Common\Persistence\ObjectRepository')) {
throw ORMException::invalidObjectRepository($className);
if ($className != "Doctrine\ORM\EntityRepository" &&
!is_subclass_of($className, 'Doctrine\ORM\EntityRepository')){
throw ORMException::invalidEntityRepository($className);
}
$this->_attributes['defaultRepositoryClassName'] = $className;
}

5
lib/Doctrine/ORM/ORMException.php
View File

@ -131,8 +131,9 @@ class ORMException extends Exception
);
}
public static function invalidObjectRepository($className) {
public static function invalidEntityRepository($className)
{
return new self("Invalid repository class '".$className."'. ".
"it must implement Doctrine\Common\Persistence\ObjectRepository.");
"it must be a Doctrine\ORM\EntityRepository.");
}
}

49
tests/Doctrine/Tests/Models/DDC753/DDC753DefaultRepository.php
View File

@ -22,55 +22,8 @@ namespace Doctrine\Tests\Models\DDC753;
use Doctrine\ORM\EntityRepository;
class DDC753DefaultRepository implements \Doctrine\Common\Persistence\ObjectRepository
class DDC753DefaultRepository extends EntityRepository
{
/**
* @var Doctrine\ORM\EntityRepository
*/
private $repository;
/**
* @param EntityManager $em
* @param ClassMetadata $classMetadata
*/
public function __construct($em, $class)
{
$this->repository = new EntityRepository($em, $class);
}
/**
* {@inheritdoc}
*/
public function find($id)
{
return $this->repository->find($id);
}
/**
* {@inheritdoc}
*/
public function findAll()
{
return $this->repository->findAll;
}
/**
* {@inheritdoc}
*/
public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
{
return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
}
/**
* {@inheritdoc}
*/
public function findOneBy(array $criteria)
{
return $this->repository->findOneBy($criteria);
}
/**
* @return bool
*/

17
tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php
View File

@ -463,7 +463,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
/**
* @group DDC-753
* @expectedException Doctrine\ORM\ORMException
* @expectedExceptionMessage Invalid repository class 'Doctrine\Tests\Models\DDC753\DDC753InvalidRepository'. it must implement Doctrine\Common\Persistence\ObjectRepository.
* @expectedExceptionMessage Invalid repository class 'Doctrine\Tests\Models\DDC753\DDC753InvalidRepository'. it must be a Doctrine\ORM\EntityRepository.
*/
public function testSetDefaultRepositoryInvalidClassError()
{
@ -471,20 +471,5 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->getConfiguration()->setDefaultRepositoryClassName("Doctrine\Tests\Models\DDC753\DDC753InvalidRepository");
}
/**
* @group DDC-753
* @todo check it is necessary throws exception when a repository is not a Doctrine\Common\Persistence\ObjectRepository
* ClassMetadataInfo#setCustomRepositoryClass
*/
public function testEntityWithInvalidRepositoryError()
{
$this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), "Doctrine\ORM\EntityRepository");
$repos = $this->_em->getRepository('Doctrine\Tests\Models\DDC753\DDC753EntityWithInvalidRepository');
$this->assertInstanceOf("\stdClass", $repos);
$this->markTestIncomplete();
}
}