Merge pull request #756 from smgallo/fix-array-merge-errors

Explicitly cast potentiall nulls to array for array_merge()
ubccr · Dec 20, 2018 · 88f14af · 88f14af
2 parents 0febec4 + b0dad0b
commit 88f14af
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/classes/ETL/EtlOverseer.php b/classes/ETL/EtlOverseer.php
@@ -180,8 +180,8 @@ public function verifyActions(
                     // Verify that specified resource codes are valid
 
                     $codeList = array_merge(
-                        $action->getOptions()->include_only_resource_codes,
-                        $action->getOptions()->exclude_resource_codes
+                        (array) $action->getOptions()->include_only_resource_codes,
+                        (array) $action->getOptions()->exclude_resource_codes
                     );
                     $this->verifyResourceCodes($codeList);
                 }