Merge branch '3.3' into 3.4

* 3.3:
  Tweaking class not found autowiring error
  [TwigBridge] Add missing dev requirement for workflow
  fixed #25440
  empty lines don't count for indent detection

Author: fabpot

Tests/Extension/WorkflowExtensionTest.php

@@ -25,10 +25,6 @@ class WorkflowExtensionTest extends TestCase
 
     protected function setUp()
     {
-        if (!class_exists(Workflow::class)) {
-            $this->markTestSkipped('The Workflow component is needed to run tests for this extension.');
-        }
-
         $places = array('ordered', 'waiting_for_payment', 'processed');
         $transitions = array(
             new Transition('t1', 'ordered', 'waiting_for_payment'),

composer.json

@@ -20,7 +20,6 @@
         "twig/twig": "^1.35|^2.4.4"
     },
     "require-dev": {
-        "fig/link-util": "^1.0",
         "symfony/asset": "~2.8|~3.0|~4.0",
         "symfony/dependency-injection": "~2.8|~3.0|~4.0",
         "symfony/finder": "~2.8|~3.0|~4.0",
@@ -38,7 +37,8 @@
         "symfony/console": "~3.4|~4.0",
         "symfony/var-dumper": "~2.8.10|~3.1.4|~3.2|~4.0",
         "symfony/expression-language": "~2.8|~3.0|~4.0",
-        "symfony/web-link": "~3.3|~4.0"
+        "symfony/web-link": "~3.3|~4.0",
+        "symfony/workflow": "~3.3|~4.0"
     },
     "conflict": {
         "symfony/form": "<3.4",