Skip to content

Commit 217b4fb

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 67cb02d + 4e56817 commit 217b4fb

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Resources/translations/validators.ca.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
</trans-unit>
333333
<trans-unit id="86">
334334
<source>This value should be valid JSON.</source>
335-
<target>Aquest valor hauria de ser JSON vàlid.</target>
335+
<target>Aquest valor hauria de ser un JSON vàlid.</target>
336336
</trans-unit>
337337
<trans-unit id="87">
338338
<source>This collection should contain only unique elements.</source>

Tests/Fixtures/PropertyGetter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* This class has two paths to PropertyGetterInterface:
77
* PropertyGetterInterface <- AbstractPropertyGetter <- PropertyGetter
8-
* PropertyGetterInterface <- ChildGetterInterface <- PropertyGetter
8+
* PropertyGetterInterface <- ChildGetterInterface <- PropertyGetter.
99
*/
1010
class PropertyGetter extends AbstractPropertyGetter implements ChildGetterInterface
1111
{

0 commit comments

Comments
 (0)