kenjis / ci-phpunit-test

application/tests/controllers/Welcome_test.php

Spacing +1 added lines, -1 removed lines

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

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Part of ci-phpunit-test
- *
- * @author     Kenji Suzuki <https://github.com/kenjis>
- * @license    MIT License
- * @copyright  2015 Kenji Suzuki
- * @link       https://github.com/kenjis/ci-phpunit-test
- */
+	 * Part of ci-phpunit-test
+	 *
+	 * @author     Kenji Suzuki <https://github.com/kenjis>
+	 * @license    MIT License
+	 * @copyright  2015 Kenji Suzuki
+	 * @link       https://github.com/kenjis/ci-phpunit-test
+	 */
 
 class Welcome_test extends TestCase
 {

application/tests/mocks/autoloader.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 		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
 		{

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);
 		}

update.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  * @link       https://github.com/kenjis/ci-phpunit-test
  */
 
-require __DIR__ . '/Installer.php';
+require __DIR__.'/Installer.php';
 
 $installer = new Installer();
 $installer->update();

application/tests/_ci_phpunit_test/functions.php

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
 		{
 			$patched = true;
 			$new_source = static::generateNewSource($source);
-		}
-		else
+		} else
 		{
 			$new_source = $source;
 		}

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,7 @@ 
 	is_loaded('', TRUE);
 
 	// Close db connection
-	$CI =& get_instance();
+	$CI = & get_instance();
 	if (isset($CI->db))
 	{
 		if (
@@ -49,25 +49,25 @@ 
 	}
 
 	// Load core classes
-	$BM =& load_class('Benchmark', 'core');
+	$BM = & load_class('Benchmark', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('BM', $BM);
-	$EXT =& load_class('Hooks', 'core');
+	$EXT = & load_class('Hooks', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT);
-	$CFG =& load_class('Config', 'core');
+	$CFG = & load_class('Config', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG);
-	$UNI =& load_class('URI', 'core');
+	$UNI = & load_class('URI', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI);
 //	$URI =& load_class('Utf8', 'core');
 //	CIPHPUnitTestSuperGlobal::set_Global('URI', $URI);
-	$RTR =& load_class('Router', 'core');
+	$RTR = & load_class('Router', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR);
-	$OUT =& load_class('Output', 'core');
+	$OUT = & load_class('Output', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT);
-	$SEC =& load_class('Security', 'core');
+	$SEC = & load_class('Security', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC);
-	$IN =& load_class('Input', 'core');
+	$IN = & load_class('Input', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('IN', $IN);
-	$LANG =& load_class('Lang', 'core');
+	$LANG = & load_class('Lang', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG);
 
 	CIPHPUnitTest::loadLoader();

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Part of ci-phpunit-test
- *
- * @author     Kenji Suzuki <https://github.com/kenjis>
- * @license    MIT License
- * @copyright  2015 Kenji Suzuki
- * @link       https://github.com/kenjis/ci-phpunit-test
- */
+	 * Part of ci-phpunit-test
+	 *
+	 * @author     Kenji Suzuki <https://github.com/kenjis>
+	 * @license    MIT License
+	 * @copyright  2015 Kenji Suzuki
+	 * @link       https://github.com/kenjis/ci-phpunit-test
+	 */
 
 /**
  * Inject instance to load_class() function

install.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  * @link       https://github.com/kenjis/ci-phpunit-test
  */
 
-require __DIR__ . '/Installer.php';
+require __DIR__.'/Installer.php';
 
 $installer = new Installer();
 $installer->update();

application/tests/_ci_phpunit_test/CIPHPUnitTestDouble.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
 		// methods in it. But we can't use them in
 		// `$this->request->setCallablePreConstructor()`
 		$mock = $this->testCase->getMockBuilder($classname);
-		if (! $enable_constructor)
+		if ( ! $enable_constructor)
 		{
 			$mock->disableOriginalConstructor();
 		}
@@ -96,7 +96,7 @@ 
 				break;
 			default:
 				throw new RuntimeException(
-					'Sorry, ' . $count . ' params not implemented yet'
+					'Sorry, '.$count.' params not implemented yet'
 				);
 		}
 	}

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Part of ci-phpunit-test
- *
- * @author     Kenji Suzuki <https://github.com/kenjis>
- * @license    MIT License
- * @copyright  2015 Kenji Suzuki
- * @link       https://github.com/kenjis/ci-phpunit-test
- */
+	 * Part of ci-phpunit-test
+	 *
+	 * @author     Kenji Suzuki <https://github.com/kenjis>
+	 * @license    MIT License
+	 * @copyright  2015 Kenji Suzuki
+	 * @link       https://github.com/kenjis/ci-phpunit-test
+	 */
 
 class CIPHPUnitTestDouble
 {

application/tests/_ci_phpunit_test/TestSuiteProvider.php

Indentation +65 added lines, -65 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * Test Suite Provider for NetBeans
- * https://github.com/BrickieToolShed/netbeans-phpunit-support
- * 
- * Modified 2015 by Kenji Suzuki <https://github.com/kenjis>
- * @link       https://github.com/kenjis/ci-phpunit-test
- */
+	 * Test Suite Provider for NetBeans
+	 * https://github.com/BrickieToolShed/netbeans-phpunit-support
+	 * 
+	 * Modified 2015 by Kenji Suzuki <https://github.com/kenjis>
+	 * @link       https://github.com/kenjis/ci-phpunit-test
+	 */
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 /**
@@ -52,71 +52,71 @@ 
  */
 final class TestSuiteProvider
 {
-    /**
-     * phpunit configuration file
-     *
-     * @var string
-     */
-    private static $file;
+	/**
+	 * phpunit configuration file
+	 *
+	 * @var string
+	 */
+	private static $file;
 
-    /**
-     * constructor
-     */
-    private function __construct() {}
+	/**
+	 * constructor
+	 */
+	private function __construct() {}
 
-    /**
-     * set the phpunit configuration file
-     *
-     * @param string $file the path or filename of the phunit configuration file
-     */
-    public static function setConfigurationFile($file)
-    {
-        static::$file = $file;
-    }
+	/**
+	 * set the phpunit configuration file
+	 *
+	 * @param string $file the path or filename of the phunit configuration file
+	 */
+	public static function setConfigurationFile($file)
+	{
+		static::$file = $file;
+	}
 
-    /**
-     * get the phpunit test suite instance
-     *
-     * @return PHPUnit_Framework_TestSuite returns the phpunit test suite instance
-     * @throws FileNotFoundException       if the file is not found
-     */
-    public static function suite()
-    {
-        $file = static::checkConfigurationFile(
-            static::getConfigurationFile()
-        );
+	/**
+	 * get the phpunit test suite instance
+	 *
+	 * @return PHPUnit_Framework_TestSuite returns the phpunit test suite instance
+	 * @throws FileNotFoundException       if the file is not found
+	 */
+	public static function suite()
+	{
+		$file = static::checkConfigurationFile(
+			static::getConfigurationFile()
+		);
 
-        return PHPUnit_Util_Configuration::getInstance($file)
-            ->getTestSuiteConfiguration();
-    }
+		return PHPUnit_Util_Configuration::getInstance($file)
+			->getTestSuiteConfiguration();
+	}
 
-    /**
-     * get the phpunit configuration file
-     *
-     * @return string
-     */
-    private static function getConfigurationFile()
-    {
-        static::$file = isset(static::$file)
-            ? static::$file
-            : APPPATH.'tests/phpunit.xml';
+	/**
+	 * get the phpunit configuration file
+	 *
+	 * @return string
+	 */
+	private static function getConfigurationFile()
+	{
+		static::$file = isset(static::$file)
+			? static::$file
+			: APPPATH.'tests/phpunit.xml';
 
-        return static::$file;
-    }
+		return static::$file;
+	}
 
-    /**
-     * check the given file
-     *
-     * @param  string                $file file to check
-     * @return string                returns the file if it is valid
-     * @throws FileNotFoundException if the file is not found
-     */
-    private static function checkConfigurationFile($file)
-    {
-        if (!file_exists($file)) {
-            throw new \RuntimeException("The requested phpunit configuration was not found at $file");
-        }
+	/**
+	 * check the given file
+	 *
+	 * @param  string                $file file to check
+	 * @return string                returns the file if it is valid
+	 * @throws FileNotFoundException if the file is not found
+	 */
+	private static function checkConfigurationFile($file)
+	{
+		if (!file_exists($file)) {
+			throw new \RuntimeException("The requested phpunit configuration was not found at $file");
+		}
 
-        return $file;
-    }
+		return $file;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
      */
     private static function checkConfigurationFile($file)
     {
-        if (!file_exists($file)) {
+        if ( ! file_exists($file)) {
             throw new \RuntimeException("The requested phpunit configuration was not found at $file");
         }
 

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

Doc Comments +5 added lines, -5 removed lines

@@ -233,7 +233,7 @@ 
 	/**
 	 * Fetch an item from the GET array
 	 *
-	 * @param	mixed	$index		Index for item to be fetched from $_GET
+	 * @param	string	$index		Index for item to be fetched from $_GET
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
 	 * @return	mixed
 	 */
@@ -247,7 +247,7 @@ 
 	/**
 	 * Fetch an item from the POST array
 	 *
-	 * @param	mixed	$index		Index for item to be fetched from $_POST
+	 * @param	string	$index		Index for item to be fetched from $_POST
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
 	 * @return	mixed
 	 */
@@ -307,9 +307,9 @@ 
 	/**
 	 * Fetch an item from the SERVER array
 	 *
-	 * @param	mixed	$index		Index for item to be fetched from $_SERVER
+	 * @param	string	$index		Index for item to be fetched from $_SERVER
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
-	 * @return	mixed
+	 * @return	string
 	 */
 	public function server($index, $xss_clean = NULL)
 	{
@@ -892,7 +892,7 @@ 
 	 * Allows read access to protected properties
 	 *
 	 * @param	string	$name
-	 * @return	mixed
+	 * @return	string|null
 	 */
 	public function __get($name)
 	{

Spacing +7 added lines, -7 removed lines

@@ -137,17 +137,17 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_allow_get_array		= (config_item('allow_get_array') === TRUE);
-		$this->_enable_xss		= (config_item('global_xss_filtering') === TRUE);
-		$this->_enable_csrf		= (config_item('csrf_protection') === TRUE);
-		$this->_standardize_newlines	= (bool) config_item('standardize_newlines');
+		$this->_allow_get_array = (config_item('allow_get_array') === TRUE);
+		$this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
+		$this->_enable_csrf = (config_item('csrf_protection') === TRUE);
+		$this->_standardize_newlines = (bool) config_item('standardize_newlines');
 
-		$this->security =& load_class('Security', 'core');
+		$this->security = & load_class('Security', 'core');
 
 		// Do we need the UTF-8 class?
 		if (UTF8_ENABLED === TRUE)
 		{
-			$this->uni =& load_class('Utf8', 'core');
+			$this->uni = & load_class('Utf8', 'core');
 		}
 
 		// Sanitize global arrays
@@ -413,7 +413,7 @@ 
 
 		// Save cookie in Output object
 		// added by ci-phpunit-test
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$output = $CI->output;
 		$output->_cookies[$prefix.$name][] = [
 			'value' => $value,

Braces +16 added lines, -23 removed lines

@@ -196,29 +196,30 @@ 
 		if (isset($array[$index]))
 		{
 			$value = $array[$index];
-		}
-		elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) // Does the index contain array notation
+		} elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) {
+			// Does the index contain array notation
 		{
 			$value = $array;
+		}
 			for ($i = 0; $i < $count; $i++)
 			{
 				$key = trim($matches[0][$i], '[]');
-				if ($key === '') // Empty notation will return the value as array
+				if ($key === '') {
+					// Empty notation will return the value as array
 				{
 					break;
 				}
+				}
 
 				if (isset($value[$key]))
 				{
 					$value = $value[$key];
-				}
-				else
+				} else
 				{
 					return NULL;
 				}
 			}
-		}
-		else
+		} else
 		{
 			return NULL;
 		}
@@ -403,8 +404,7 @@ 
 		if ( ! is_numeric($expire))
 		{
 			$expire = time() - 86500;
-		}
-		else
+		} else
 		{
 			$expire = ($expire > 0) ? time() + $expire : 0;
 		}
@@ -463,8 +463,7 @@ 
 					if ( ! $this->valid_ip($spoof))
 					{
 						$spoof = NULL;
-					}
-					else
+					} else
 					{
 						break;
 					}
@@ -517,8 +516,7 @@ 
 							}
 
 							$sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b';
-						}
-						else
+						} else
 						{
 							$ip = explode('.', $this->ip_address);
 							$sprintf = '%08b%08b%08b%08b';
@@ -538,8 +536,7 @@ 
 						{
 							$netaddr[$i] = intval($netaddr[$i], 16);
 						}
-					}
-					else
+					} else
 					{
 						$netaddr = explode('.', $netaddr);
 					}
@@ -620,8 +617,7 @@ 
 		if ($this->_allow_get_array === FALSE)
 		{
 			$_GET = array();
-		}
-		elseif (is_array($_GET))
+		} elseif (is_array($_GET))
 		{
 			foreach ($_GET as $key => $val)
 			{
@@ -657,8 +653,7 @@ 
 				if (($cookie_key = $this->_clean_input_keys($key)) !== FALSE)
 				{
 					$_COOKIE[$cookie_key] = $this->_clean_input_data($val);
-				}
-				else
+				} else
 				{
 					unset($_COOKIE[$key]);
 				}
@@ -744,8 +739,7 @@ 
 			if ($fatal === TRUE)
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				set_status_header(503);
 				echo 'Disallowed Key Characters.';
@@ -900,8 +894,7 @@ 
 		{
 			isset($this->_raw_input_stream) OR $this->_raw_input_stream = file_get_contents('php://input');
 			return $this->_raw_input_stream;
-		}
-		elseif ($name === 'ip_address')
+		} elseif ($name === 'ip_address')
 		{
 			return $this->ip_address;
 		}

application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php

Spacing +10 added lines, -10 removed lines

@@ -41,7 +41,7 @@ 
 			return $this->$name;
 		}
 
-		throw new LogicException('No such property: ' . $name);
+		throw new LogicException('No such property: '.$name);
 	}
 
 	public static function setUpBeforeClass()
@@ -61,7 +61,7 @@ 
 	{
 		reset_instance();
 		new CI_Controller();
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 	}
 
 	protected function tearDown()
@@ -236,7 +236,7 @@ 
 		$this->assertSame(
 			$code,
 			$actual,
-			'Status code is not ' . $code . ' but ' . $actual . '.'
+			'Status code is not '.$code.' but '.$actual.'.'
 		);
 	}
 
@@ -248,7 +248,7 @@ 
 	 */
 	public function assertResponseHeader($name, $value)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$actual = $CI->output->get_header($name);
 
 		if ($actual === null)
@@ -272,7 +272,7 @@ 
 	 */
 	public function assertResponseCookie($name, $value, $allow_duplicate = false)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$cookies = isset($CI->output->_cookies[$name])
 			? $CI->output->_cookies[$name] : null;
 
@@ -330,18 +330,18 @@ 
 			$this->fail('redirect() is not called.');
 		}
 
-		if (! function_exists('site_url'))
+		if ( ! function_exists('site_url'))
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->load->helper('url');
 		}
 		$absolute_url = site_url($uri);
-		$expected = 'Redirect to ' . $absolute_url;
+		$expected = 'Redirect to '.$absolute_url;
 
 		$this->assertSame(
 			$expected,
 			$status['redirect'],
-			'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.'
+			'URL to redirect is not '.$expected.' but '.$status['redirect'].'.'
 		);
 
 		if ($code !== null)
@@ -349,7 +349,7 @@ 
 			$this->assertSame(
 				$code,
 				$status['code'],
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
+				'Status code is not '.$code.' but '.$status['code'].'.'
 			);
 		}
 	}

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Part of ci-phpunit-test
- *
- * @author     Kenji Suzuki <https://github.com/kenjis>
- * @license    MIT License
- * @copyright  2015 Kenji Suzuki
- * @link       https://github.com/kenjis/ci-phpunit-test
- */
+	 * Part of ci-phpunit-test
+	 *
+	 * @author     Kenji Suzuki <https://github.com/kenjis>
+	 * @license    MIT License
+	 * @copyright  2015 Kenji Suzuki
+	 * @link       https://github.com/kenjis/ci-phpunit-test
+	 */
 
 /**
  * @property CIPHPUnitTestRequest    $request