Skip to content

Commit 4b1f495

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: Cleanup CI scripts fix code style fix code style take query and request parameters into account when matching routes mistake fix tests to run assertions on returned Crawler instances
2 parents 1c6aa67 + 52c899a commit 4b1f495

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Tests/Console/Descriptor/AbstractDescriptorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ private function getEventDispatcherDescriptionTestData(array $objects)
302302
}
303303

304304
/** @dataProvider getDescribeContainerBuilderWithPriorityTagsTestData */
305-
public function testDescribeContainerBuilderWithPriorityTags(ContainerBuilder $builder, $expectedDescription, array $options): void
305+
public function testDescribeContainerBuilderWithPriorityTags(ContainerBuilder $builder, $expectedDescription, array $options)
306306
{
307307
$this->assertDescription($expectedDescription, $builder, $options);
308308
}

Tests/DependencyInjection/Fixtures/php/workflows.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
'initial_marking' => ['draft'],
1313
'metadata' => [
1414
'title' => 'article workflow',
15-
'description' => 'workflow for articles'
15+
'description' => 'workflow for articles',
1616
],
1717
'places' => [
1818
'draft',

Tests/Fixtures/ClassAliasExampleClass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class_alias(
66
ClassAliasTargetClass::class,
7-
__NAMESPACE__ . '\ClassAliasExampleClass'
7+
__NAMESPACE__.'\ClassAliasExampleClass'
88
);
99

1010
if (false) {

Tests/Fixtures/Validation/Category.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
class Category
88
{
9-
const NAME_PATTERN = '/\w+/';
9+
public const NAME_PATTERN = '/\w+/';
1010

1111
public $id;
1212

0 commit comments

Comments
 (0)