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-25 17:52:07 +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 · 2016-07-30 03:20:35 -04:00
5 changed files with 9 additions and 9 deletions
--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -380,7 +380,7 @@ class ErrorHandler
     * @param int    $line
     * @param array  $context
     *
-     * @return bool Returns false when no handling happens so that the PHP engine can handle the error itself.
+     * @return bool Returns false when no handling happens so that the PHP engine can handle the error itself
     *
     * @throws \ErrorException When $this->thrownErrors requests so
     *
--- 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
@@ -96,7 +96,7 @@ class ExceptionHandler
     *
     * @param string $format The format for links to source files
     *
-     * @return string The previous file link format.
+     * @return string The previous file link format
     */
    public function setFileLinkFormat($format)
    {
@@ -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;
--- a/Tests/DebugClassLoaderTest.php
+++ b/Tests/DebugClassLoaderTest.php
@@ -13,12 +13,11 @@ 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
 {
    /**
-     * @var int Error reporting level before running tests.
+     * @var int Error reporting level before running tests
     */
    private $errorReporting;

--- a/Tests/MockExceptionHandler.php
+++ b/Tests/MockExceptionHandler.php
@@ -13,7 +13,7 @@ namespace Symfony\Component\Debug\Tests;

 use Symfony\Component\Debug\ExceptionHandler;

-class MockExceptionHandler extends Exceptionhandler
+class MockExceptionHandler extends ExceptionHandler
 {
    public $e;
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
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
Nicolas Grekas	bec6ab977e	Merge branch '2.7' into 2.8 * 2.7: [Console] Application update PHPDoc of add and register methods [Config] Extra tests for Config component Fixed bugs in names of classes and methods. [DoctrineBridge] Fixed php doc [FrameworkBundle] Fixed parameters number mismatch declaration [BrowserKit] Added test for followRedirect method (POST method) Fix the money form type render with Bootstrap3 [BrowserKit] Uppercase the "GET" method in redirects [WebProfilerBundle] Fixed JSDoc parameter definition [HttpFoundation] HttpCache refresh stale responses containing an ETag Conflicts: src/Symfony/Component/BrowserKit/Tests/ClientTest.php src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php	2016-07-26 10:02:44 +02:00
Vyacheslav Pavlov	13ebf897a8	Fixed bugs in names of classes and methods.	2016-07-26 06:40:54 +02:00
Fabien Potencier	2477199ad1	Merge branch '2.7' into 2.8 * 2.7: removed dots at the end of @param and @return fixed typo	2016-06-29 07:29:29 +02:00
Fabien Potencier	d9e18587ad	removed dots at the end of @param and @return	2016-06-28 08:24:06 +02:00