Merge branch 'hotfix/zendframework/zendframework#6422-fix-zendframewo…

…rk/zf2#6420-methodgenerator-accepting-array-parameters' into develop Close zendframework/zendframework#6422 Close zendframework/zendframework#6420
zendframework · Jul 27, 2014 · 419be16 · 419be16
9 parents ea9af3c + d8f58fd + c8aca84 + 4ac816f + 7f2fed2 + b528fc5 + fb851e2 + 802bf45 + 13641b8
commit 419be16
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/src/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php b/src/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
@@ -13,9 +13,15 @@
 
 class UnderscoreNamingStrategy implements NamingStrategyInterface
 {
+    /**
+     * @var FilterChain|null
+     */
     protected static $camelCaseToUnderscoreFilter;
 
-    protected static $underscoreToCamelCaseFilter;
+    /**
+     * @var FilterChain|null
+     */
+    protected static $underscoreToStudlyCaseFilter;
 
     /**
      * Remove underscores and capitalize letters
@@ -25,7 +31,7 @@ class UnderscoreNamingStrategy implements NamingStrategyInterface
      */
     public function hydrate($name)
     {
-        return lcfirst($this->getUnderscoreToCamelCaseFilter()->filter($name));
+        return $this->getUnderscoreToStudlyCaseFilter()->filter($name);
     }
 
     /**
@@ -42,16 +48,17 @@ public function extract($name)
     /**
      * @return FilterChain
      */
-    protected function getUnderscoreToCamelCaseFilter()
+    protected function getUnderscoreToStudlyCaseFilter()
     {
-        if (static::$underscoreToCamelCaseFilter instanceof FilterChain) {
-            return static::$underscoreToCamelCaseFilter;
+        if (static::$underscoreToStudlyCaseFilter instanceof FilterChain) {
+            return static::$underscoreToStudlyCaseFilter;
         }
 
         $filter = new FilterChain();
-        $filter->attachByName('WordUnderscoreToCamelCase');
-        static::$underscoreToCamelCaseFilter = $filter;
-        return $filter;
+
+        $filter->attachByName('WordUnderscoreToStudlyCase');
+
+        return static::$underscoreToStudlyCaseFilter = $filter;
     }
 
     /**
@@ -64,9 +71,10 @@ protected function getCamelCaseToUnderscoreFilter()
         }
 
         $filter = new FilterChain();
+
         $filter->attachByName('WordCamelCaseToUnderscore');
         $filter->attachByName('StringToLower');
-        static::$camelCaseToUnderscoreFilter = $filter;
-        return $filter;
+
+        return static::$camelCaseToUnderscoreFilter = $filter;
     }
 }
diff --git a/test/Hydrator/NamingStrategy/UnderscoreNamingStrategyTest.php b/test/Hydrator/NamingStrategy/UnderscoreNamingStrategyTest.php
@@ -29,4 +29,15 @@ public function testNameExtractsToUnderscore()
         $strategy = new UnderscoreNamingStrategy();
         $this->assertEquals('foo_bar_baz', $strategy->extract('fooBarBaz'));
     }
+
+    /**
+     * @group 6422
+     * @group 6420
+     */
+    public function testNameHydratesToStudlyCaps()
+    {
+        $strategy = new UnderscoreNamingStrategy();
+
+        $this->assertEquals('fooBarBaz', $strategy->hydrate('Foo_Bar_Baz'));
+    }
 }