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
[Debug][HttpKernel][VarDumper] Prepare for committed 7.2 changes
2026-03-24 17:22:13 +01:00 · 2016-08-23 15:37:31 +02:00 · 2016-08-22 19:42:59 +02:00 · 2016-08-19 08:48:01 +02:00 · 2016-08-18 21:55:40 +03:00
2 changed files with 5 additions and 4 deletions
--- a/Exception/FlattenException.php
+++ b/Exception/FlattenException.php
@@ -263,7 +263,10 @@ class FlattenException extends LegacyFlattenException
            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) {
@@ -277,9 +280,6 @@ class FlattenException extends LegacyFlattenException
                $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
@@ -342,6 +342,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;
Author	SHA1	Message	Date
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	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