bug #20756 [3.1][HttpKernel] Regression test for missing controller arguments (iltar)

fabpot · fabpot · commit 68d5e0dcb14d · 2016-12-05T09:35:42.000+01:00
This PR was merged into the 3.1 branch. Discussion ---------- [3.1][HttpKernel] Regression test for missing controller arguments | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #20746 | License | MIT | Doc PR | ~ Same fix as #20755 but for 3.1 and up as the new feature was hit by the same bug. ping @fabpot Commits ------- 9e588b8 Regression test for missing controller arguments (3.1)
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DefaultValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DefaultValueResolver.php
@@ -27,7 +27,7 @@ final class DefaultValueResolver implements ArgumentValueResolverInterface
      */
     public function supports(Request $request, ArgumentMetadata $argument)
     {
-        return $argument->hasDefaultValue() || ($argument->isNullable() && !$argument->isVariadic());
+        return $argument->hasDefaultValue() || (null !== $argument->getType() && $argument->isNullable() && !$argument->isVariadic());
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
@@ -203,6 +203,17 @@ public function testGetArgumentWithoutArray()
         $resolver->getArguments($request, $controller);
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
+    public function testIfExceptionIsThrownWhenMissingAnArgument()
+    {
+        $request = Request::create('/');
+        $controller = array($this, 'controllerWithFoo');
+
+        self::$resolver->getArguments($request, $controller);
+    }
+
     /**
      * @requires PHP 7.1
      */

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ final class DefaultValueResolver implements ArgumentValueResolverInterface`
`27`	`27`	`*/`
`28`	`28`	`public function supports(Request $request, ArgumentMetadata $argument)`
`29`	`29`	`{`
`30`		`- return $argument->hasDefaultValue() \|\| ($argument->isNullable() && !$argument->isVariadic());`
	`30`	`+ return $argument->hasDefaultValue() \|\| (null !== $argument->getType() && $argument->isNullable() && !$argument->isVariadic());`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`