DakuTree / manga-tracker

public/index.php

Spacing +12 added lines, -12 removed lines

@@ -63,7 +63,7 @@ 
  * Different environments will require different levels of error reporting.
  * By default development will show errors but testing and live will hide them.
  */
-switch (ENVIRONMENT)
+switch(ENVIRONMENT)
 {
 	case 'development':
 		error_reporting(-1);
@@ -79,7 +79,7 @@ 
 	case 'testing':
 	case 'production':
 		ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
+		if(version_compare(PHP_VERSION, '5.3', '>='))
 		{
 			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 		}
@@ -197,12 +197,12 @@ 
  */
 
 // Set the current directory correctly for CLI requests
-if (defined('STDIN'))
+if(defined('STDIN'))
 {
 	chdir(dirname(__FILE__));
 }
 
-if (($_temp = realpath($system_path)) !== FALSE)
+if(($_temp = realpath($system_path)) !== FALSE)
 {
 	$system_path = $_temp.DIRECTORY_SEPARATOR;
 }
@@ -217,7 +217,7 @@ 
 }
 
 // Is the system path correct?
-if ( ! is_dir($system_path))
+if(!is_dir($system_path))
 {
 	header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 	echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.pathinfo(__FILE__, PATHINFO_BASENAME);
@@ -242,9 +242,9 @@ 
 define('SYSDIR', basename(BASEPATH));
 
 // The path to the "application" directory
-if (is_dir($application_folder))
+if(is_dir($application_folder))
 {
-	if (($_temp = realpath($application_folder)) !== FALSE)
+	if(($_temp = realpath($application_folder)) !== FALSE)
 	{
 		$application_folder = $_temp;
 	}
@@ -257,7 +257,7 @@ 
 		);
 	}
 }
-elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
+elseif(is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
 {
 	$application_folder = BASEPATH.strtr(
 			trim($application_folder, '/\\'),
@@ -275,13 +275,13 @@ 
 define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
 
 // The path to the "views" directory
-if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
+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)
+	if(($_temp = realpath($view_folder)) !== FALSE)
 	{
 		$view_folder = $_temp;
 	}
@@ -294,7 +294,7 @@ 
 		);
 	}
 }
-elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
+elseif(is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
 {
 	$view_folder = APPPATH.strtr(
 			trim($view_folder, '/\\'),

Braces +18 added lines, -45 removed lines

@@ -63,8 +63,7 @@ 
  * Different environments will require different levels of error reporting.
  * By default development will show errors but testing and live will hide them.
  */
-switch (ENVIRONMENT)
-{
+switch (ENVIRONMENT) {
 	case 'development':
 		error_reporting(-1);
 		ini_set('display_errors', 1);
@@ -79,12 +78,9 @@ 
 	case 'testing':
 	case 'production':
 		ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
-		{
+		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);
 		}
 		break;
@@ -197,17 +193,13 @@ 
  */
 
 // Set the current directory correctly for CLI requests
-if (defined('STDIN'))
-{
+if (defined('STDIN')) {
 	chdir(dirname(__FILE__));
 }
 
-if (($_temp = realpath($system_path)) !== FALSE)
-{
+if (($_temp = realpath($system_path)) !== FALSE) {
 	$system_path = $_temp.DIRECTORY_SEPARATOR;
-}
-else
-{
+} else {
 	// Ensure there's a trailing slash
 	$system_path = strtr(
 		               rtrim($system_path, '/\\'),
@@ -217,8 +209,7 @@ 
 }
 
 // Is the system path correct?
-if ( ! is_dir($system_path))
-{
+if ( ! is_dir($system_path)) {
 	header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 	echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.pathinfo(__FILE__, PATHINFO_BASENAME);
 	exit(3); // EXIT_CONFIG
@@ -242,31 +233,23 @@ 
 define('SYSDIR', basename(BASEPATH));
 
 // The path to the "application" directory
-if (is_dir($application_folder))
-{
-	if (($_temp = realpath($application_folder)) !== FALSE)
-	{
+if (is_dir($application_folder)) {
+	if (($_temp = realpath($application_folder)) !== FALSE) {
 		$application_folder = $_temp;
-	}
-	else
-	{
+	} else {
 		$application_folder = strtr(
 			rtrim($application_folder, '/\\'),
 			'/\\',
 			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;
 	exit(3); // EXIT_CONFIG
@@ -275,35 +258,25 @@ 
 define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
 
 // The path to the "views" directory
-if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
-{
+if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR)) {
 	$view_folder = APPPATH.'views';
-}
-elseif (is_dir($view_folder))
-{
-	if (($_temp = realpath($view_folder)) !== FALSE)
-	{
+} elseif (is_dir($view_folder)) {
+	if (($_temp = realpath($view_folder)) !== FALSE) {
 		$view_folder = $_temp;
-	}
-	else
-	{
+	} else {
 		$view_folder = strtr(
 			rtrim($view_folder, '/\\'),
 			'/\\',
 			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;
 	exit(3); // EXIT_CONFIG

application/tests/controllers/User/Auth/Login_test.php

Spacing +10 added lines, -10 removed lines

@@ -9,7 +9,7 @@ 
 	public function test_index_logged_in() {
 		//user is already logged in, redirect to dashboard
 		$this->request->setCallablePreConstructor(
-			function () {
+			function() {
 				$ion_auth = $this->getMock_ion_auth_logged_in();
 				load_class_instance('ion_auth', $ion_auth);
 			}
@@ -30,7 +30,7 @@ 
 		$this->markTestIncomplete('This test is broken for now.');
 
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -44,7 +44,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$user = $this->getDouble(
 					'User_Model',
 					['find_email_from_identity' => 'foobar']
@@ -56,7 +56,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['login' => TRUE]
@@ -77,7 +77,7 @@ 
 		$this->markTestIncomplete('This test is broken for now.');
 
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -91,7 +91,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$user = $this->getDouble(
 					'User_Model',
 					['find_email_from_identity' => 'foobar']
@@ -103,7 +103,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['login' => TRUE]
@@ -115,7 +115,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				// Get mock object
 				$session = $this->getDouble(
 					'CI_Session',
@@ -134,7 +134,7 @@ 
 	public function test_login_validation_fail() {
 		//user isn't logged in, validation failed, this is happens on the first time loading the page
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				// Get mock object
 				$validation = $this->getDouble(
 					'CI_Form_validation',
@@ -156,7 +156,7 @@ 
 	public function test_login_validation_pass_but_login_fail() {
 		//user isn't logged in, tried to login, validation succeeded but login failed
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				// Get mock object
 				$validation = $this->getDouble(
 					'CI_Form_validation',

application/tests/controllers/User/Auth/Signup_test.php

Spacing +16 added lines, -16 removed lines

@@ -6,7 +6,7 @@ 
 		$this->assertResponseCode(200);
 
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble('Auth_Model', ['verification_check' => 'foobar']);
 				$this->verifyInvokedOnce($auth, 'verification_check');
 				$CI->Auth = $auth;
@@ -19,7 +19,7 @@ 
 	public function test_index_logged_in() {
 		//user is already logged in, redirect to dashboard
 		$this->request->setCallablePreConstructor(
-			function () {
+			function() {
 				$ion_auth = $this->getMock_ion_auth_logged_in();
 				load_class_instance('ion_auth', $ion_auth);
 			}
@@ -37,7 +37,7 @@ 
 
 	public function test_signup_p1_validation_pass_verification_pass() {
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -51,7 +51,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-				function ($CI) {
+				function($CI) {
 					$auth = $this->getDouble('Auth_Model', ['verification_start' => TRUE]);
 					$this->verifyInvokedOnce($auth, 'verification_start');
 					$CI->Auth = $auth;
@@ -65,7 +65,7 @@ 
 	}
 	public function test_signup_p1_validation_pass_verification_fail() {
 		$this->request->setCallable(
-				function ($CI) {
+				function($CI) {
 					$validation = $this->getDouble(
 							'CI_Form_validation',
 							['set_rules' => NULL, 'run' => TRUE]
@@ -79,7 +79,7 @@ 
 				}
 		);
 		$this->request->addCallable(
-				function ($CI) {
+				function($CI) {
 					$auth = $this->getDouble('Auth_Model', ['verification_start' => FALSE]);
 					$this->verifyInvokedOnce($auth, 'verification_start');
 					$CI->Auth = $auth;
@@ -93,7 +93,7 @@ 
 	}
 	public function test_signup_p1_validation_fail() {
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => FALSE, 'set_value' => '']
@@ -115,14 +115,14 @@ 
 		//form was valid, and register was successful, user is redirected to dashboard
 
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble('Auth_Model', ['verification_check' => 'foo@bar.com']);
 				$this->verifyInvokedOnce($auth, 'verification_check');
 				$CI->Auth = $auth;
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -136,7 +136,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['register' => TRUE]
@@ -154,14 +154,14 @@ 
 	public function test_signup_p2_verification_pass_validation_pass_register_fail() {
 		//form was valid, and register was unsuccessful, reshow form
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble('Auth_Model', ['verification_check' => 'foo@bar.com']);
 				$this->verifyInvokedOnce($auth, 'verification_check');
 				$CI->Auth = $auth;
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE, 'set_value' => 'foobar']
@@ -176,7 +176,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['register' => FALSE, 'errors' => FALSE, 'logged_in' => FALSE]
@@ -194,14 +194,14 @@ 
 	public function test_signup_p2_verification_pass_validation_fail() {
 		//validation failed, this is probably the first time the user visits the page, show form
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble('Auth_Model', ['verification_check' => 'foo@bar.com']);
 				$this->verifyInvokedOnce($auth, 'verification_check');
 				$CI->Auth = $auth;
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => FALSE, 'set_value' => '']
@@ -222,7 +222,7 @@ 
 	public function test_signup_p2_verification_fail() {
 		//validation failed, this is probably the first time the user visits the page, show form
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble('Auth_Model', ['verification_check' => FALSE]);
 				$this->verifyInvokedOnce($auth, 'verification_check');
 				$CI->Auth = $auth;

application/tests/controllers/User/Auth/Forgot_Password_test.php

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 
 
 		$this->request->setCallablePreConstructor(
-			function () {
+			function() {
 				$ion_auth = $this->getMock_ion_auth_logged_in();
 				load_class_instance('ion_auth', $ion_auth);
 			}
@@ -38,7 +38,7 @@ 
 	public function test_forgot_password_validation_pass() {
 		//user isn't logged in, form is valid, user is shown success page regardless of if email is used
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -52,7 +52,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['forgotten_password' => TRUE, 'row' => (object) ['email' => 'foo@bar.com'], 'logged_in' => FALSE]
@@ -72,7 +72,7 @@ 
 	public function test_forgot_password_validation_fail() {
 		//user isn't logged in, form is invalid, this is usually the case when first viewing the page
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => FALSE]
@@ -93,7 +93,7 @@ 
 	public function test_reset_password_user_pass_validation_pass_change_fail() {
 		//reset code is valid, form is invalid (or new)
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['forgotten_password_check' => TRUE, 'reset_password' => FALSE]
@@ -105,7 +105,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -126,7 +126,7 @@ 
 	public function test_reset_password_user_pass_validation_pass_change_pass() {
 		//reset code is valid, form is valid, password change was successful, redirect to login
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['forgotten_password_check' => TRUE, 'reset_password' => TRUE]
@@ -138,7 +138,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -159,7 +159,7 @@ 
 	public function test_reset_password_user_pass_validation_fail() {
 		//reset code is valid, form is valid, password change was unsuccessful, send back to reset_password page
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['forgotten_password_check' => TRUE, 'logged_in' => FALSE]

application/tests/controllers/IndexC_test.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
 	public function test_APPPATH() {
 		$actual   = realpath(APPPATH);
-		$expected = realpath(__DIR__ . '/../..');
+		$expected = realpath(__DIR__.'/../..');
 		$this->assertEquals(
 			$expected,
 			$actual,

application/tests/TestCase.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 		                  ->disableOriginalConstructor()
 		                  ->getMock();
 
-		foreach ($methods as $method => $return) {
+		foreach($methods as $method => $return) {
 			$db_result->method($method)->willReturn($return);
 		}
 		return $db_result;

application/tests/Bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -54,7 +54,7 @@ 
  * NOTE: If you change these, also change the error_reporting() code below
  */
 // This is needed for @runInSeparateProcess
-if (! defined('ENVIRONMENT'))
+if(!defined('ENVIRONMENT'))
 {
 	define('ENVIRONMENT', 'testing');
 }
@@ -67,7 +67,7 @@ 
  * Different environments will require different levels of error reporting.
  * By default development will show errors but testing and live will hide them.
  */
-switch (ENVIRONMENT)
+switch(ENVIRONMENT)
 {
 	case 'testing':
 	case 'development':
@@ -77,7 +77,7 @@ 
 
 	case 'production':
 		ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
+		if(version_compare(PHP_VERSION, '5.3', '>='))
 		{
 			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 		}
@@ -200,7 +200,7 @@ 
 		chdir(dirname(__FILE__));
 //	}
 
-	if (($_temp = realpath($system_path)) !== FALSE)
+	if(($_temp = realpath($system_path)) !== FALSE)
 	{
 		$system_path = $_temp.'/';
 	}
@@ -211,7 +211,7 @@ 
 	}
 
 	// Is the system path correct?
-	if ( ! is_dir($system_path))
+	if(!is_dir($system_path))
 	{
 		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 		echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.pathinfo(__FILE__, PATHINFO_BASENAME);
@@ -236,9 +236,9 @@ 
 	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
 
 	// The path to the "application" folder
-	if (is_dir($application_folder))
+	if(is_dir($application_folder))
 	{
-		if (($_temp = realpath($application_folder)) !== FALSE)
+		if(($_temp = realpath($application_folder)) !== FALSE)
 		{
 			$application_folder = $_temp;
 		}
@@ -247,7 +247,7 @@ 
 	}
 	else
 	{
-		if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
+		if(!is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
 		{
 			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;
@@ -258,13 +258,13 @@ 
 	}
 
 	// The path to the "views" folder
-	if ( ! is_dir($view_folder))
+	if(!is_dir($view_folder))
 	{
-		if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
+		if(!empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
 		{
 			$view_folder = APPPATH.$view_folder;
 		}
-		elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
+		elseif(!is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
 		{
 			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;
@@ -276,7 +276,7 @@ 
 		}
 	}
 
-	if (($_temp = realpath($view_folder)) !== FALSE)
+	if(($_temp = realpath($view_folder)) !== FALSE)
 	{
 		$view_folder = $_temp.DIRECTORY_SEPARATOR;
 	}
@@ -327,5 +327,5 @@ 
  *  Added for CI PHPUnit Test
  * -------------------------------------------------------------------
  */
-require __DIR__ . '/_ci_phpunit_test/CIPHPUnitTest.php';
+require __DIR__.'/_ci_phpunit_test/CIPHPUnitTest.php';
 CIPHPUnitTest::init();

Braces +17 added lines, -40 removed lines

@@ -54,8 +54,7 @@ 
  * NOTE: If you change these, also change the error_reporting() code below
  */
 // This is needed for @runInSeparateProcess
-if (! defined('ENVIRONMENT'))
-{
+if (! defined('ENVIRONMENT')) {
 	define('ENVIRONMENT', 'testing');
 }
 
@@ -67,8 +66,7 @@ 
  * Different environments will require different levels of error reporting.
  * By default development will show errors but testing and live will hide them.
  */
-switch (ENVIRONMENT)
-{
+switch (ENVIRONMENT) {
 	case 'testing':
 	case 'development':
 		error_reporting(-1);
@@ -77,12 +75,9 @@ 
 
 	case 'production':
 		ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
-		{
+		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);
 		}
 	break;
@@ -200,19 +195,15 @@ 
 		chdir(dirname(__FILE__));
 //	}
 
-	if (($_temp = realpath($system_path)) !== FALSE)
-	{
+	if (($_temp = realpath($system_path)) !== FALSE) {
 		$system_path = $_temp.'/';
-	}
-	else
-	{
+	} else {
 		// Ensure there's a trailing slash
 		$system_path = rtrim($system_path, '/').'/';
 	}
 
 	// Is the system path correct?
-	if ( ! is_dir($system_path))
-	{
+	if ( ! is_dir($system_path)) {
 		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 		echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.pathinfo(__FILE__, PATHINFO_BASENAME);
 		exit(3); // EXIT_CONFIG
@@ -236,19 +227,14 @@ 
 	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
 
 	// The path to the "application" folder
-	if (is_dir($application_folder))
-	{
-		if (($_temp = realpath($application_folder)) !== FALSE)
-		{
+	if (is_dir($application_folder)) {
+		if (($_temp = realpath($application_folder)) !== FALSE) {
 			$application_folder = $_temp;
 		}
 
 		define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
-	}
-	else
-	{
-		if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
-		{
+	} else {
+		if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR)) {
 			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;
 			exit(3); // EXIT_CONFIG
@@ -258,30 +244,21 @@ 
 	}
 
 	// The path to the "views" folder
-	if ( ! is_dir($view_folder))
-	{
-		if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
-		{
+	if ( ! is_dir($view_folder)) {
+		if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR)) {
 			$view_folder = APPPATH.$view_folder;
-		}
-		elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
-		{
+		} elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR)) {
 			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;
 			exit(3); // EXIT_CONFIG
-		}
-		else
-		{
+		} else {
 			$view_folder = APPPATH.'views';
 		}
 	}
 
-	if (($_temp = realpath($view_folder)) !== FALSE)
-	{
+	if (($_temp = realpath($view_folder)) !== FALSE) {
 		$view_folder = $_temp.DIRECTORY_SEPARATOR;
-	}
-	else
-	{
+	} else {
 		$view_folder = rtrim($view_folder, '/\\').DIRECTORY_SEPARATOR;
 	}
 

application/tests/mocks/autoloader.php

Spacing +11 added lines, -11 removed lines

@@ -60,49 +60,49 @@ 
 
 	$ci_drivers = array('Session', 'Cache');
 
-	if (strpos($class, 'Mock_') === 0)
+	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);
 
-		if (in_array($subclass, $ci_core))
+		if(in_array($subclass, $ci_core))
 		{
 			$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';
+			$file = $dir.str_replace(array('CI_DB', 'active_record'), array('DB', 'active_rec'), $subclass).'.php';
 		}
 		else
 		{
@@ -112,7 +112,7 @@ 
 
 	$file = isset($file) ? $file : $dir.$class.'.php';
 
-	if ( ! file_exists($file))
+	if(!file_exists($file))
 	{
 		return FALSE;
 	}

Braces +12 added lines, -31 removed lines

@@ -11,8 +11,7 @@ 
 // $mock_table = new Mock_Libraries_Table(); 			// Will load ./mocks/libraries/table.php
 // $mock_database_driver = new Mock_Database_Driver();	// Will load ./mocks/database/driver.php
 // and so on...
-function autoload($class)
-{
+function autoload($class) {
 	$dir = realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR;
 
 	$ci_core = array(
@@ -60,60 +59,42 @@ 
 
 	$ci_drivers = array('Session', 'Cache');
 
-	if (strpos($class, 'Mock_') === 0)
-	{
+	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);
 
-		if (in_array($subclass, $ci_core))
-		{
+		if (in_array($subclass, $ci_core)) {
 			$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);
 		}
 	}
 
 	$file = isset($file) ? $file : $dir.$class.'.php';
 
-	if ( ! file_exists($file))
-	{
+	if ( ! file_exists($file)) {
 		return FALSE;
 	}
 

application/tests/mocks/libraries/email.php

Braces +9 added lines, -18 removed lines

@@ -8,8 +8,7 @@ 
  * @link       https://github.com/kenjis/ci-phpunit-test
  */
 
-class Mock_Libraries_Email
-{
+class Mock_Libraries_Email {
 	private $data = [];
 
 	/**
@@ -17,43 +16,35 @@ 
 	 */
 	public $return_send = TRUE;
 
-	public function initialize()
-	{
+	public function initialize() {
 		
 	}
 
-	public function from($from)
-	{
+	public function from($from) {
 		$this->data['from'] = $from;
 	}
 
-	public function to($to)
-	{
+	public function to($to) {
 		$this->data['to'] = $to;
 	}
 
-	public function bcc($bcc)
-	{
+	public function bcc($bcc) {
 		$this->data['bcc'] = $bcc;
 	}
 
-	public function subject($subject)
-	{
+	public function subject($subject) {
 		$this->data['subject'] = $subject;
 	}
 
-	public function message($message)
-	{
+	public function message($message) {
 		$this->data['message'] = $message;
 	}
 
-	public function send()
-	{
+	public function send() {
 		return $this->return_send;
 	}
 
-	public function _get_data()
-	{
+	public function _get_data() {
 		return $this->data;
 	}
 }