Merge pull request #2813 from samsonasik/fix-missing-invalidargumente…

…xception-basebuilder Fix missing InvalidArgumentException in Database\BaseBuilder
codeigniter4 · Apr 9, 2020 · 895f1e6 · 895f1e6
2 parents 3ededb0 + 227f2d0
commit 895f1e6
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -997,7 +997,7 @@ protected function _whereIn(string $key = null, $values = null, bool $not = fals
 		{
 			if (CI_DEBUG)
 			{
-				throw new InvalidArgumentException(sprintf('%s() expects $key to be a non-empty string', debug_backtrace(0, 2)[1]['function']));
+				throw new \InvalidArgumentException(sprintf('%s() expects $key to be a non-empty string', debug_backtrace(0, 2)[1]['function']));
 			}
 			// @codeCoverageIgnoreStart
 			return $this;
@@ -1008,7 +1008,7 @@ protected function _whereIn(string $key = null, $values = null, bool $not = fals
 		{
 			if (CI_DEBUG)
 			{
-				throw new InvalidArgumentException(sprintf('%s() expects $values to be of type array or closure', debug_backtrace(0, 2)[1]['function']));
+				throw new \InvalidArgumentException(sprintf('%s() expects $values to be of type array or closure', debug_backtrace(0, 2)[1]['function']));
 			}
 			// @codeCoverageIgnoreStart
 			return $this;

diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
@@ -221,6 +221,49 @@ public function testWhereInClosure()
 
 	//--------------------------------------------------------------------
 
+	public function provideInvalidKeys()
+	{
+		return [
+			'null'         => [null],
+			'empty string' => [''],
+		];
+	}
+
+	/**
+	 * @dataProvider provideInvalidKeys
+	 */
+	public function testWhereInvalidKeyThrowInvalidArgumentException($key)
+	{
+		$this->expectException(\InvalidArgumentException::class);
+		$builder = $this->db->table('jobs');
+
+		$builder->whereIn($key, ['Politician', 'Accountant']);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function provideInvalidValues()
+	{
+		return [
+			'null'                    => [null],
+			'not array'               => ['not array'],
+			'not instanceof \Closure' => [new \stdClass],
+		];
+	}
+
+	/**
+	 * @dataProvider provideInvalidValues
+	 */
+	public function testWhereInEmptyValuesThrowInvalidArgumentException($values)
+	{
+		$this->expectException(\InvalidArgumentException::class);
+		$builder = $this->db->table('jobs');
+
+		$builder->whereIn('name', $values);
+	}
+
+	//--------------------------------------------------------------------
+
 	public function testWhereNotIn()
 	{
 		$builder = $this->db->table('jobs');