Skip to content

Commit e6813dd

Browse files
Merge branch '2.3' into 2.7
* 2.3: [HttpFoundation] Fix transient test [HttpFoundation] Add a dependency on the mbstring polyfill add readme files where missing Don't use reflections when possible [Form] Update form tests after the ICU data update [Intl] Update tests and the number formatter to match behaviour of the intl extension [Intl] Update the ICU data to version 55 [Intl] Fix the update-data.php script in preparation for ICU 5.5 Use constant instead of function call. fixed test name automatically generate safe fallback filename Conflicts: src/Symfony/Component/Debug/Debug.php src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
2 parents e20253c + c4aa19f commit e6813dd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

DataCollector/ConfigDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function collect(Request $request, Response $response, \Exception $except
7575
'wincache_enabled' => extension_loaded('wincache') && ini_get('wincache.ocenabled'),
7676
'zend_opcache_enabled' => extension_loaded('Zend OPcache') && ini_get('opcache.enable'),
7777
'bundles' => array(),
78-
'sapi_name' => php_sapi_name(),
78+
'sapi_name' => PHP_SAPI,
7979
);
8080

8181
if (isset($this->kernel)) {

0 commit comments

Comments
 (0)