Merge pull request #3008 from AlessandroMinoccheri/improve_code_insid…

…e_query_directory removed an else condition, fixed a parameter annotation and make little improvements
doctrine · Feb 2, 2018 · 4ea3b4d · 4ea3b4d
2 parents e5fe8c8 + 018e0d2
commit 4ea3b4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/Doctrine/DBAL/Query/Expression/CompositeExpression.php b/lib/Doctrine/DBAL/Query/Expression/CompositeExpression.php
@@ -75,7 +75,7 @@ public function __construct($type, array $parts = [])
      */
     public function addMultiple(array $parts = [])
     {
-        foreach ((array) $parts as $part) {
+        foreach ($parts as $part) {
             $this->add($part);
         }
 

diff --git a/lib/Doctrine/DBAL/Query/QueryBuilder.php b/lib/Doctrine/DBAL/Query/QueryBuilder.php
@@ -473,7 +473,7 @@ public function select($select = null)
 
         $selects = is_array($select) ? $select : func_get_args();
 
-        return $this->add('select', $selects, false);
+        return $this->add('select', $selects);
     }
 
     /**