Fixed symfony#14840

saksmt · saksmt · commit 40925d800d79 · 2015-06-03T00:50:07.000+03:00
Fixed bug with Phars, `realpath` and mapping driver config setter in `Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension`
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -129,11 +129,15 @@ protected function setMappingDriverAlias($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));
         }
 
-        $this->drivers[$mappingConfig['type']][$mappingConfig['prefix']] = realpath($mappingConfig['dir']);
+        if (strpos($mappingDirectory, 'phar://') === false) {
+            $mappingDirectory = realpath($mappingDirectory);
+        }
+        $this->drivers[$mappingConfig['type']][$mappingConfig['prefix']] = $mappingDirectory;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -129,11 +129,15 @@ protected function setMappingDriverAlias($mappingConfig, $mappingName)`
`129`	`129`	`*/`
`130`	`130`	`protected function setMappingDriverConfig(array $mappingConfig, $mappingName)`
`131`	`131`	`{`
`132`		`- if (!is_dir($mappingConfig['dir'])) {`
	`132`	`+ $mappingDirectory = $mappingConfig['dir'];`
	`133`	`+ if (!is_dir($mappingDirectory)) {`
`133`	`134`	`throw new \InvalidArgumentException(sprintf('Invalid Doctrine mapping path given. Cannot load Doctrine mapping/bundle named "%s".', $mappingName));`
`134`	`135`	`}`
`135`	`136`
`136`		`- $this->drivers[$mappingConfig['type']][$mappingConfig['prefix']] = realpath($mappingConfig['dir']);`
	`137`	`+ if (strpos($mappingDirectory, 'phar://') === false) {`
	`138`	`+ $mappingDirectory = realpath($mappingDirectory);`
	`139`	`+ }`
	`140`	`+ $this->drivers[$mappingConfig['type']][$mappingConfig['prefix']] = $mappingDirectory;`
`137`	`141`	`}`
`138`	`142`
`139`	`143`	`/**`