Merge branch '2.8' into 3.1

* 2.8: [ClassLoader] Fix tests [Debug][HttpKernel][VarDumper] Prepare for committed 7.2 changes [DependencyInjection] PhpDumper::isFrozen inconsistency [DI] Cleanup array_key_exists include dynamic services in list of alternatives [Debug] Swap dumper services at bootstrap
Merge branch '2.7' into 2.8
2026-03-25 09:42:20 +01:00 · 2016-08-23 15:39:15 +02:00 · 2016-08-23 15:37:31 +02:00 · 2016-08-22 19:42:59 +02:00 · 2016-08-19 08:48:39 +02:00 · 2016-08-19 08:48:01 +02:00
3 changed files with 5 additions and 5 deletions
--- a/Exception/FlattenException.php
+++ b/Exception/FlattenException.php
@@ -222,7 +222,10 @@ class FlattenException
            if (++$count > 1e4) {
                return array('array', '*SKIPPED over 10000 entries*');
            }
-            if (is_object($value)) {
+            if ($value instanceof \__PHP_Incomplete_Class) {
+                // is_object() returns false on PHP<=7.1
+                $result[$key] = array('incomplete-object', $this->getClassNameFromIncomplete($value));
+            } elseif (is_object($value)) {
                $result[$key] = array('object', get_class($value));
            } elseif (is_array($value)) {
                if ($level > 10) {
@@ -236,9 +239,6 @@ class FlattenException
                $result[$key] = array('boolean', $value);
            } elseif (is_resource($value)) {
                $result[$key] = array('resource', get_resource_type($value));
-            } elseif ($value instanceof \__PHP_Incomplete_Class) {
-                // Special case of object, is_object will return false
-                $result[$key] = array('incomplete-object', $this->getClassNameFromIncomplete($value));
            } else {
                $result[$key] = array('string', (string) $value);
            }
--- a/ExceptionHandler.php
+++ b/ExceptionHandler.php
@@ -299,6 +299,7 @@ EOF;
                border-bottom:1px solid #ccc;
                border-right:1px solid #ccc;
                border-left:1px solid #ccc;
+                word-wrap: break-word;
            }
            .sf-reset .block_exception { background-color:#ddd; color: #333; padding:20px;
                -webkit-border-top-left-radius: 16px;
--- a/Tests/DebugClassLoaderTest.php
+++ b/Tests/DebugClassLoaderTest.php
@@ -13,7 +13,6 @@ namespace Symfony\Component\Debug\Tests;

 use Symfony\Component\Debug\DebugClassLoader;
 use Symfony\Component\Debug\ErrorHandler;
-use Symfony\Component\Debug\Exception\ContextErrorException;

 class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
Author	SHA1	Message	Date
Nicolas Grekas	34f6ac18c2	Merge branch '2.8' into 3.1 * 2.8: [ClassLoader] Fix tests [Debug][HttpKernel][VarDumper] Prepare for committed 7.2 changes [DependencyInjection] PhpDumper::isFrozen inconsistency [DI] Cleanup array_key_exists include dynamic services in list of alternatives [Debug] Swap dumper services at bootstrap	2016-08-23 15:39:15 +02:00
Nicolas Grekas	316b203b51	Merge branch '2.7' into 2.8 * 2.7: [ClassLoader] Fix tests [Debug][HttpKernel][VarDumper] Prepare for committed 7.2 changes [DependencyInjection] PhpDumper::isFrozen inconsistency [DI] Cleanup array_key_exists include dynamic services in list of alternatives [Debug] Swap dumper services at bootstrap	2016-08-23 15:37:31 +02:00
Nicolas Grekas	aec192ddd4	[Debug][HttpKernel][VarDumper] Prepare for committed 7.2 changes	2016-08-22 19:42:59 +02:00
Nicolas Grekas	053d5564e4	Merge branch '2.8' into 3.1 * 2.8: Disable CLI color for Windows 10 greater than 10.0.10586 Exception details break the layout [HttpKernel] Remove wrong docblock [HttpKernel] Fix HttpCache validation HTTP method Move space from the before 'if' to the after 'if' [TwigBundle] Add a check for choice's attributes emptiness before calling block('attributes')	2016-08-19 08:48:39 +02:00
Nicolas Grekas	6041920341	Merge branch '2.7' into 2.8 * 2.7: Disable CLI color for Windows 10 greater than 10.0.10586 Exception details break the layout [HttpKernel] Remove wrong docblock [HttpKernel] Fix HttpCache validation HTTP method Move space from the before 'if' to the after 'if' [TwigBundle] Add a check for choice's attributes emptiness before calling block('attributes')	2016-08-19 08:48:01 +02:00
Dionysis Arvanitis	a3a850315e	Exception details break the layout	2016-08-18 21:55:40 +03:00
Nicolas Grekas	ea4f0830c2	Merge branch '2.8' into 3.1 * 2.8: Relax 1 test failing with latest PHP versions bumped Symfony version to 2.8.10 Remove usage of __CLASS__ outside of a class [HttpKernel] Fix variable conflicting name [Process] Fix double-fread() when reading unix pipes [Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least) [Validator] Fix dockblock typehint in XmlFileLoader bumped Symfony version to 2.8.10 updated VERSION for 2.8.9 updated CHANGELOG for 2.8.9 bumped Symfony version to 2.7.17 updated VERSION for 2.7.16 update CONTRIBUTORS for 2.7.16 updated CHANGELOG for 2.7.16 Minor fixes [Console] Overcomplete argument exception message tweak. fixed bad auto merge Console table cleanup undefined offset fix (#19406) [EventDispatcher] Removed unused variable Conflicts: CHANGELOG-2.7.md CHANGELOG-3.0.md src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php src/Symfony/Component/Console/Tests/Helper/TableTest.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php src/Symfony/Component/HttpKernel/Kernel.php	2016-08-05 10:37:39 +02:00
Fabien Potencier	f7c5256f43	Merge branch '2.7' into 2.8 * 2.7: Minor fixes [Console] Overcomplete argument exception message tweak.	2016-07-30 03:20:35 -04:00
Vyacheslav Pavlov	31106b58d5	Minor fixes	2016-07-30 03:17:26 -04:00