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

[2.0][DDC-286][DDC-287] Fixed missing method and casting. Thanks Hannes for reporting and patch.

Browse source
This commit is contained in:
guilhermeblanco 2010-01-30 21:11:13 +00:00
parent 1e135d951e
commit f6d17b79d8
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,4 +127,10 @@ class MappingException extends \Doctrine\ORM\ORMException
return new self('The column ' . $joinColumn . ' must be mapped to a field in class ' return new self('The column ' . $joinColumn . ' must be mapped to a field in class '
. $className . ' since it is referenced by a join column of another class.'); . $className . ' since it is referenced by a join column of another class.');
} }
public static function annotationDriverRequiresConfiguredDirectoryPath()
{
return new self('The annotation driver needs to have a directory path');
}
} }

2
lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
View file

@ -145,7 +145,7 @@ class SchemaToolTask extends AbstractTask
if ($metadataDriver instanceof \Doctrine\ORM\Mapping\Driver\AnnotationDriver) { if ($metadataDriver instanceof \Doctrine\ORM\Mapping\Driver\AnnotationDriver) {
if (isset($arguments['class-dir'])) { if (isset($arguments['class-dir'])) {
$metadataDriver->addPaths($arguments['class-dir']); $metadataDriver->addPaths((array) $arguments['class-dir']);
} else { } else {
throw new CliException( throw new CliException(
'The supplied configuration uses the annotation metadata driver. ' . 'The supplied configuration uses the annotation metadata driver. ' .