Merge branch 'feature/router' of github.com:DASPRiD/zf2 into feature/…

…router
zendframework · Oct 29, 2011 · 08a171a · 08a171a
commit 08a171a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -80,6 +80,7 @@ public function configureDefinition(Di $di, $definition)
                                             $classDefinition->addMethodParameter($methodName, $paramName, $paramInfo);
                                         }
                                     }
+                                    break;
                                 default:
                                     $methodName = $classDefKey;
                                     $methodInfo = $classDefData;

diff --git a/test/ConfigurationTest.php b/test/ConfigurationTest.php
@@ -118,6 +118,7 @@ public function testCanSetInstantiatorToStaticFactory()
         $this->assertEquals($dummyParams->params['param1'], 'hello');
         $this->assertEquals($dummyParams->params['param2'], 'world');
         $this->assertEquals($dummyParams->params['foo'], 'bar');
+        $this->assertArrayNotHasKey('methods', $di->definitions()->hasMethods('ZendTest\Di\TestAsset\StaticFactory'));
     }
 
 }