Fixed update

Author: dantleech

features/phpcr_query_update.feature

@@ -32,7 +32,8 @@ Feature: Execute a a raw UPDATE query in JCR_SQL2
         And the node at "/cms/articles/article1" should have the property "tags" with value "Rockets" at index "1"
 
     Scenario: Set a multivalue value
-        Given I execute the "UPDATE [nt:unstructured] AS a SET a.tags = array('Rockets', 'Dragons') WHERE a.tags = 'Trains'" command
+        Given I execute the "UPDATE [nt:unstructured] AS a SET a.tags = array('Rockets', 'Dragons')" command
+        Then the command should not fail
         And I save the session
         Then the command should not fail
         And the node at "/cms/articles/article1" should have the property "tags" with value "Rockets" at index "0"

src/PHPCR/Shell/Query/UpdateProcessor.php

@@ -44,6 +44,7 @@ public function __construct()
             'array_append' => function ($operand, $v, $x) {
                 $operand->validateScalarArray($v);
                 $v[] = $x;
+
                 return $v;
             },
             'array' => function () {
@@ -85,45 +86,20 @@ public function __construct()
     public function updateNode(RowInterface $row, $propertyData)
     {
         $node = $row->getNode($propertyData['selector']);
-
-        if ($node->hasProperty($propertyData['name'])) {
-            $value = $this->handleExisting($row, $node, $propertyData);
-        } else {
-            $value = $propertyData['value'];
-        }
-
-        $node->setProperty($propertyData['name'], $value);
-    }
-
-    private function handleExisting($row, $node, $propertyData)
-    {
-        $phpcrProperty = $node->getProperty($propertyData['name']);
         $value = $propertyData['value'];
 
         if ($value instanceof FunctionOperand) {
-            return $this->handleFunction($row, $node, $phpcrProperty, $propertyData);
+            $value = $this->handleFunction($row, $propertyData);
         }
 
-        return $value;
+        $node->setProperty($propertyData['name'], $value);
     }
 
-    private function handleFunction($row, $node, $phpcrProperty, $propertyData)
+    private function handleFunction($row, $propertyData)
     {
-        $currentValue = $phpcrProperty->getValue();
         $value = $propertyData['value'];
-
         $value = $value->execute($this->functionMap, $row);
 
-        if ($phpcrProperty->isMultiple()) {
-            // do not allow updating multivalue with scalar
-            if (false === is_array($value) && sizeof($currentValue) > 1) {
-                throw new \InvalidArgumentException(sprintf(
-                    '<error>Cannot update multivalue property "%s" with a scalar value.</error>',
-                    $phpcrProperty->getName()
-                ));
-            }
-        }
-
         return $value;
     }
 }