Merge branch '6.4' into 7.0

* 6.4:
  Fix symfony/deprecation-contracts require
  [Console][Messenger] add `RunCommandMessage` and `RunCommandMessageHandler`
  Allow accessing all options on a handler descriptor
  [Notifier] [SpotHit] Support `smslong` and `smslongnbr` API parameters
  Remove 6.2 from the list of potential branch targets
  Bump Symfony version to 6.3.3
  Update VERSION for 6.3.2
  Update CHANGELOG for 6.3.2
  Bump Symfony version to 5.4.27
  Update VERSION for 5.4.26
  Update CONTRIBUTORS for 5.4.26
  Update CHANGELOG for 5.4.26
  Fix update slack messages documentation
  Fix symfony/deprecation-contracts require
  [Scheduler] Postpone schedule creation
  [VarDumper] Dump uninitialized properties
  [HttpKernel] Enhance exception if possible
  [Validator] Update `Type` constraint, add `number`, `finite-float` and `finite-number` validations

Author: nicolas-grekas

ErrorHandler.php

@@ -517,14 +517,7 @@ public function handleException(\Throwable $exception): void
             }
         }
 
-        if (!$exception instanceof OutOfMemoryError) {
-            foreach ($this->getErrorEnhancers() as $errorEnhancer) {
-                if ($e = $errorEnhancer->enhance($exception)) {
-                    $exception = $e;
-                    break;
-                }
-            }
-        }
+        $exception = $this->enhanceError($exception);
 
         $exceptionHandler = $this->exceptionHandler;
         $this->exceptionHandler = [$this, 'renderException'];
@@ -662,6 +655,21 @@ private function renderException(\Throwable $exception): void
         echo $exception->getAsString();
     }
 
+    public function enhanceError(\Throwable $exception): \Throwable
+    {
+        if ($exception instanceof OutOfMemoryError) {
+            return $exception;
+        }
+
+        foreach ($this->getErrorEnhancers() as $errorEnhancer) {
+            if ($e = $errorEnhancer->enhance($exception)) {
+                return $e;
+            }
+        }
+
+        return $exception;
+    }
+
     /**
      * Override this method if you want to define more error enhancers.
      *

Tests/ErrorHandlerTest.php

@@ -363,13 +363,14 @@ public function testHandleDeprecation()
     /**
      * @dataProvider handleExceptionProvider
      */
-    public function testHandleException(string $expectedMessage, \Throwable $exception)
+    public function testHandleException(string $expectedMessage, \Throwable $exception, string $enhancedMessage = null)
     {
         try {
             $logger = $this->createMock(LoggerInterface::class);
             $handler = ErrorHandler::register();
 
             $logArgCheck = function ($level, $message, $context) use ($expectedMessage, $exception) {
+                $this->assertSame('critical', $level);
                 $this->assertSame($expectedMessage, $message);
                 $this->assertArrayHasKey('exception', $context);
                 $this->assertInstanceOf($exception::class, $context['exception']);
@@ -388,11 +389,13 @@ public function testHandleException(string $expectedMessage, \Throwable $excepti
                 $handler->handleException($exception);
                 $this->fail('Exception expected');
             } catch (\Throwable $e) {
-                $this->assertSame($exception, $e);
+                $this->assertInstanceOf($exception::class, $e);
+                $this->assertSame($enhancedMessage ?? $exception->getMessage(), $e->getMessage());
             }
 
-            $handler->setExceptionHandler(function ($e) use ($exception) {
-                $this->assertSame($exception, $e);
+            $handler->setExceptionHandler(function ($e) use ($exception, $enhancedMessage) {
+                $this->assertInstanceOf($exception::class, $e);
+                $this->assertSame($enhancedMessage ?? $exception->getMessage(), $e->getMessage());
             });
 
             $handler->handleException($exception);
@@ -412,6 +415,11 @@ public static function handleExceptionProvider(): array
             })::class.' bar')],
             ['Uncaught Error: bar', new \Error('bar')],
             ['Uncaught ccc', new \ErrorException('ccc')],
+            [
+                'Uncaught Error: Class "App\Controller\ClassDoesNotExist" not found',
+                new \Error('Class "App\Controller\ClassDoesNotExist" not found'),
+                "Attempted to load class \"ClassDoesNotExist\" from namespace \"App\Controller\".\nDid you forget a \"use\" statement for another namespace?",
+            ],
         ];
     }