diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'weaverryan/staticphp_reference_fix'

Browse Source 
* weaverryan/staticphp_reference_fix:
  [DoctrineAbstractBundle] Changing incorrect "static-php" references to "staticphp"
This commit is contained in:
Fabien Potencier 2011-03-30 15:42:22 +02:00
commit f5df88244b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php
View File

@ -153,7 +153,7 @@ abstract class AbstractDoctrineExtension extends Extension
}
if (!$bundleConfig['dir']) {
if (in_array($bundleConfig['type'], array('annotation', 'static-php'))) {
if (in_array($bundleConfig['type'], array('annotation', 'staticphp'))) {
$bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingObjectDefaultName();
} else {
$bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingResourceConfigDirectory();
@ -236,7 +236,7 @@ abstract class AbstractDoctrineExtension extends Extension
if (!in_array($mappingConfig['type'], array('xml', 'yml', 'annotation', 'php', 'staticphp'))) {
throw new \InvalidArgumentException("Can only configure 'xml', 'yml', 'annotation', 'php' or ".
"'static-php' through the DoctrineBundle. Use your own bundle to configure other metadata drivers. " .
"'staticphp' through the DoctrineBundle. Use your own bundle to configure other metadata drivers. " .
"You can register them by adding a a new driver to the ".
"'" . $this->getObjectManagerElementName($objectManagerName . ".metadata_driver")."' service definition."
);