diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '5.0' into 5.1 

* 5.0:
  [DI] fix
  Use "composer/package-versions-deprecated" when possible
  Fix
This commit is contained in:
Nicolas Grekas 2020-06-18 21:54:27 +02:00
parent 01b5b8312b f3d9cfe8db
commit eea6abf318
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -107,6 +107,7 @@
"async-aws/ses": "^1.0", "async-aws/ses": "^1.0",
"async-aws/sqs": "^1.0", "async-aws/sqs": "^1.0",
"cache/integration-tests": "dev-master", "cache/integration-tests": "dev-master",
"composer/package-versions-deprecated": "^1.8",
"doctrine/annotations": "~1.0", "doctrine/annotations": "~1.0",
"doctrine/cache": "~1.6", "doctrine/cache": "~1.6",
"doctrine/collections": "~1.0", "doctrine/collections": "~1.0",

1
src/Symfony/Bridge/Doctrine/composer.json
View File

@ -25,6 +25,7 @@
"symfony/service-contracts": "^1.1|^2" "symfony/service-contracts": "^1.1|^2"
}, },
"require-dev": { "require-dev": {
"composer/package-versions-deprecated": "^1.8",
"symfony/stopwatch": "^4.4|^5.0", "symfony/stopwatch": "^4.4|^5.0",
"symfony/cache": "^5.1", "symfony/cache": "^5.1",
"symfony/config": "^4.4|^5.0", "symfony/config": "^4.4|^5.0",

3
src/Symfony/Component/DependencyInjection/Exception/InvalidParameterTypeException.php
View File

@ -23,7 +23,8 @@ class InvalidParameterTypeException extends InvalidArgumentException
{ {
$acceptedType = $parameter->getType(); $acceptedType = $parameter->getType();
$acceptedType = $acceptedType instanceof \ReflectionNamedType ? $acceptedType->getName() : (string) $acceptedType; $acceptedType = $acceptedType instanceof \ReflectionNamedType ? $acceptedType->getName() : (string) $acceptedType;
$this->code = $type;
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); 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));
} }
} }

4
src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
View File

@ -45,10 +45,10 @@ final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface
*/ */
private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function): ?string private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function): ?string
{ {
if (!($type = $parameter->getType()) instanceof \ReflectionNamedType) { if (!$type = $parameter->getType()) {
return null; return null;
} }
$name = $type->getName(); $name = $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
if ($function instanceof \ReflectionMethod) { if ($function instanceof \ReflectionMethod) {
$lcName = strtolower($name); $lcName = strtolower($name);

1
src/Symfony/Contracts/composer.json
View File

@ -47,6 +47,7 @@
] ]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"version": "2.99",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.1-dev" "dev-master": "2.1-dev"