Merge pull request zendframework/zendframework#1880 from weierophinne…

…y/hotfix/view-model-property-overloading Property overloading was not working in ViewModel
zendframework · Jul 13, 2012 · 19f0ef6 · 19f0ef6
2 parents 376bf70 + 389a65f
commit 19f0ef6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Model/ViewModel.php b/src/Model/ViewModel.php
@@ -100,8 +100,7 @@ public function __construct($variables = null, $options = null)
      */
     public function __set($name, $value)
     {
-        $variables = $this->getVariables();
-        $variables[$name] = $value;
+        $this->setVariable($name, $value);
     }
 
     /**

diff --git a/test/Model/ViewModelTest.php b/test/Model/ViewModelTest.php
@@ -233,4 +233,17 @@ public function testPropertyOverloadingGivesAccessToProperties()
         $this->assertFalse(isset($model->foo));
         $this->assertFalse(isset($variables['foo']));
     }
+
+    public function testPropertyOverloadingAllowsWritingPropertiesAfterSetVariablesHasBeenCalled()
+    {
+        $model = new ViewModel();
+        $model->setVariables(array('foo' => 'bar'));
+        $model->bar = 'baz';
+
+        $this->assertTrue(isset($model->bar));
+        $this->assertEquals('baz', $model->bar);
+        $variables = $model->getVariables();
+        $this->assertArrayHasKey('bar', $variables);
+        $this->assertEquals('baz', $variables['bar']);
+    }
 }