use plus operator

cakephp · Jun 28, 2016 · ec32a6b · ec32a6b
1 parent 3053f13
commit ec32a6b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -1236,10 +1236,10 @@ public function get($primaryKey, $options = [])
      */
     public function findOrCreate($search, callable $callback = null, $options = [])
     {
-        $options = array_merge([
+        $options = $options + [
             'atomic' => true,
             'defaults' => true
-        ], $options);
+        ];
 
         if ($options['atomic']) {
             return $this->connection()->transactional(function () use ($search, $callback, $options) {