Skip to content

Commit 35ebc60

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: (23 commits) [Config] adds missing « use » statement for InvalidTypeException type hint in documentation. [Config] fixes broken unit test on ArrayNode class. fixed CS [Security] Delete old session on auth strategy migrate skip if param "translator.logging" doesn't exist. update required minimum TwigBridge version Very minor grammar fix in error message Added the function providers as container resources [Tests] Silenced all deprecations in tests for 2.3 BinaryFileResponse - add missing newline fixed CS add a limit and a test to FlattenExceptionTest. [DebugBundle] enable the DumpDataCollectorPass [FrameworkBundle] Use debug namespace. [FrameworkBundle] update debug commands references skip compiler pass if interface doesn't exist Unify the way to provide expression functions for the DI container CS: There should be no empty lines following phpdocs fix link format handling with disabled templating [FrameworkBundle] fix cache:clear command ... Conflicts: src/Symfony/Bridge/Doctrine/phpunit.xml.dist src/Symfony/Bridge/Monolog/phpunit.xml.dist src/Symfony/Bridge/Propel1/phpunit.xml.dist src/Symfony/Bridge/ProxyManager/phpunit.xml.dist src/Symfony/Bridge/Twig/phpunit.xml.dist src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist src/Symfony/Bundle/TwigBundle/phpunit.xml.dist src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist src/Symfony/Component/BrowserKit/phpunit.xml.dist src/Symfony/Component/ClassLoader/phpunit.xml.dist src/Symfony/Component/Config/phpunit.xml.dist src/Symfony/Component/Console/phpunit.xml.dist src/Symfony/Component/CssSelector/phpunit.xml.dist src/Symfony/Component/Debug/phpunit.xml.dist src/Symfony/Component/DependencyInjection/phpunit.xml.dist src/Symfony/Component/DomCrawler/phpunit.xml.dist src/Symfony/Component/EventDispatcher/phpunit.xml.dist src/Symfony/Component/Filesystem/phpunit.xml.dist src/Symfony/Component/Finder/phpunit.xml.dist src/Symfony/Component/Form/phpunit.xml.dist src/Symfony/Component/HttpFoundation/phpunit.xml.dist src/Symfony/Component/HttpKernel/phpunit.xml.dist src/Symfony/Component/Intl/phpunit.xml.dist src/Symfony/Component/Locale/phpunit.xml.dist src/Symfony/Component/OptionsResolver/phpunit.xml.dist src/Symfony/Component/Process/phpunit.xml.dist src/Symfony/Component/PropertyAccess/phpunit.xml.dist src/Symfony/Component/Routing/phpunit.xml.dist src/Symfony/Component/Security/phpunit.xml.dist src/Symfony/Component/Serializer/phpunit.xml.dist src/Symfony/Component/Stopwatch/phpunit.xml.dist src/Symfony/Component/Templating/phpunit.xml.dist src/Symfony/Component/Translation/phpunit.xml.dist src/Symfony/Component/Validator/phpunit.xml.dist src/Symfony/Component/Yaml/phpunit.xml.dist
2 parents 652d822 + 4f5274e commit 35ebc60

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Kernel.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -594,12 +594,12 @@ protected function getKernelParameters()
594594

595595
return array_merge(
596596
array(
597-
'kernel.root_dir' => $this->rootDir,
597+
'kernel.root_dir' => realpath($this->rootDir) ?: $this->rootDir,
598598
'kernel.environment' => $this->environment,
599599
'kernel.debug' => $this->debug,
600600
'kernel.name' => $this->name,
601-
'kernel.cache_dir' => $this->getCacheDir(),
602-
'kernel.logs_dir' => $this->getLogDir(),
601+
'kernel.cache_dir' => realpath($this->getCacheDir()) ?: $this->getCacheDir(),
602+
'kernel.logs_dir' => realpath($this->getLogDir()) ?: $this->getLogDir(),
603603
'kernel.bundles' => $bundles,
604604
'kernel.charset' => $this->getCharset(),
605605
'kernel.container_class' => $this->getContainerClass(),

0 commit comments

Comments
 (0)