From c33f79dc399221526c337b2fe368a59ed5fe51e7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Dec 2020 12:27:39 +0100 Subject: backport 1 fix for PHP 8 --- php-symfony4-php8.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 php-symfony4-php8.patch (limited to 'php-symfony4-php8.patch') diff --git a/php-symfony4-php8.patch b/php-symfony4-php8.patch new file mode 100644 index 0000000..460a2d8 --- /dev/null +++ b/php-symfony4-php8.patch @@ -0,0 +1,21 @@ +Adapted for 4.1 from + +From a3275a7be9e91858aa1dd8429b52cdd34f726e10 Mon Sep 17 00:00:00 2001 +From: Nicolas Grekas +Date: Mon, 7 Sep 2020 14:07:49 +0200 +Subject: [PATCH] [DI] fix ContainerBuilder on PHP8 + + +diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +index d9115bf8bfcc..97617cb04ef2 100644 +--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php ++++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +@@ -1132,7 +1132,7 @@ class ContainerBuilder extends Container + } else { + $r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass())); + +- $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments); ++ $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs(array_values($arguments)); + + if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) { + @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), E_USER_DEPRECATED); -- cgit