Merge pull request #248 from kenjis/fix-strict-mode

Fix $this->request can't be called more than once
kenjis · Apr 15, 2018 · 7947926 · 7947926
2 parents 22cc8ad + 1e0d9fc
commit 7947926
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php b/application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php
@@ -56,6 +56,11 @@ public function setCI(CI_Controller $CI)
 		$this->CI = $CI;
 	}
 
+	public function getStrictRequestErrorCheck()
+	{
+		return $this->strictRequestErrorCheck;
+	}
+
 	public function __get($name)
 	{
 		if (isset($this->class_map[$name]))
@@ -136,10 +141,6 @@ protected function tearDown()
 	 */
 	public function request($http_method, $argv, $params = [])
 	{
-		if ($this->strictRequestErrorCheck) {
-			$this->enableStrictErrorCheck();
-		}
-
 		return $this->request->request($http_method, $argv, $params);
 	}
 

diff --git a/application/tests/_ci_phpunit_test/CIPHPUnitTestRequest.php b/application/tests/_ci_phpunit_test/CIPHPUnitTestRequest.php
@@ -10,6 +10,9 @@
 
 class CIPHPUnitTestRequest
 {
+    /**
+     * @var TestCase
+     */
 	protected $testCase;
 
 	/**
@@ -39,7 +42,7 @@ class CIPHPUnitTestRequest
 	 */
 	protected $hooks;
 
-	public function __construct(PHPUnit_Framework_TestCase $testCase)
+	public function __construct(TestCase $testCase)
 	{
 		$this->testCase = $testCase;
 		$this->superGlobal = new CIPHPUnitTestSuperGlobal();
@@ -128,6 +131,10 @@ public function enableHooks()
 	 */
 	public function request($http_method, $argv, $params = [])
 	{
+		if ($this->testCase->getStrictRequestErrorCheck()) {
+			$this->testCase->enableStrictErrorCheck();
+		}
+
 		if (is_string($argv))
 		{
 			$argv = ltrim($argv, '/');
@@ -142,18 +149,23 @@ public function request($http_method, $argv, $params = [])
 		try {
 			if (is_array($argv))
 			{
-				return $this->callControllerMethod(
+				$ret = $this->callControllerMethod(
 					$http_method, $argv, $params
 				);
+				$this->testCase->disableStrictErrorCheck();
+				return $ret;
 			}
 			else
 			{
-				return $this->requestUri($http_method, $argv, $params);
+				$ret = $this->requestUri($http_method, $argv, $params);
+				$this->testCase->disableStrictErrorCheck();
+				return $ret;
 			}
 		}
 		// redirect()
 		catch (CIPHPUnitTestRedirectException $e)
 		{
+			$this->testCase->disableStrictErrorCheck();
 			if ($e->getCode() === 0)
 			{
 				set_status_header(200);
@@ -168,18 +180,21 @@ public function request($http_method, $argv, $params = [])
 		// show_404()
 		catch (CIPHPUnitTestShow404Exception $e)
 		{
+			$this->testCase->disableStrictErrorCheck();
 			$this->processError($e);
 			return $e->getMessage();
 		}
 		// show_error()
 		catch (CIPHPUnitTestShowErrorException $e)
 		{
+			$this->testCase->disableStrictErrorCheck();
 			$this->processError($e);
 			return $e->getMessage();
 		}
 		// exit()
 		catch (CIPHPUnitTestExitException $e)
 		{
+			$this->testCase->disableStrictErrorCheck();
 			$output = ob_get_clean();
 			return $output;
 		}

diff --git a/application/tests/_ci_phpunit_test/ChangeLog.md b/application/tests/_ci_phpunit_test/ChangeLog.md
@@ -5,6 +5,7 @@
 ### Fixed
 
 * Fix bug that installer replaces file path in `tests/Bootstrap.php` with wrong code which causes Parse error. See [#247](https://github.com/kenjis/ci-phpunit-test/pull/247).
+* Fix bug that `$this->request()` can't be called more than once in a test method. See [#248](https://github.com/kenjis/ci-phpunit-test/pull/248).
 
 ### Others
 

diff --git a/application/tests/_ci_phpunit_test/patcher/2.x/Patcher/FunctionPatcher/Proxy.php b/application/tests/_ci_phpunit_test/patcher/2.x/Patcher/FunctionPatcher/Proxy.php
@@ -128,7 +128,7 @@ protected static function checkCalledMethod($function)
 			}
 			return true;
 		}
-		//Patches the functions only in the class method
+		// Patches the functions only in the class method
 		else
 		{
 			if (self::$patches_to_apply[$function] !== $class_method)