Using $this->updateKeys to determine the current values of updateable properties.

Author: ycombinator

lib/OpenCloud/Common/Resource/PersistentResource.php

@@ -341,16 +341,18 @@ public function checkExtension($alias)
     /**
      * Returns the object's properties as an array
      */
-    protected function getPropertiesAsArray()
+    protected function getUpdateablePropertiesAsArray()
     {
         $properties = get_object_vars($this);
 
-        $propertiesToRemove = array('aliases', 'service', 'parent', 'metadata');
-        foreach ($propertiesToRemove as $property) {
-            unset($properties[$property]);
+        $propertiesToKeep = array();
+        foreach ($this->updateKeys as $key) {
+            if (isset($properties[$key])) {
+                $propertiesToKeep[$key] = $properties[$key];
+            }
         }
 
-        return $properties;
+        return $propertiesToKeep;
     }
 
     /**
@@ -362,7 +364,7 @@ protected function getPropertiesAsArray()
     protected function generateJsonPatch($updatedProperties)
     {
         // Normalize current and updated properties into nested arrays
-        $currentProperties = json_decode(json_encode($this->getPropertiesAsArray()), true);
+        $currentProperties = json_decode(json_encode($this->getUpdateablePropertiesAsArray()), true);
         $updatedProperties = json_decode(json_encode($updatedProperties), true);
 
         // Add any properties that haven't changed to generate the correct patch

tests/OpenCloud/Tests/Common/Resource/PersistentResourceTest.php

@@ -27,14 +27,22 @@ class PublicPersistentResource extends PersistentResource
         'foo_bar' => 'fooBar'
     );
 
+    protected $updateKeys = array(
+        'baz',
+        'tags',
+        'domains',
+        'origins',
+        'status'
+    );
+
     public function recursivelyAliasPropertyValue($propertyValue)
     {
         return parent::recursivelyAliasPropertyValue($propertyValue);
     }
 
-    public function getPropertiesAsArray()
+    public function getUpdateablePropertiesAsArray()
     {
-        return parent::getPropertiesAsArray();
+        return parent::getUpdateablePropertiesAsArray();
     }
 
     public function generateJsonPatch($updateParams)
@@ -117,7 +125,7 @@ public function testRecursivelyAliasPropertyValueWithObjects()
             $this->persistentResource->recursivelyAliasPropertyValue($obj3));
     }
 
-    public function testGetPropertiesAsArray()
+    public function testGetUpdateablePropertiesAsArray()
     {
         $this->persistentResource->id = 17;
         $this->persistentResource->tags = array('foo', 'bar');
@@ -131,7 +139,6 @@ public function testGetPropertiesAsArray()
         $this->persistentResource->status = (object) array('message' => 'Creation in progress');
 
         $expectedArray = array(
-            'id' => 17,
             'tags' => array('foo', 'bar'),
             'domains' => array(
                 (object) array('domain' => 'foo.phpopencloud.com'),
@@ -140,10 +147,10 @@ public function testGetPropertiesAsArray()
             'origins' => array(
                 array('origin' => 'origin1.phpopencloud.com'),
             ),
-            'status' => (object) array('message' => 'Creation in progress'),
+            'status' => (object) array('message' => 'Creation in progress')
         );
 
-        $this->assertEquals($expectedArray, $this->persistentResource->getPropertiesAsArray());
+        $this->assertEquals($expectedArray, $this->persistentResource->getUpdateablePropertiesAsArray());
     }
 
     public function testGenerateJsonPatch()