Merge branch 'hotfix/2426'

Close zendframework/zendframework#2426

src/Hydrator/ClassMethods.php

@@ -63,19 +63,13 @@ public function extract($object)
             if (!preg_match('/^(get|has|is)[A-Z]\w*/', $method)) {
                 continue;
             }
+
+            $attribute = $method;
             if (preg_match('/^get/', $method)) {
-                // setter verification
-                $setter = preg_replace('/^get/', 'set', $method);
                 $attribute = substr($method, 3);
                 $attribute = lcfirst($attribute);
-            } else {
-                // setter verification
-                $setter = 'set' . ucfirst($method);
-                $attribute = $method;
-            }
-            if (!in_array($setter, $methods)) {
-                continue;
             }
+
             if ($this->underscoreSeparatedKeys) {
                 $attribute = preg_replace_callback('/([A-Z])/', $transform, $attribute);
             }

test/HydratorTest.php

@@ -123,20 +123,6 @@ public function testHydratorClassMethodsCamelCase()
         $this->assertEquals($test->hasBar(), false);
     }
 
-    public function testHydratorClassMethodsCamelCaseWithSetterMissing()
-    {
-        $hydrator = new ClassMethods(false);
-        $datas = $hydrator->extract($this->classMethodsCamelCaseMissing);
-        $this->assertTrue(isset($datas['fooBar']));
-        $this->assertEquals($datas['fooBar'], '1');
-        $this->assertFalse(isset($datas['fooBarBaz']));
-        $this->assertFalse(isset($datas['foo_bar']));
-        $test = $hydrator->hydrate(array('fooBar' => 'foo'), $this->classMethodsCamelCaseMissing);
-        $this->assertSame($this->classMethodsCamelCaseMissing, $test);
-        $this->assertEquals($test->getFooBar(), 'foo');
-        $this->assertEquals($test->getFooBarBaz(), '2');
-    }
-
     public function testHydratorClassMethodsUnderscore()
     {
         $hydrator = new ClassMethods(true);
@@ -202,4 +188,19 @@ public function testHydratorClassMethodsDefaultBehaviorIsConvertUnderscoreToCame
         $this->assertEquals($test->getFooBar(), 'foo');
         $this->assertEquals($test->getFooBarBaz(), 'bar');
     }
+
+    public function testHydratorClassMethodsCamelCaseWithSetterMissing()
+    {
+        $hydrator = new ClassMethods(false);
+
+        $datas = $hydrator->extract($this->classMethodsCamelCaseMissing);
+        $this->assertTrue(isset($datas['fooBar']));
+        $this->assertEquals($datas['fooBar'], '1');
+        $this->assertTrue(isset($datas['fooBarBaz']));
+        $this->assertFalse(isset($datas['foo_bar']));
+        $test = $hydrator->hydrate(array('fooBar' => 'foo', 'fooBarBaz' => 1), $this->classMethodsCamelCaseMissing);
+        $this->assertSame($this->classMethodsCamelCaseMissing, $test);
+        $this->assertEquals($test->getFooBar(), 'foo');
+        $this->assertEquals($test->getFooBarBaz(), '2');
+    }
 }