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

[DoctrineBridge] Fixed #14840

Browse Source
This commit is contained in:
Kirill Saksin 2015-06-03 00:50:45 +03:00 committed by Fabien Potencier
parent 5607f71079
commit 92ad5df567
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
View File

@ -129,11 +129,15 @@ abstract class AbstractDoctrineExtension extends Extension
*/ */
protected function setMappingDriverConfig(array $mappingConfig, $mappingName) protected function setMappingDriverConfig(array $mappingConfig, $mappingName)
{ {
if (!is_dir($mappingConfig['dir'])) { $mappingDirectory = $mappingConfig['dir'];
if (!is_dir($mappingDirectory)) {
throw new \InvalidArgumentException(sprintf('Invalid Doctrine mapping path given. Cannot load Doctrine mapping/bundle named "%s".', $mappingName)); throw new \InvalidArgumentException(sprintf('Invalid Doctrine mapping path given. Cannot load Doctrine mapping/bundle named "%s".', $mappingName));
} }
$this->drivers[$mappingConfig['type']][$mappingConfig['prefix']] = realpath($mappingConfig['dir']); if (substr($mappingDirectory, 0, 7) !== 'phar://') {
$mappingDirectory = realpath($mappingDirectory);
}
$this->drivers[$mappingConfig['type']][$mappingConfig['prefix']] = $mappingDirectory;
} }
/** /**