Merge branch '6.4' into 7.0

* 6.4:
  [Scheduler] Save checkpoint in a finally block
  DX: re-apply concat_space
  [PhpUnitBridge] Allow setting the locale using SYMFONY_PHPUNIT_LOCALE env var
  [HttpKernel] Improve PHPDoc on `#[AsController]` attribute

Author: fabpot

Tests/Dumper/PlantUmlDumperTest.php

@@ -96,6 +96,6 @@ public function testDumpWorkflowWithSpacesInTheStateNamesAndDescription()
 
     private function getFixturePath($name, $transitionType): string
     {
-        return __DIR__ . '/../Fixtures/puml/' .$transitionType.'/'.$name.'.puml';
+        return __DIR__.'/../Fixtures/puml/'.$transitionType.'/'.$name.'.puml';
     }
 }