Don't emit errors when clauses are undefined.

Refs #10734
cakephp · Jun 7, 2017 · 8782ba1 · 8782ba1
1 parent 7b2ea59
commit 8782ba1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Database/Query.php b/src/Database/Query.php
@@ -1698,7 +1698,7 @@ public function getIterator()
      */
     public function clause($name)
     {
-        return $this->_parts[$name];
+        return isset($this->_parts[$name]) ? $this->_parts[$name] : null;
     }
 
     /**

diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
@@ -4329,6 +4329,18 @@ public function testSelectWithObjFetchType()
         $this->assertEquals($obj, $rows[0]);
     }
 
+    /**
+     * Test that reading an undefined clause does not emit an error.
+     *
+     * @return void
+     */
+    public function testClauseUndefined()
+    {
+        $query = new Query($this->connection);
+        $this->assertEmpty($query->clause('where'));
+        $this->assertNull($query->clause('nope'));
+    }
+
     /**
      * Assertion for comparing a table's contents with what is in it.
      *