Merge branch '4.1' into 4.2

* 4.1:
  [Workflow] Fixed BC break for Workflow metadata
  [Routing] ignore trailing slash for non-GET requests

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -547,7 +547,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                     }
                     if ($transition['metadata']) {
                         $transitionsMetadataDefinition->addMethodCall('attach', array(
-                            $transitionDefinition,
+                            new Reference($transitionId),
                             $transition['metadata'],
                         ));
                     }
@@ -569,7 +569,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                             }
                             if ($transition['metadata']) {
                                 $transitionsMetadataDefinition->addMethodCall('attach', array(
-                                    $transitionDefinition,
+                                    new Reference($transitionId),
                                     $transition['metadata'],
                                 ));
                             }

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -258,10 +258,8 @@ public function testWorkflows()
         $this->assertSame('attach', $transitionsMetadataCall[0]);
         $params = $transitionsMetadataCall[1];
         $this->assertCount(2, $params);
-        $this->assertInstanceOf(Definition::class, $params[0]);
-        $this->assertSame(Workflow\Transition::class, $params[0]->getClass());
-        $this->assertSame(array('submit', 'start', 'travis'), $params[0]->getArguments());
-        $this->assertSame(array('title' => 'transition submit title'), $params[1]);
+        $this->assertInstanceOf(Reference::class, $params[0]);
+        $this->assertSame('state_machine.pull_request.transition.0', (string) $params[0]);
 
         $serviceMarkingStoreWorkflowDefinition = $container->getDefinition('workflow.service_marking_store_workflow');
         /** @var Reference $markingStoreRef */