Merge pull request nelmio#64 from thewilkybarkid/protected-setter

Make sure a setter is public before invoking it
DavidMikeSimon · Oct 24, 2013 · ebfba39 · ebfba39
2 parents c829c75 + 8b3ab62
commit ebfba39
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/src/Nelmio/Alice/Loader/Base.php b/src/Nelmio/Alice/Loader/Base.php
@@ -344,7 +344,13 @@ private function populateObject($instance, $class, $name, $data)
                 $variables[$key] = $generatedVal;
             } elseif (method_exists($instance, 'set'.$key)) {
                 $generatedVal = $this->checkTypeHints($instance, 'set'.$key, $generatedVal);
-                $instance->{'set'.$key}($generatedVal);
+                if(!is_callable(array($instance, 'set'.$key))) {
+                    $refl = new \ReflectionMethod($instance, 'set'.$key);
+                    $refl->setAccessible(true);
+                    $refl->invoke($instance, $generatedVal);
+                } else {
+                    $instance->{'set'.$key}($generatedVal);
+                }
                 $variables[$key] = $generatedVal;
             } elseif (property_exists($instance, $key)) {
                 $refl = new \ReflectionProperty($instance, $key);

diff --git a/tests/Nelmio/Alice/Loader/BaseTest.php b/tests/Nelmio/Alice/Loader/BaseTest.php
@@ -131,6 +131,20 @@ public function testLoadAssignsDataToSetters()
         $this->assertEquals('group', $group->getName());
     }
 
+    public function testLoadAssignsDataToNonPublicSetters()
+    {
+        $res = $this->loadData(array(
+            self::GROUP => array(
+                'a' => array(
+                    'sortName' => 'group'
+                ),
+            ),
+        ));
+
+        $group = $res[0];
+        $this->assertEquals('group', $group->getSortName());
+    }
+
     public function testLoadAddsReferencesToAdders()
     {
         $res = $this->loadData(array(

diff --git a/tests/Nelmio/Alice/fixtures/Group.php b/tests/Nelmio/Alice/fixtures/Group.php
@@ -5,6 +5,7 @@
 class Group
 {
     private $name;
+    private $sortName;
     private $owner;
     private $members = array();
     private $creationDate;
@@ -23,6 +24,15 @@ public function setName($name)
         $this->name = $name;
     }
 
+    public function getSortName()
+    {
+        return $this->sortName;
+    }
+
+    protected function setSortName($sortName) {
+        $this->sortName = $sortName;
+    }
+
     public function getOwner()
     {
         return $this->owner;