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

#1133 DDC-3305 - test case with embeddable without referenced embeddable class

Browse source
This commit is contained in:
Marco Pivetta 2015-01-16 19:45:16 +01:00
parent 705a7d2cc2
commit 7e4dab17ec
3 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
View file

@ -170,7 +170,7 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
continue; continue;
} }
if (!isset($embeddableClass['class'])) { if (! (isset($embeddableClass['class']) && $embeddableClass['class'])) {
throw MappingException::missingEmbeddedClass($property); throw MappingException::missingEmbeddedClass($property);
} }

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

@ -3166,11 +3166,15 @@ class ClassMetadataInfo implements ClassMetadata
} }
/** /**
* @param string $className * @param string|null $className
* @return string * @return string|null null if the input value is null
*/ */
public function fullyQualifiedClassName($className) public function fullyQualifiedClassName($className)
{ {
if (empty($className)) {
return $className;
}
if ($className !== null && strpos($className, '\\') === false && strlen($this->namespace) > 0) { if ($className !== null && strpos($className, '\\') === false && strlen($this->namespace) > 0) {
return $this->namespace . '\\' . $className; return $this->namespace . '\\' . $className;
} }

32
tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
View file

@ -29,7 +29,7 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
$cm1 = $this->_createValidClassMetadata(); $cm1 = $this->_createValidClassMetadata();
// SUT // SUT
$cmf = new \Doctrine\ORM\Mapping\ClassMetadataFactory(); $cmf = new ClassMetadataFactory();
$cmf->setEntityManager($entityManager); $cmf->setEntityManager($entityManager);
$cmf->setMetadataFor($cm1->name, $cm1); $cmf->setMetadataFor($cm1->name, $cm1);
@ -375,10 +375,35 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
// not really the cleanest way to check it, but we won't add a getter to the CMF just for the sake of testing. // not really the cleanest way to check it, but we won't add a getter to the CMF just for the sake of testing.
$this->assertAttributeSame($entityManager, 'em', $classMetadataFactory); $this->assertAttributeSame($entityManager, 'em', $classMetadataFactory);
} }
/**
* @group DDC-3305
*/
public function testRejectsEmbeddableWithoutValidClassName()
{
$metadata = $this->_createValidClassMetadata();
$metadata->mapEmbedded(array(
'fieldName' => 'embedded',
'class' => '',
'columnPrefix' => false,
));
$cmf = $this->_createTestFactory();
$cmf->setMetadataForClass($metadata->name, $metadata);
$this->setExpectedException(
'Doctrine\ORM\Mapping\MappingException',
'The embed mapping \'embedded\' misses the \'class\' attribute.'
);
$cmf->getMetadataFor($metadata->name);
}
} }
/* Test subject class with overridden factory method for mocking purposes */ /* Test subject class with overridden factory method for mocking purposes */
class ClassMetadataFactoryTestSubject extends \Doctrine\ORM\Mapping\ClassMetadataFactory class ClassMetadataFactoryTestSubject extends ClassMetadataFactory
{ {
private $mockMetadata = array(); private $mockMetadata = array();
private $requestedClasses = array(); private $requestedClasses = array();
@ -388,7 +413,7 @@ class ClassMetadataFactoryTestSubject extends \Doctrine\ORM\Mapping\ClassMetadat
{ {
$this->requestedClasses[] = $className; $this->requestedClasses[] = $className;
if ( ! isset($this->mockMetadata[$className])) { if ( ! isset($this->mockMetadata[$className])) {
throw new InvalidArgumentException("No mock metadata found for class $className."); throw new \InvalidArgumentException("No mock metadata found for class $className.");
} }
return $this->mockMetadata[$className]; return $this->mockMetadata[$className];
} }
@ -410,6 +435,7 @@ class TestEntity1
private $name; private $name;
private $other; private $other;
private $association; private $association;
private $embedded;
} }
class CustomIdGenerator extends AbstractIdGenerator class CustomIdGenerator extends AbstractIdGenerator