Merge branch '2.7' into 2.8

* 2.7: Increase the inlining YAML level for config:debug [Serializer] Minor: fix CS and PHPDoc [Form] fix tests [Serializer] Ensure that groups are strings [Debug] Tell that the extension is for PHP 5 only Static code analysis Update AnnotationDirectoryLoader.php added a test Escape the delimiter in Glob::toRegex [FrameworkBundle] Fix template location for PHP templates [FrameworkBundle] Add path verification to the template parsing test cases
[Debug] Tell that the extension is for PHP 5 only
2026-03-25 09:42:20 +01:00 · 2016-01-27 06:14:19 +01:00 · 2016-01-26 00:34:19 +01:00 · 2016-01-25 17:29:20 +01:00 · 2016-01-21 15:16:05 +03:00 · 2016-01-21 10:24:53 +01:00
4 changed files with 10 additions and 9 deletions
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -241,7 +241,7 @@ class DebugClassLoader
                $i = count($tail) - 1;
                $j = count($real) - 1;

-                 while (isset($tail[$i], $real[$j]) && $tail[$i] === $real[$j]) {
+                while (isset($tail[$i], $real[$j]) && $tail[$i] === $real[$j]) {
                    --$i;
                    --$j;
                }
--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -283,7 +283,7 @@ class ErrorHandler
    public function throwAt($levels, $replace = false)
    {
        $prev = $this->thrownErrors;
-        $this->thrownErrors = (E_ALL | E_STRICT) & ($levels | E_RECOVERABLE_ERROR | E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED;
+        $this->thrownErrors = ($levels | E_RECOVERABLE_ERROR | E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED;
        if (!$replace) {
            $this->thrownErrors |= $prev;
        }
--- a/Resources/ext/README.md
+++ b/Resources/ext/README.md
@@ -1,7 +1,9 @@
-Symfony Debug Extension
-=======================
+Symfony Debug Extension for PHP 5
+=================================

 This extension publishes several functions to help building powerful debugging tools.
+It is compatible with PHP 5.3, 5.4, 5.5 and 5.6; with ZTS and non-ZTS modes.
+It is not required thus not provided for PHP 7.

 symfony_zval_info()
 -------------------
@@ -122,7 +124,6 @@ array(3) {
 Usage
 -----

-The extension is compatible with ZTS mode, and should be supported by PHP5.3, 5.4, 5.5 and 5.6.
 To enable the extension from source, run:

 ```
--- a/Tests/DebugClassLoaderTest.php
+++ b/Tests/DebugClassLoaderTest.php
@@ -175,7 +175,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
     */
    public function testDeprecatedSuper($class, $super, $type)
    {
-        set_error_handler(function() { return false; });
+        set_error_handler(function () { return false; });
        $e = error_reporting(0);
        trigger_error('', E_USER_DEPRECATED);

@@ -205,7 +205,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase

    public function testInterfaceExtendsDeprecatedInterface()
    {
-        set_error_handler(function() { return false; });
+        set_error_handler(function () { return false; });
        $e = error_reporting(0);
        trigger_error('', E_USER_NOTICE);

@@ -227,7 +227,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase

    public function testDeprecatedSuperInSameNamespace()
    {
-        set_error_handler(function() { return false; });
+        set_error_handler(function () { return false; });
        $e = error_reporting(0);
        trigger_error('', E_USER_NOTICE);

@@ -253,7 +253,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
            $this->markTestSkipped('PHP7 already prevents using reserved names.');
        }

-        set_error_handler(function() { return false; });
+        set_error_handler(function () { return false; });
        $e = error_reporting(0);
        trigger_error('', E_USER_NOTICE);
Author	SHA1	Message	Date
Fabien Potencier	8e255a0c55	Merge branch '2.7' into 2.8 * 2.7: Increase the inlining YAML level for config:debug [Serializer] Minor: fix CS and PHPDoc [Form] fix tests [Serializer] Ensure that groups are strings [Debug] Tell that the extension is for PHP 5 only Static code analysis Update AnnotationDirectoryLoader.php added a test Escape the delimiter in Glob::toRegex [FrameworkBundle] Fix template location for PHP templates [FrameworkBundle] Add path verification to the template parsing test cases	2016-01-27 06:14:19 +01:00
Nicolas Grekas	e96f1ff28e	[Debug] Tell that the extension is for PHP 5 only	2016-01-26 00:34:19 +01:00
Fabien Potencier	574f6fed54	Merge branch '2.7' into 2.8 * 2.7: fixed undefined variable Fixed the phpDoc of UserInterface fixed APCu dep version make apc class loader testable against apcu without apc bc layer Added support for the `0.0.0.0/0` trusted proxy [DoctrineBridge][Validator] >= 2.3 Pass association instead of ID as argument added missing constant Added 451 status code Remove unnecessary code Allow absolute URLs to be displayed in the debug toolbar [ClassLoader] Use symfony/polyfill-apcu [HttpKernel] Lookup the response even if the lock was released after 2 seconds	2016-01-25 17:29:20 +01:00
Lebnik	ef9b1c139e	Remove unnecessary code ``` php > echo (E_ALL \| E_STRICT) & (0 \| E_RECOVERABLE_ERROR \| E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED; 4352 php > echo (0 \| E_RECOVERABLE_ERROR \| E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED; 4352 php > echo (2 \| E_RECOVERABLE_ERROR \| E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED; 4354 ```	2016-01-21 15:16:05 +03:00
Fabien Potencier	142588bc7e	fixed CS	2016-01-21 10:24:53 +01:00
Fabien Potencier	9878d595ce	Merge branch '2.7' into 2.8 * 2.7: fixed CS fixed test fixed CS Remove default match from AbstractConfigCommand::findExtension	2016-01-21 10:05:51 +01:00
Fabien Potencier	9044cdf657	fixed CS	2016-01-21 09:40:25 +01:00