Fix the retrieval of the default value for variadic arguments

stof · stof · commit 73c5eff44d77 · 2015-08-01T21:33:42.000+02:00
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -180,7 +180,7 @@ protected function addRoute(RouteCollection $collection, $annot, $globals, \Refl
 
         $defaults = array_replace($globals['defaults'], $annot->getDefaults());
         foreach ($method->getParameters() as $param) {
-            if (!isset($defaults[$param->getName()]) && $param->isOptional()) {
+            if (!isset($defaults[$param->getName()]) && $param->isDefaultValueAvailable()) {
                 $defaults[$param->getName()] = $param->getDefaultValue();
             }
         }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/OtherAnnotatedClasses/VariadicClass.php b/src/Symfony/Component/Routing/Tests/Fixtures/OtherAnnotatedClasses/VariadicClass.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses;
+namespace Symfony\Component\Routing\Tests\Fixtures\OtherAnnotatedClasses;
 
 class VariadicClass
 {
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
@@ -16,6 +16,7 @@
 class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
 {
     protected $loader;
+    private $reader;
 
     protected function setUp()
     {
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
@@ -40,12 +40,12 @@ public function testLoad()
      */
     public function testLoadVariadic()
     {
-        $route = new Route(["path" => "/path/to/{id}"]);
+        $route = new Route(array('path' => '/path/to/{id}'));
         $this->reader->expects($this->once())->method('getClassAnnotation');
         $this->reader->expects($this->once())->method('getMethodAnnotations')
-            ->will($this->returnValue([$route]));
+            ->will($this->returnValue(array($route)));
 
-        $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/VariadicClass.php');
+        $this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/VariadicClass.php');
     }
 
     public function testSupports()

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ protected function addRoute(RouteCollection $collection, $annot, $globals, \Refl`
`180`	`180`
`181`	`181`	`$defaults = array_replace($globals['defaults'], $annot->getDefaults());`
`182`	`182`	`foreach ($method->getParameters() as $param) {`
`183`		`- if (!isset($defaults[$param->getName()]) && $param->isOptional()) {`
	`183`	`+ if (!isset($defaults[$param->getName()]) && $param->isDefaultValueAvailable()) {`
`184`	`184`	`$defaults[$param->getName()] = $param->getDefaultValue();`
`185`	`185`	`}`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
`12`		`-namespace Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses;`
	`12`	`+namespace Symfony\Component\Routing\Tests\Fixtures\OtherAnnotatedClasses;`
`13`	`13`
`14`	`14`	`class VariadicClass`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest`
`17`	`17`	`{`
`18`	`18`	`protected $loader;`
	`19`	`+ private $reader;`
`19`	`20`
`20`	`21`	`protected function setUp()`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ public function testLoad()`
`40`	`40`	`*/`
`41`	`41`	`public function testLoadVariadic()`
`42`	`42`	`{`
`43`		`- $route = new Route(["path" => "/path/to/{id}"]);`
	`43`	`+ $route = new Route(array('path' => '/path/to/{id}'));`
`44`	`44`	`$this->reader->expects($this->once())->method('getClassAnnotation');`
`45`	`45`	`$this->reader->expects($this->once())->method('getMethodAnnotations')`
`46`		`- ->will($this->returnValue([$route]));`
	`46`	`+ ->will($this->returnValue(array($route)));`
`47`	`47`
`48`		`- $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/VariadicClass.php');`
	`48`	`+ $this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/VariadicClass.php');`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public function testSupports()`