Skip to content

Commit 4f5274e

Browse files
committed
Merge branch '2.5' into 2.6
* 2.5: [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 update required minimum TwigBridge version Very minor grammar fix in error message [Tests] Silenced all deprecations in tests for 2.3 BinaryFileResponse - add missing newline fixed CS add a limit and a test to FlattenExceptionTest. CS: There should be no empty lines following phpdocs [FrameworkBundle] fix cache:clear command [2.3] Docblocks should not be followed by a blank line Fix return phpdoc [PropertyAccess] Added test to verify #5775 is fixed
2 parents 367a394 + 80b6508 commit 4f5274e

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Kernel.php

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

587587
return array_merge(
588588
array(
589-
'kernel.root_dir' => $this->rootDir,
589+
'kernel.root_dir' => realpath($this->rootDir) ?: $this->rootDir,
590590
'kernel.environment' => $this->environment,
591591
'kernel.debug' => $this->debug,
592592
'kernel.name' => $this->name,
593-
'kernel.cache_dir' => $this->getCacheDir(),
594-
'kernel.logs_dir' => $this->getLogDir(),
593+
'kernel.cache_dir' => realpath($this->getCacheDir()) ?: $this->getCacheDir(),
594+
'kernel.logs_dir' => realpath($this->getLogDir()) ?: $this->getLogDir(),
595595
'kernel.bundles' => $bundles,
596596
'kernel.charset' => $this->getCharset(),
597597
'kernel.container_class' => $this->getContainerClass(),

phpunit.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
colors="true"
77
bootstrap="vendor/autoload.php"
88
>
9+
<php>
10+
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11+
<ini name="error_reporting" value="-16385"/>
12+
</php>
913
<testsuites>
1014
<testsuite name="Symfony HttpKernel Component Test Suite">
1115
<directory>./Tests/</directory>

0 commit comments

Comments
 (0)