From 92ad5df5675393f5ddaf0b277b56894d45c0e87e Mon Sep 17 00:00:00 2001 From: Kirill Saksin Date: Wed, 3 Jun 2015 00:50:45 +0300 Subject: [PATCH] [DoctrineBridge] Fixed #14840 --- .../DependencyInjection/AbstractDoctrineExtension.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php index 1518361c79..7247bd5798 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php @@ -129,11 +129,15 @@ abstract class AbstractDoctrineExtension extends Extension */ 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)); } - $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; } /**