Merge pull request #318 from masumiya/2.x

Fixed adding condition for PHP7.4.
kenjis · Jan 28, 2020 · f109b7e · f109b7e
2 parents 6abc254 + 76706da
commit f109b7e
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/application/tests/_ci_phpunit_test/patcher/2.x/Patcher/ConstantPatcher.php b/application/tests/_ci_phpunit_test/patcher/2.x/Patcher/ConstantPatcher.php
@@ -73,7 +73,7 @@ protected static function generateNewSource($source)
 			{
 				$new_source .= $token;
 			}
-			elseif ($i == $replacement['key'])
+			elseif (isset($replacement['key']) && $i == $replacement['key'])
 			{
 				$new_source .= $replacement['value'];
 				$replacement['key'] = key(self::$replacement);

diff --git a/application/tests/_ci_phpunit_test/patcher/2.x/Patcher/FunctionPatcher.php b/application/tests/_ci_phpunit_test/patcher/2.x/Patcher/FunctionPatcher.php
@@ -182,7 +182,7 @@ protected static function generateNewSource($source)
 			{
 				$new_source .= $token;
 			}
-			elseif ($i == $replacement['key'])
+			elseif (isset($replacement['key']) && $i == $replacement['key'])
 			{
 				$new_source .= $replacement['value'];
 				$replacement['key'] = key(self::$replacement);

diff --git a/application/tests/_ci_phpunit_test/patcher/2.x/Patcher/MethodPatcher.php b/application/tests/_ci_phpunit_test/patcher/2.x/Patcher/MethodPatcher.php
@@ -55,7 +55,7 @@ protected static function generateNewSource($source)
 		{
 			$i++;
 
-			if ($i == $replacement['key'])
+			if (isset($replacement['key']) && $i == $replacement['key'])
 			{
 				$start_method = true;
 			}

diff --git a/application/tests/_ci_phpunit_test/patcher/3.x/Patcher/ConstantPatcher.php b/application/tests/_ci_phpunit_test/patcher/3.x/Patcher/ConstantPatcher.php
@@ -73,7 +73,7 @@ protected static function generateNewSource($source)
 			{
 				$new_source .= $token;
 			}
-			elseif ($i == $replacement['key'])
+			elseif (isset($replacement['key']) && $i == $replacement['key'])
 			{
 				$new_source .= $replacement['value'];
 				$replacement['key'] = key(self::$replacement);

diff --git a/application/tests/_ci_phpunit_test/patcher/3.x/Patcher/FunctionPatcher.php b/application/tests/_ci_phpunit_test/patcher/3.x/Patcher/FunctionPatcher.php
@@ -182,7 +182,7 @@ protected static function generateNewSource($source)
 			{
 				$new_source .= $token;
 			}
-			elseif ($i == $replacement['key'])
+			elseif (isset($replacement['key']) && $i == $replacement['key'])
 			{
 				$new_source .= $replacement['value'];
 				$replacement['key'] = key(self::$replacement);

diff --git a/application/tests/_ci_phpunit_test/patcher/3.x/Patcher/MethodPatcher.php b/application/tests/_ci_phpunit_test/patcher/3.x/Patcher/MethodPatcher.php
@@ -55,7 +55,7 @@ protected static function generateNewSource($source)
 		{
 			$i++;
 
-			if ($i == $replacement['key'])
+			if (isset($replacement['key']) && $i == $replacement['key'])
 			{
 				$start_method = true;
 			}

diff --git a/application/tests/_ci_phpunit_test/patcher/4.x/Patcher/ConstantPatcher.php b/application/tests/_ci_phpunit_test/patcher/4.x/Patcher/ConstantPatcher.php
@@ -73,7 +73,7 @@ protected static function generateNewSource($source)
 			{
 				$new_source .= $token;
 			}
-			elseif ($i == $replacement['key'])
+			elseif (isset($replacement['key']) && $i == $replacement['key'])
 			{
 				$new_source .= $replacement['value'];
 				$replacement['key'] = key(self::$replacement);

diff --git a/application/tests/_ci_phpunit_test/patcher/4.x/Patcher/FunctionPatcher.php b/application/tests/_ci_phpunit_test/patcher/4.x/Patcher/FunctionPatcher.php
@@ -182,7 +182,7 @@ protected static function generateNewSource($source)
 			{
 				$new_source .= $token;
 			}
-			elseif ($i == $replacement['key'])
+			elseif (isset($replacement['key']) && $i == $replacement['key'])
 			{
 				$new_source .= $replacement['value'];
 				$replacement['key'] = key(self::$replacement);

diff --git a/application/tests/_ci_phpunit_test/patcher/4.x/Patcher/MethodPatcher.php b/application/tests/_ci_phpunit_test/patcher/4.x/Patcher/MethodPatcher.php
@@ -55,7 +55,7 @@ protected static function generateNewSource($source)
 		{
 			$i++;
 
-			if ($i == $replacement['key'])
+			if (isset($replacement['key']) && $i == $replacement['key'])
 			{
 				$start_method = true;
 			}