Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit eea6abf

Browse filesBrowse files
Merge branch '5.0' into 5.1
* 5.0: [DI] fix Use "composer/package-versions-deprecated" when possible Fix
2 parents 01b5b83 + f3d9cfe commit eea6abf
Copy full SHA for eea6abf

File tree

Expand file treeCollapse file tree

5 files changed

+7
-3
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+7
-3
lines changed

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
"async-aws/ses": "^1.0",
108108
"async-aws/sqs": "^1.0",
109109
"cache/integration-tests": "dev-master",
110+
"composer/package-versions-deprecated": "^1.8",
110111
"doctrine/annotations": "~1.0",
111112
"doctrine/cache": "~1.6",
112113
"doctrine/collections": "~1.0",

‎src/Symfony/Bridge/Doctrine/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/composer.json
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"symfony/service-contracts": "^1.1|^2"
2626
},
2727
"require-dev": {
28+
"composer/package-versions-deprecated": "^1.8",
2829
"symfony/stopwatch": "^4.4|^5.0",
2930
"symfony/cache": "^5.1",
3031
"symfony/config": "^4.4|^5.0",

‎src/Symfony/Component/DependencyInjection/Exception/InvalidParameterTypeException.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Exception/InvalidParameterTypeException.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public function __construct(string $serviceId, string $type, \ReflectionParamete
2323
{
2424
$acceptedType = $parameter->getType();
2525
$acceptedType = $acceptedType instanceof \ReflectionNamedType ? $acceptedType->getName() : (string) $acceptedType;
26+
$this->code = $type;
2627

27-
parent::__construct(sprintf('Invalid definition for service "%s": argument %d of "%s::%s" accepts "%s", "%s" passed.', $serviceId, 1 + $parameter->getPosition(), $parameter->getDeclaringClass()->getName(), $parameter->getDeclaringFunction()->getName(), $acceptedType, $type), $type);
28+
parent::__construct(sprintf('Invalid definition for service "%s": argument %d of "%s::%s" accepts "%s", "%s" passed.', $serviceId, 1 + $parameter->getPosition(), $parameter->getDeclaringClass()->getName(), $parameter->getDeclaringFunction()->getName(), $acceptedType, $type));
2829
}
2930
}

‎src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public function createArgumentMetadata($controller): array
4545
*/
4646
private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function): ?string
4747
{
48-
if (!($type = $parameter->getType()) instanceof \ReflectionNamedType) {
48+
if (!$type = $parameter->getType()) {
4949
return null;
5050
}
51-
$name = $type->getName();
51+
$name = $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
5252

5353
if ($function instanceof \ReflectionMethod) {
5454
$lcName = strtolower($name);

‎src/Symfony/Contracts/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Contracts/composer.json
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
]
4848
},
4949
"minimum-stability": "dev",
50+
"version": "2.99",
5051
"extra": {
5152
"branch-alias": {
5253
"dev-master": "2.1-dev"

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.