Skip to content

Commit 6b666e9

Browse files
Merge branch '5.1' into 5.2
* 5.1: 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 propagate groups to nested constraints
2 parents 3eed4e0 + 2fe1ae8 commit 6b666e9

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

Loader/XmlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ private function getArgumentsAsPhp(\DOMElement $node, string $name, string $file
478478
break;
479479
case 'expression':
480480
if (!class_exists(Expression::class)) {
481-
throw new \LogicException(sprintf('The type="expression" attribute cannot be used without the ExpressionLanguage component. Try running "composer require symfony/expression-language".'));
481+
throw new \LogicException('The type="expression" attribute cannot be used without the ExpressionLanguage component. Try running "composer require symfony/expression-language".');
482482
}
483483

484484
$arguments[$key] = new Expression($arg->nodeValue);

Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ private function resolveServices($value, string $file, bool $isParameter = false
868868
}
869869
} elseif (\is_string($value) && 0 === strpos($value, '@=')) {
870870
if (!class_exists(Expression::class)) {
871-
throw new \LogicException(sprintf('The "@=" expression syntax cannot be used without the ExpressionLanguage component. Try running "composer require symfony/expression-language".'));
871+
throw new \LogicException('The "@=" expression syntax cannot be used without the ExpressionLanguage component. Try running "composer require symfony/expression-language".');
872872
}
873873

874874
return new Expression(substr($value, 2));

Tests/Fixtures/CheckTypeDeclarationsPass/Foo.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static function createBarArguments(\stdClass $stdClass, \stdClass $stdCla
1616

1717
public static function createCallable(): callable
1818
{
19-
return function() {};
19+
return function () {};
2020
}
2121

2222
public static function createArray(): array

Tests/Fixtures/FactoryDummy.php

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

1414
class FactoryDummy extends FactoryParent
1515
{
16-
public static function createFactory(): FactoryDummy
16+
public static function createFactory(): self
1717
{
1818
}
1919

Tests/Fixtures/includes/MultipleArgumentsOptionalScalarNotReallyOptional.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ public function __construct(A $a, $foo = 'default_val', Lille $lille)
1111
{
1212
}
1313
}
14-

Tests/Fixtures/includes/autowiring_classes.php

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

55
use Psr\Log\LoggerInterface;
66

7-
if (PHP_VERSION_ID >= 80000) {
7+
if (\PHP_VERSION_ID >= 80000) {
88
require __DIR__.'/uniontype_classes.php';
99
require __DIR__.'/autowiring_classes_80.php';
1010
}
@@ -276,6 +276,7 @@ public function setFoo(Foo $foo)
276276

277277
/**
278278
* @required
279+
*
279280
* @return static
280281
*/
281282
public function withFoo1(Foo $foo): self
@@ -285,6 +286,7 @@ public function withFoo1(Foo $foo): self
285286

286287
/**
287288
* @required
289+
*
288290
* @return static
289291
*/
290292
public function withFoo2(Foo $foo): self

0 commit comments

Comments
 (0)