Fix array merge

The plus operator doesn’t merge in falsy values…
silverstripe · Dec 20, 2016 · a306371 · a306371
1 parent 467e2d7
commit a306371
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Util/CaseInsensitiveFieldAccessor.php b/src/Util/CaseInsensitiveFieldAccessor.php
@@ -80,12 +80,12 @@ public function getValue(ViewableData $object, $fieldName, $opts = [])
     public function setValue(ViewableData $object, $fieldName, $value, $opts = [])
     {
         $opts = $opts ?: [];
-        $opts = [
-                self::HAS_METHOD => true,
-                self::HAS_FIELD => true,
-                self::HAS_SETTER => true,
-                self::DATAOBJECT => true,
-            ] + $opts;
+        $opts = array_merge([
+            self::HAS_METHOD => true,
+            self::HAS_FIELD => true,
+            self::HAS_SETTER => true,
+            self::DATAOBJECT => true,
+        ], $opts);
 
         $objectFieldName = $this->getObjectFieldName($object, $fieldName, $opts);