Merge branch 'hotfix/zendframework/zendframework#6207-underscore-nami…

…ng-strategy-not-studlycase'

Close zendframework/zendframework#6207

src/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php

@@ -25,7 +25,7 @@ class UnderscoreNamingStrategy implements NamingStrategyInterface
      */
     public function hydrate($name)
     {
-        return $this->getUnderscoreToCamelCaseFilter()->filter($name);
+        return lcfirst($this->getUnderscoreToCamelCaseFilter()->filter($name));
     }
 
     /**

test/Hydrator/NamingStrategy/UnderscoreNamingStrategyTest.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Stdlib\Hydrator\NamingStrategy;
+
+use Zend\Stdlib\Hydrator\NamingStrategy\UnderscoreNamingStrategy;
+
+/**
+ * Unit tests for {@see \Zend\Stdlib\Hydrator\NamingStrategy\UnderscoreNamingStrategy}
+ *
+ * @covers \Zend\Stdlib\Hydrator\NamingStrategy\UnderscoreNamingStrategy
+ */
+class UnderscoreNamingStrategyTest extends \PHPUnit_Framework_TestCase
+{
+    public function testNameHydratesToCamelCase()
+    {
+        $strategy = new UnderscoreNamingStrategy();
+        $this->assertEquals('fooBarBaz', $strategy->hydrate('foo_bar_baz'));
+    }
+
+    public function testNameExtractsToUnderscore()
+    {
+        $strategy = new UnderscoreNamingStrategy();
+        $this->assertEquals('foo_bar_baz', $strategy->extract('fooBarBaz'));
+    }
+}