Merge branch 'master' into hotfix/filter-validator-loading

zendframework · Dec 19, 2011 · c24c880 · c24c880
commit c24c880
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/src/Definition/ArrayDefinition.php b/src/Definition/ArrayDefinition.php
@@ -9,6 +9,10 @@ class ArrayDefinition implements Definition
 
     public function __construct(Array $dataArray)
     {
+        foreach ($dataArray as $class => $value) {
+            // force lower names
+            $dataArray[$class] = array_change_key_case($dataArray[$class], CASE_LOWER);
+        }
         $this->dataArray = $dataArray;
     }
 

diff --git a/src/Definition/CompilerDefinition.php b/src/Definition/CompilerDefinition.php
@@ -9,8 +9,6 @@
     Zend\Di\Definition\Annotation,
     Zend\Code\Annotation\AnnotationManager,
     Zend\Code\Reflection,
-//    Zend\Code\Scanner\FileScanner,
-//    Zend\Code\Scanner\MethodScanner,
     Zend\Code\Annotation\AnnotationCollection;
 
 class CompilerDefinition implements Definition
@@ -53,7 +51,7 @@ public function addDirectory($directory)
 
     public function addDirectoryScanner(DirectoryScanner $directoryScanner)
     {
-        $this->directoryScanner->addScanner($directoryScanner);
+        $this->directoryScanner->addDirectoryScanner($directoryScanner);
     }
 
     public function addCodeScannerFile(FileScanner $fileScanner)
@@ -68,7 +66,7 @@ public function addCodeScannerFile(FileScanner $fileScanner)
     public function compile()
     {
         /* @var $classScanner \Zend\Code\Scanner\DerivedClassScanner */
-        foreach ($this->directoryScanner->getClasses() as $class) {
+        foreach ($this->directoryScanner->getClassNames() as $class) {
             $this->processClass($class);
         }
     }

diff --git a/test/Definition/ArrayDefinitionTest.php b/test/Definition/ArrayDefinitionTest.php
@@ -9,7 +9,7 @@ class ArrayDefinitionTest extends TestCase
 {
 
     /**
-     * @var Zend\Di\Definition\ArrayDefinition
+     * @var ArrayDefinition
      */
     protected $definition = null;
 

diff --git a/test/Definition/CompilerDefinitionTest.php b/test/Definition/CompilerDefinitionTest.php
@@ -13,7 +13,7 @@ public function testCompilerCompilesAgainstConstructorInjectionAssets()
         $definition = new CompilerDefinition;
         $definition->addDirectory(__DIR__ . '/../TestAsset/CompilerClasses');
         $definition->compile();
-        
+
         $this->assertTrue($definition->hasClass('ZendTest\Di\TestAsset\CompilerClasses\A'));
 
         $assertClasses = array(

diff --git a/test/_files/definition-array.php b/test/_files/definition-array.php
@@ -5,7 +5,7 @@
     array (
     ),
     'instantiator' => '__construct',
-    'injectionMethods' => 
+    'methods' =>
     array (
       '__construct' => 
       array (
@@ -16,22 +16,22 @@
   ),
   'My\\EntityA' => 
   array (
-    'superTypes' => 
+    'supertypes' =>
     array (
     ),
     'instantiator' => NULL,
-    'injectionMethods' => 
+    'methods' =>
     array (
     ),
   ),
   'My\\Mapper' => 
   array (
-    'superTypes' => 
+    'supertypes' =>
     array (
       0 => 'ArrayObject',
     ),
     'instantiator' => '__construct',
-    'injectionMethods' => 
+    'methods' =>
     array (
       'setDbAdapter' => 
       array (
@@ -41,7 +41,7 @@
   ),
   'My\\RepositoryA' => 
   array (
-    'superTypes' => 
+    'superTypes' =>
     array (
     ),
     'instantiator' => '__construct',
@@ -55,12 +55,12 @@
   ),
   'My\\RepositoryB' => 
   array (
-    'superTypes' => 
+    'superTypes' =>
     array (
       0 => 'My\\RepositoryA',
     ),
     'instantiator' => NULL,
-    'injectionMethods' => 
+    'Methods' =>
     array (
     ),
   ),