Use array_wrap() in several places (#17276)

cyb3r · Jan 11, 2017 · 58078b8 · 58078b8
1 parent 828fb21
commit 58078b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/Connectors/ConnectionFactory.php b/Connectors/ConnectionFactory.php
@@ -199,7 +199,7 @@ protected function createPdoResolverWithHosts(array $config)
      */
     protected function parseHosts(array $config)
     {
-        $hosts = is_array($config['host']) ? $config['host'] : [$config['host']];
+        $hosts = array_wrap($config['host']);
 
         if (empty($hosts)) {
             throw new InvalidArgumentException('Database hosts array is empty.');

diff --git a/Eloquent/ModelNotFoundException.php b/Eloquent/ModelNotFoundException.php
@@ -30,7 +30,7 @@ class ModelNotFoundException extends RuntimeException
     public function setModel($model, $ids = [])
     {
         $this->model = $model;
-        $this->ids = is_array($ids) ? $ids : [$ids];
+        $this->ids = array_wrap($ids);
 
         $this->message = "No query results for model [{$model}]";
 

diff --git a/Query/Builder.php b/Query/Builder.php
@@ -1320,7 +1320,7 @@ public function groupBy(...$groups)
         foreach ($groups as $group) {
             $this->groups = array_merge(
                 (array) $this->groups,
-                is_array($group) ? $group : [$group]
+                array_wrap($group)
             );
         }
 
@@ -2019,11 +2019,7 @@ public function exists()
      */
     public function count($columns = '*')
     {
-        if (! is_array($columns)) {
-            $columns = [$columns];
-        }
-
-        return (int) $this->aggregate(__FUNCTION__, $columns);
+        return (int) $this->aggregate(__FUNCTION__, array_wrap($columns));
     }
 
     /**