Skip to content

Commit e6d6233

Browse files
Merge branch '2.8' into 3.1
* 2.8: Compatibility with Twig 1.27 [VarDumper] Fix dumping Twig source in stack traces Enhance GAE compat by removing some realpath() bumped Symfony version to 2.8.14 updated VERSION for 2.8.13 updated CHANGELOG for 2.8.13 bumped Symfony version to 2.7.21 updated VERSION for 2.7.20 update CONTRIBUTORS for 2.7.20 updated CHANGELOG for 2.7.20 [SecurityBundle] Fix twig-bridge lowest dep
2 parents 210b9f6 + c36647f commit e6d6233

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,7 @@ protected function setMappingDriverConfig(array $mappingConfig, $mappingName)
134134
throw new \InvalidArgumentException(sprintf('Invalid Doctrine mapping path given. Cannot load Doctrine mapping/bundle named "%s".', $mappingName));
135135
}
136136

137-
if (substr($mappingDirectory, 0, 7) !== 'phar://') {
138-
$mappingDirectory = realpath($mappingDirectory);
139-
}
140-
$this->drivers[$mappingConfig['type']][$mappingConfig['prefix']] = $mappingDirectory;
137+
$this->drivers[$mappingConfig['type']][$mappingConfig['prefix']] = realpath($mappingDirectory) ?: $mappingDirectory;
141138
}
142139

143140
/**

DependencyInjection/CompilerPass/DoctrineValidationPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private function updateValidatorMappingFiles(ContainerBuilder $container, $mappi
6161
foreach ($container->getParameter('kernel.bundles') as $bundle) {
6262
$reflection = new \ReflectionClass($bundle);
6363
if (is_file($file = dirname($reflection->getFileName()).'/'.$validationPath)) {
64-
$files[] = realpath($file);
64+
$files[] = $file;
6565
$container->addResource(new FileResource($file));
6666
}
6767
}

0 commit comments

Comments
 (0)