Merge branch '3.2'

* 3.2:
  [Yaml] CS
  [DI] Fix PhpDumper generated doc block
  #20411 fix Yaml parsing for very long quoted strings
  [Workflow] add Phpdoc for better IDE support
  fix package name in conflict rule
  improve message when workflows are missing
  [Doctrine Bridge] fix priority for doctrine event listeners
  Use PHP functions as array_map callbacks when possible
  [Validator] revert wrong Phpdoc change
  Use proper line endings

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -423,6 +423,10 @@ private function registerWorkflowConfiguration(array $workflows, ContainerBuilde
             return;
         }
 
+        if (!class_exists(Workflow\Workflow::class)) {
+            throw new LogicException('Workflow support cannot be enabled as the Workflow component is not installed.');
+        }
+
         $loader->load('workflow.xml');
 
         $registryDefinition = $container->getDefinition('workflow.registry');

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -419,7 +419,7 @@ public function testTranslator()
         $this->assertEquals('translator.default', (string) $container->getAlias('translator'), '->registerTranslatorConfiguration() redefines translator service from identity to real translator');
         $options = $container->getDefinition('translator.default')->getArgument(3);
 
-        $files = array_map(function ($resource) { return realpath($resource); }, $options['resource_files']['en']);
+        $files = array_map('realpath', $options['resource_files']['en']);
         $ref = new \ReflectionClass('Symfony\Component\Validator\Validation');
         $this->assertContains(
             strtr(dirname($ref->getFileName()).'/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),

composer.json

@@ -50,6 +50,7 @@
         "symfony/translation": "~3.2",
         "symfony/templating": "~2.8|~3.0",
         "symfony/validator": "~3.3",
+        "symfony/workflow": "~3.3",
         "symfony/yaml": "~3.2",
         "symfony/property-info": "~3.3",
         "doctrine/annotations": "~1.0",
@@ -66,7 +67,7 @@
         "symfony/form": "<3.3",
         "symfony/property-info": "<3.3",
         "symfony/serializer": "<3.3",
-        "symfony/translations": "<3.2",
+        "symfony/translation": "<3.2",
         "symfony/validator": "<3.3",
         "symfony/workflow": "<3.3"
     },