kenjis / ci-phpunit-test

application/tests/Bootstrap.php

Switch Indentation +22 added lines, -22 removed lines

@@ -69,28 +69,28 @@
  */
 switch (ENVIRONMENT)
 {
-	case 'testing':
-	case 'development':
-		error_reporting(-1);
-		ini_set('display_errors', 1);
-	break;
-
-	case 'production':
-		ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
-		{
-			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-		}
-		else
-		{
-			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
-		}
-	break;
-
-	default:
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-		echo 'The application environment is not set correctly.';
-		exit(1); // EXIT_ERROR
+		case 'testing':
+		case 'development':
+			error_reporting(-1);
+			ini_set('display_errors', 1);
+		break;
+
+		case 'production':
+			ini_set('display_errors', 0);
+			if (version_compare(PHP_VERSION, '5.3', '>='))
+			{
+				error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+			}
+			else
+			{
+				error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
+			}
+		break;
+
+		default:
+			header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+			echo 'The application environment is not set correctly.';
+			exit(1); // EXIT_ERROR
 }
 
 /*

Braces +10 added lines, -20 removed lines

@@ -80,8 +80,7 @@ 
 		if (version_compare(PHP_VERSION, '5.3', '>='))
 		{
 			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-		}
-		else
+		} else
 		{
 			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
 		}
@@ -204,8 +203,7 @@ 
 	if (($_temp = realpath($system_path)) !== FALSE)
 	{
 		$system_path = $_temp.DIRECTORY_SEPARATOR;
-	}
-	else
+	} else
 	{
 		// Ensure there's a trailing slash
 		$system_path = strtr(
@@ -249,8 +247,7 @@ 
 		if (($_temp = realpath($application_folder)) !== FALSE)
 		{
 			$application_folder = $_temp;
-		}
-		else
+		} else
 		{
 			$application_folder = strtr(
 				rtrim($application_folder, '/\\'),
@@ -258,16 +255,14 @@ 
 				DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
 			);
 		}
-	}
-	elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
+	} elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
 	{
 		$application_folder = BASEPATH.strtr(
 			trim($application_folder, '/\\'),
 			'/\\',
 			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
 		);
-	}
-	else
+	} else
 	{
 		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 		echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
@@ -280,14 +275,12 @@ 
 	if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
 	{
 		$view_folder = APPPATH.'views';
-	}
-	elseif (is_dir($view_folder))
+	} elseif (is_dir($view_folder))
 	{
 		if (($_temp = realpath($view_folder)) !== FALSE)
 		{
 			$view_folder = $_temp;
-		}
-		else
+		} else
 		{
 			$view_folder = strtr(
 				rtrim($view_folder, '/\\'),
@@ -295,16 +288,14 @@ 
 				DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
 			);
 		}
-	}
-	elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
+	} elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
 	{
 		$view_folder = APPPATH.strtr(
 			trim($view_folder, '/\\'),
 			'/\\',
 			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
 		);
-	}
-	else
+	} else
 	{
 		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 		echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
@@ -317,8 +308,7 @@ 
 	if (is_file(TESTPATH . '_ci_phpunit_test' . DIRECTORY_SEPARATOR . 'CIPHPUnitTest.php'))
 	{
 		define('CI_PHPUNIT_TESTPATH', TESTPATH . '_ci_phpunit_test' . DIRECTORY_SEPARATOR);
-	}
-	else
+	} else
 	{
 		// Assume Composer with a vendor directory parallel to the application directory
 		define('CI_PHPUNIT_TESTPATH', implode(

application/tests/_ci_phpunit_test/CIPHPUnitTestFileCache.php

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
 		if ($this->offsetExists($key))
 		{
 			return $this->map[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}

application/tests/_ci_phpunit_test/CIPHPUnitTestRouter.php

Braces +2 added lines, -4 removed lines

@@ -29,16 +29,14 @@
 		if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
 		{
 			$e404 = TRUE;
-		}
-		else
+		} else
 		{
 			require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
 
 			if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
 			{
 				$e404 = TRUE;
-			}
-			elseif (method_exists($class, '_remap'))
+			} elseif (method_exists($class, '_remap'))
 			{
 				$params = array($method, array_slice($URI->rsegments, 2));
 				$method = '_remap';

application/tests/_ci_phpunit_test/functions.php

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
 		{
 			$CI->db->close();
 			$CI->db = null;
-		}
-		else
+		} else
 		{
 			// Don't close if SQLite in-memory database
 			// If we close it, all tables and stored data will be gone

application/tests/_ci_phpunit_test/patcher/InvocationVerifier.php

Braces +4 added lines, -8 removed lines

@@ -31,12 +31,10 @@ 
 				if ($invoked === false)
 				{
 					$actual_times = 0;
-				}
-				elseif ($expected_params === null)
+				} elseif ($expected_params === null)
 				{
 					$actual_times = count($invocations[$class_method]);
-				}
-				else
+				} else
 				{
 					$count = 0;
 					foreach ($invocations[$class_method] as $actual_params)
@@ -56,16 +54,14 @@ 
 						$actual_times,
 						$class_method . '() expected to be not invoked, but invoked ' . $actual_times . ' times.'
 					);
-				}
-				elseif ($expected_times === '+')
+				} elseif ($expected_times === '+')
 				{
 					PHPUnit_Framework_TestCase::assertGreaterThanOrEqual(
 						1,
 						$actual_times,
 						$class_method . '() expected to be invoked at least one time, but invoked ' . $actual_times . ' times.'
 					);
-				}
-				else
+				} else
 				{
 					PHPUnit_Framework_TestCase::assertEquals(
 						$expected_times,

application/tests/_ci_phpunit_test/patcher/MonkeyPatch.php

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
 		if (strpos($class_method, '::') === false)
 		{
 			return 'Kenjis\MonkeyPatch\Patcher\FunctionPatcher\Proxy';
-		}
-		else
+		} else
 		{
 			return 'Kenjis\MonkeyPatch\Patcher\MethodPatcher\PatchManager';
 		}

application/tests/_ci_phpunit_test/patcher/functions/exit__.php

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
 	if ($class === null)
 	{
 		$message = 'exit() called in ' . $method . '() function';
-	}
-	else
+	} else
 	{
 		$message = 'exit() called in ' . $class . '::' . $method . '()';
 	}

application/tests/mocks/autoloader.php

Braces +8 added lines, -16 removed lines

@@ -63,8 +63,7 @@ 
 	if (strpos($class, 'Mock_') === 0)
 	{
 		$class = strtolower(str_replace(array('Mock_', '_'), array('', DIRECTORY_SEPARATOR), $class));
-	}
-	elseif (strpos($class, 'CI_') === 0)
+	} elseif (strpos($class, 'CI_') === 0)
 	{
 		$subclass = substr($class, 3);
 
@@ -72,39 +71,32 @@ 
 		{
 			$dir = SYSTEM_PATH.'core'.DIRECTORY_SEPARATOR;
 			$class = $subclass;
-		}
-		elseif (in_array($subclass, $ci_libraries))
+		} elseif (in_array($subclass, $ci_libraries))
 		{
 			$dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR;
 			$class = ($subclass === 'Driver_Library') ? 'Driver' : $subclass;
-		}
-		elseif (in_array($subclass, $ci_drivers))
+		} elseif (in_array($subclass, $ci_drivers))
 		{
 			$dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR.$subclass.DIRECTORY_SEPARATOR;
 			$class = $subclass;
-		}
-		elseif (in_array(($parent = strtok($subclass, '_')), $ci_drivers)) {
+		} elseif (in_array(($parent = strtok($subclass, '_')), $ci_drivers)) {
 			$dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR.$parent.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
 			$class = $subclass;
-		}
-		elseif (preg_match('/^CI_DB_(.+)_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 4)
+		} elseif (preg_match('/^CI_DB_(.+)_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 4)
 		{
 			$driver_path = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
 			$dir = $driver_path.$m[1].DIRECTORY_SEPARATOR.'subdrivers'.DIRECTORY_SEPARATOR;
 			$file = $dir.$m[1].'_'.$m[2].'_'.$m[3].'.php';
-		}
-		elseif (preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 3)
+		} elseif (preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 3)
 		{
 			$driver_path = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
 			$dir = $driver_path.$m[1].DIRECTORY_SEPARATOR;
 			$file = $dir.$m[1].'_'.$m[2].'.php';
-		}
-		elseif (strpos($class, 'CI_DB') === 0)
+		} elseif (strpos($class, 'CI_DB') === 0)
 		{
 			$dir = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR;
 			$file = $dir.str_replace(array('CI_DB','active_record'), array('DB', 'active_rec'), $subclass).'.php';
-		}
-		else
+		} else
 		{
 			$class = strtolower($class);
 		}

application/tests/_ci_phpunit_test/replacing/core/CodeIgniter.php

Braces +10 added lines, -20 removed lines

@@ -169,12 +169,10 @@ 
 			file_exists(APPPATH.'vendor/autoload.php')
 				? require_once(APPPATH.'vendor/autoload.php')
 				: log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.');
-		}
-		elseif (file_exists($composer_autoload))
+		} elseif (file_exists($composer_autoload))
 		{
 			require_once($composer_autoload);
-		}
-		else
+		} else
 		{
 			log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload);
 		}
@@ -253,8 +251,7 @@ 
 		// This is required for mb_convert_encoding() to strip invalid characters.
 		// That's utilized by CI_Utf8, but it's also done for consistency with iconv.
 		mb_substitute_character('none');
-	}
-	else
+	} else
 	{
 		define('MB_ENABLED', FALSE);
 	}
@@ -267,8 +264,7 @@ 
 		// iconv.internal_encoding is deprecated starting with PHP 5.6
 		// and it's usage triggers E_DEPRECATED messages.
 		@ini_set('iconv.internal_encoding', $charset);
-	}
-	else
+	} else
 	{
 		define('ICONV_ENABLED', FALSE);
 	}
@@ -378,8 +374,7 @@ 
 		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
 		{
 			return CI_Controller::get_instance();
-		}
-		else
+		} else
 		{
 			return CI::$APP;
 		}
@@ -424,21 +419,18 @@ 
 	if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
 	{
 		$e404 = TRUE;
-	}
-	else
+	} else
 	{
 		require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
 
 		if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
 		{
 			$e404 = TRUE;
-		}
-		elseif (method_exists($class, '_remap'))
+		} elseif (method_exists($class, '_remap'))
 		{
 			$params = array($method, array_slice($URI->rsegments, 2));
 			$method = '_remap';
-		}
-		elseif ( ! method_exists($class, $method))
+		} elseif ( ! method_exists($class, $method))
 		{
 			$e404 = TRUE;
 		}
@@ -490,8 +482,7 @@ 
 						$RTR->directory = '';
 					}
 				}
-			}
-			else
+			} else
 			{
 				$e404 = FALSE;
 			}
@@ -507,8 +498,7 @@ 
 				1 => $class,
 				2 => $method
 			);
-		}
-		else
+		} else
 		{
 			show_404($RTR->directory.$class.'/'.$method);
 		}