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

Moving exception throwing for invalid file mappings to Doctrine\Common\Persistence\Mapping\Driver\FileDriver

Browse source
This commit is contained in:
Marco Pivetta 2012-01-17 15:39:52 +01:00
parent 03fb734de8
commit ccace8cb8b
4 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/Doctrine/ORM/Mapping/Driver/AbstractFileDriver.php
View file

@ -41,20 +41,4 @@ use Doctrine\Common\Persistence\Mapping\Driver\FileLocator;
*/ */
abstract class AbstractFileDriver extends FileDriver implements Driver abstract class AbstractFileDriver extends FileDriver implements Driver
{ {
/**
* Get the element of schema meta data for the class from the mapping file.
* This will lazily load the mapping file if it is not loaded yet
*
* @return array $element The element of schema meta data
* @throws MappingException
* @todo move behavior to FileDriver
*/
public function getElement($className)
{
$result = parent::getElement($className);
if($result === null) {
throw MappingException::invalidMappingFile($className, str_replace('\\', '.', $className) . $this->locator->getFileExtension());
}
return $result;
}
} }

7
lib/Doctrine/ORM/Mapping/MappingException.php
View file

@ -78,11 +78,6 @@ class MappingException extends \Doctrine\ORM\ORMException
return new self("No mapping file found named '$fileName' for class '$entityName'."); return new self("No mapping file found named '$fileName' for class '$entityName'.");
} }
public static function invalidMappingFile($entityName, $fileName)
{
return new self("Invalid mapping file '$fileName' for class '$entityName'.");
}
/** /**
* Exception for invalid property name override. * Exception for invalid property name override.
* *
@ -144,7 +139,7 @@ class MappingException extends \Doctrine\ORM\ORMException
{ {
return new self('Result set mapping named "'.$resultName.'" in "'.$entity.' requires a field name.'); return new self('Result set mapping named "'.$resultName.'" in "'.$entity.' requires a field name.');
} }
public static function nameIsMandatoryForSqlResultSetMapping($className) public static function nameIsMandatoryForSqlResultSetMapping($className)
{ {
return new self("Result set mapping name on entity class '$className' is not defined."); return new self("Result set mapping name on entity class '$className' is not defined.");

2
tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
View file

@ -55,7 +55,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
/** /**
* @group DDC-1468 * @group DDC-1468
* *
* @expectedException Doctrine\ORM\Mapping\MappingException * @expectedException Doctrine\Common\Persistence\Mapping\MappingException
* @expectedExceptionMessage Invalid mapping file 'Doctrine.Tests.Models.Generic.SerializationModel.dcm.xml' for class 'Doctrine\Tests\Models\Generic\SerializationModel'. * @expectedExceptionMessage Invalid mapping file 'Doctrine.Tests.Models.Generic.SerializationModel.dcm.xml' for class 'Doctrine\Tests\Models\Generic\SerializationModel'.
*/ */
public function testInvalidMappingFileException() public function testInvalidMappingFileException()

2
tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php
View file

@ -46,7 +46,7 @@ class YamlMappingDriverTest extends AbstractMappingDriverTest
/** /**
* @group DDC-1468 * @group DDC-1468
* *
* @expectedException Doctrine\ORM\Mapping\MappingException * @expectedException Doctrine\Common\Persistence\Mapping\MappingException
* @expectedExceptionMessage Invalid mapping file 'Doctrine.Tests.Models.Generic.SerializationModel.dcm.yml' for class 'Doctrine\Tests\Models\Generic\SerializationModel'. * @expectedExceptionMessage Invalid mapping file 'Doctrine.Tests.Models.Generic.SerializationModel.dcm.yml' for class 'Doctrine\Tests\Models\Generic\SerializationModel'.
*/ */
public function testInvalidMappingFileException() public function testInvalidMappingFileException()