Commite31ad5a

committed

Avoid setting request attributes from signature arguments in AnnotationClassLoader

1 parent0dd6a90 commite31ad5aCopy full SHA for e31ad5a

File tree

-11

lines changed

-11

lines changed

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -138,11 +138,6 @@ protected function addRoute(RouteCollection $collection, $annot, $globals, \Refl`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`$defaults =array_replace($globals['defaults'],$annot->getDefaults());`
`141`		`-foreach ($method->getParameters()as$param) {`
`142`		`-if (!isset($defaults[$param->getName()]) &&$param->isDefaultValueAvailable()) {`
`143`		`-$defaults[$param->getName()] =$param->getDefaultValue();`
`144`		`- }`
`145`		`- }`
`146`	`141`	`$requirements =array_replace($globals['requirements'],$annot->getRequirements());`
`147`	`142`	`$options =array_replace($globals['options'],$annot->getOptions());`
`148`	`143`	`$schemes =array_merge($globals['schemes'],$annot->getSchemes());`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -136,12 +136,6 @@ public function testLoad($className, $routeData = array(), $methodArgs = array()`
`136`	`136`	`array_intersect_assoc($routeData['options'],$route->getOptions()),`
`137`	`137`	`'->load preserves options annotation'`
`138`	`138`	`);`
`139`		`-$defaults =array_replace($methodArgs,$routeData['defaults']);`
`140`		`-$this->assertCount(`
`141`		`-count($defaults),`
`142`		`-array_intersect_assoc($defaults,$route->getDefaults()),`
`143`		`-'->load preserves defaults annotation and merges them with default arguments in method signature'`
`144`		`- );`
`145`	`139`	`$this->assertEquals($routeData['schemes'],$route->getSchemes(),'->load preserves schemes annotation');`
`146`	`140`	`$this->assertEquals($routeData['methods'],$route->getMethods(),'->load preserves methods annotation');`
`147`	`141`	`$this->assertSame($routeData['condition'],$route->getCondition(),'->load preserves condition annotation');`

Comments

(0)