Skip to content

Commit bf92f96

Browse files
Merge branch '4.2'
* 4.2: [VarExporter] fix dumping private properties from abstract classes Fix empty output for debug:autowiring when reflection-docblock is not available [Workflow] Fixed BC break for Workflow metadata [Routing] ignore trailing slash for non-GET requests
2 parents eb6010e + bd3b5b0 commit bf92f96

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

Console/Descriptor/Descriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ protected function sortServiceIds(array $serviceIds)
292292
*/
293293
public static function getClassDescription(string $class, string &$resolvedClass = null): string
294294
{
295-
$resolvedClass = null;
295+
$resolvedClass = $class;
296296

297297
if (!interface_exists(DocBlockFactoryInterface::class)) {
298298
return '';

DependencyInjection/FrameworkExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
547547
}
548548
if ($transition['metadata']) {
549549
$transitionsMetadataDefinition->addMethodCall('attach', array(
550-
$transitionDefinition,
550+
new Reference($transitionId),
551551
$transition['metadata'],
552552
));
553553
}
@@ -569,7 +569,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
569569
}
570570
if ($transition['metadata']) {
571571
$transitionsMetadataDefinition->addMethodCall('attach', array(
572-
$transitionDefinition,
572+
new Reference($transitionId),
573573
$transition['metadata'],
574574
));
575575
}

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,8 @@ public function testWorkflows()
258258
$this->assertSame('attach', $transitionsMetadataCall[0]);
259259
$params = $transitionsMetadataCall[1];
260260
$this->assertCount(2, $params);
261-
$this->assertInstanceOf(Definition::class, $params[0]);
262-
$this->assertSame(Workflow\Transition::class, $params[0]->getClass());
263-
$this->assertSame(array('submit', 'start', 'travis'), $params[0]->getArguments());
264-
$this->assertSame(array('title' => 'transition submit title'), $params[1]);
261+
$this->assertInstanceOf(Reference::class, $params[0]);
262+
$this->assertSame('state_machine.pull_request.transition.0', (string) $params[0]);
265263

266264
$serviceMarkingStoreWorkflowDefinition = $container->getDefinition('workflow.service_marking_store_workflow');
267265
/** @var Reference $markingStoreRef */

0 commit comments

Comments
 (0)