Merge branch '3.0' into 3.1

* 3.0: fixed CS fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 removed dots at the end of @param and @return fixed typo
Merge branch '2.8' into 3.0
2026-04-28 19:53:14 +02:00 · 2016-06-29 07:41:56 +02:00 · 2016-06-29 07:40:00 +02:00 · 2016-06-29 07:29:29 +02:00 · 2016-06-28 08:24:06 +02:00 · 2016-06-06 17:08:54 +02:00
4 changed files with 6 additions and 4 deletions
@@ -353,7 +353,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
     *
@@ -580,6 +580,8 @@ class ErrorHandler
            }
        } catch (\Exception $exception) {
            // Handled below
+        } catch (\Throwable $exception) {
+            // Handled below
        }

        if ($error && $error['type'] &= E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR) {
@@ -84,7 +84,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)
    {
@@ -18,7 +18,7 @@ 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;

@@ -463,7 +463,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
        $handler->handleException($exception);

        $this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $args[0]);
-        $this->assertSame("Attempted to load class \"Foo\" from the global namespace.\nDid you forget a \"use\" statement?", $args[0]->getMessage());
+        $this->assertStringStartsWith("Attempted to load class \"Foo\" from the global namespace.\nDid you forget a \"use\" statement", $args[0]->getMessage());
    }

    public function testHandleFatalErrorOnHHVM()
Author	SHA1	Message	Date
Fabien Potencier	06e2d52e30	Merge branch '3.0' into 3.1 * 3.0: fixed CS fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 removed dots at the end of @param and @return fixed typo	2016-06-29 07:41:56 +02:00
Fabien Potencier	c54bc3539c	Merge branch '2.8' into 3.0 * 2.8: fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 removed dots at the end of @param and @return fixed typo	2016-06-29 07:40:00 +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
Fabien Potencier	26786e21ee	Merge branch '3.0' into 3.1 * 3.0: [BrowserKit] Bump dom-crawler minimum version requirement Make one call to "OutputInterface::write" method per table row [HttpKernel] Fix context dependent test [Debug] Fix context dependent test	2016-06-06 17:08:54 +02:00
Fabien Potencier	e67e1552dd	Merge branch '2.8' into 3.0 * 2.8: [BrowserKit] Bump dom-crawler minimum version requirement Make one call to "OutputInterface::write" method per table row [HttpKernel] Fix context dependent test [Debug] Fix context dependent test	2016-06-06 17:08:35 +02:00
Fabien Potencier	c7d6d8a599	Merge branch '2.7' into 2.8 * 2.7: [BrowserKit] Bump dom-crawler minimum version requirement Make one call to "OutputInterface::write" method per table row [HttpKernel] Fix context dependent test [Debug] Fix context dependent test	2016-06-06 17:06:25 +02:00
Nicolas Grekas	00f654c530	[Debug] Fix context dependent test	2016-06-06 13:49:15 +02:00
Fabien Potencier	c9ed5a44db	Merge branch '3.0' into 3.1 * 3.0: [Yaml] fix exception contexts People - person singularization [Yaml] properly handle unindented collections [Serializer] Add test for ignored attributes during denormalization chomp newlines only at the end of YAML documents Fixed server status command when port has been omitted Update UPGRADE FROM 2.x to 3.0 fix removed commands wording in upgrade file Catch \Throwable Catch \Throwable [DependencyInjection] Avoid generating call_user_func in more cases [Validator] Support for DateTimeImmutable [FrameworkBundle] update upgrade instructions Use levenshtein level for better Bundle matching [WebProfilerBundle] Fix CORS ajax security issues remove methods that were needed for PHP 5.3 [DX][DI] Make Autowiring exceptions more future friendly	2016-05-24 12:06:56 +02:00
Fabien Potencier	d8e542d39b	Merge branch '2.8' into 3.0 * 2.8: [Yaml] fix exception contexts People - person singularization [Yaml] properly handle unindented collections [Serializer] Add test for ignored attributes during denormalization chomp newlines only at the end of YAML documents Fixed server status command when port has been omitted Update UPGRADE FROM 2.x to 3.0 fix removed commands wording in upgrade file Catch \Throwable Catch \Throwable Use levenshtein level for better Bundle matching [WebProfilerBundle] Fix CORS ajax security issues [DX][DI] Make Autowiring exceptions more future friendly	2016-05-24 12:03:10 +02:00
Fabien Potencier	2a1b327f5f	Merge branch '2.7' into 2.8 * 2.7: [Yaml] fix exception contexts People - person singularization [Yaml] properly handle unindented collections [Serializer] Add test for ignored attributes during denormalization chomp newlines only at the end of YAML documents Fixed server status command when port has been omitted Update UPGRADE FROM 2.x to 3.0 Catch \Throwable Use levenshtein level for better Bundle matching [WebProfilerBundle] Fix CORS ajax security issues	2016-05-24 12:00:02 +02:00
Filip Procházka	dfaa39d719	Catch \Throwable	2016-05-19 15:58:47 +02:00