Merge pull request #3022 from Instrye/getPostGet

Fix: index not exists, getPostGet and getGetPost should return null
codeigniter4 · May 20, 2020 · 6d019e5 · 6d019e5
2 parents eebda65 + ee5f131
commit 6d019e5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -427,7 +427,7 @@ public function getPostGet($index = null, $filter = null, $flags = null)
 		// Use $_POST directly here, since filter_has_var only
 		// checks the initial POST data, not anything that might
 		// have been added since.
-		return isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : (isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : $this->getPost());
+		return isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : (isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : $this->getPost($index, $filter, $flags));
 	}
 
 	//--------------------------------------------------------------------
@@ -446,7 +446,7 @@ public function getGetPost($index = null, $filter = null, $flags = null)
 		// Use $_GET directly here, since filter_has_var only
 		// checks the initial GET data, not anything that might
 		// have been added since.
-		return isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : (isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : $this->getGet());
+		return isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : (isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : $this->getGet($index, $filter, $flags));
 	}
 
 	//--------------------------------------------------------------------

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
@@ -463,4 +463,15 @@ public function testWithFalseBody()
 		$this->assertTrue($request->getBody() !== false);
 		$this->assertTrue($request->getBody() === null);
 	}
+
+	/**
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3020
+	 */
+	public function testGetPostIndexNotExists()
+	{
+		$_POST['TEST'] = 5;
+		$_GET['TEST']  = 3;
+		$this->assertNull($this->request->getPostGet('gc'));
+		$this->assertNull($this->request->getGetPost('gc'));
+	}
 }