bug #30992 [TwigBridge][DependencyInjection] ignore null arguments (xabbuh)

fabpot · fabpot · commit 02e865b29800 · 2019-04-08T07:15:29.000+02:00
This PR was merged into the 4.3-dev branch. Discussion ---------- [TwigBridge][DependencyInjection] ignore null arguments | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 44eb7a0 fix backwards compatibility breaks
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
@@ -47,7 +47,7 @@ public function __construct($urlHelper)
         $requestContext = null;
         if (2 === \func_num_args()) {
             $requestContext = \func_get_arg(1);
-            if (!$requestContext instanceof RequestContext) {
+            if (null !== $requestContext && !$requestContext instanceof RequestContext) {
                 throw new \TypeError(sprintf('The second argument must be an instance of "%s".', RequestContext::class));
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php b/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php
@@ -53,6 +53,10 @@ public function getValues()
      */
     public function setValues(array $values)
     {
-        list($this->value, $this->identifier, $this->used, $this->type, $this->file) = $values;
+        if (5 === count($values)) {
+            list($this->value, $this->identifier, $this->used, $this->type, $this->file) = $values;
+        } else {
+            list($this->value, $this->identifier, $this->used) = $values;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct($urlHelper)`
`47`	`47`	`$requestContext = null;`
`48`	`48`	`if (2 === \func_num_args()) {`
`49`	`49`	`$requestContext = \func_get_arg(1);`
`50`		`- if (!$requestContext instanceof RequestContext) {`
	`50`	`+ if (null !== $requestContext && !$requestContext instanceof RequestContext) {`
`51`	`51`	`throw new \TypeError(sprintf('The second argument must be an instance of "%s".', RequestContext::class));`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ public function getValues()`
`53`	`53`	`*/`
`54`	`54`	`public function setValues(array $values)`
`55`	`55`	`{`
`56`		`- list($this->value, $this->identifier, $this->used, $this->type, $this->file) = $values;`
	`56`	`+ if (5 === count($values)) {`
	`57`	`+ list($this->value, $this->identifier, $this->used, $this->type, $this->file) = $values;`
	`58`	`+ } else {`
	`59`	`+ list($this->value, $this->identifier, $this->used) = $values;`
	`60`	`+ }`
`57`	`61`	`}`
`58`	`62`	`}`