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

Fix the retrieval of the default value for variadic arguments

Browse Source
This commit is contained in:
Christophe Coevoet 2015-08-01 21:33:42 +02:00
parent 9b7d4c7613
commit 73c5eff44d
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
View File

@ -180,7 +180,7 @@ abstract class AnnotationClassLoader implements LoaderInterface
$defaults = array_replace($globals['defaults'], $annot->getDefaults()); $defaults = array_replace($globals['defaults'], $annot->getDefaults());
foreach ($method->getParameters() as $param) { foreach ($method->getParameters() as $param) {
if (!isset($defaults[$param->getName()]) && $param->isOptional()) { if (!isset($defaults[$param->getName()]) && $param->isDefaultValueAvailable()) {
$defaults[$param->getName()] = $param->getDefaultValue(); $defaults[$param->getName()] = $param->getDefaultValue();
} }
} }

2
src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/VariadicClass.php → src/Symfony/Component/Routing/Tests/Fixtures/OtherAnnotatedClasses/VariadicClass.php
View File

@ -9,7 +9,7 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses; namespace Symfony\Component\Routing\Tests\Fixtures\OtherAnnotatedClasses;
class VariadicClass class VariadicClass
{ {

1
src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
View File

@ -16,6 +16,7 @@ use Symfony\Component\Routing\Annotation\Route;
class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
{ {
protected $loader; protected $loader;
private $reader;
protected function setUp() protected function setUp()
{ {

6
src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
View File

@ -40,12 +40,12 @@ class AnnotationFileLoaderTest extends AbstractAnnotationLoaderTest
*/ */
public function testLoadVariadic() 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('getClassAnnotation');
$this->reader->expects($this->once())->method('getMethodAnnotations') $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() public function testSupports()