kenjis / ci-phpunit-test

application/tests/_ci_phpunit_test/replacing/helpers/download_helper.php

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 			}
 
 			// Load the mime types
-			$mimes =& get_mimes();
+			$mimes = & get_mimes();
 
 			// Only change the default MIME if we can find one
 			if (isset($mimes[$extension]))
@@ -146,7 +146,7 @@ 
 
 		if (ENVIRONMENT === 'testing')
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->output->set_header('Content-Type: '.$mime);
 			$CI->output->set_header('Content-Disposition: attachment; filename="'.$filename.'"');
 			$CI->output->set_header('Expires: 0');

application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php

Spacing +12 added lines, -12 removed lines

@@ -49,7 +49,7 @@ 
 			return $this->$name;
 		}
 
-		throw new LogicException('No such property: ' . $name);
+		throw new LogicException('No such property: '.$name);
 	}
 
 	public static function setUpBeforeClass()
@@ -72,7 +72,7 @@ 
 	{
 		reset_instance();
 		CIPHPUnitTest::createCodeIgniterInstance();
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 	}
 
 	/**
@@ -85,7 +85,7 @@ 
 	{
 		reset_instance();
 		$controller = new $classname;
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 		return $controller;
 	}
 
@@ -266,7 +266,7 @@ 
 		$this->assertSame(
 			$code,
 			$actual,
-			'Status code is not ' . $code . ' but ' . $actual . '.'
+			'Status code is not '.$code.' but '.$actual.'.'
 		);
 	}
 
@@ -278,7 +278,7 @@ 
 	 */
 	public function assertResponseHeader($name, $value)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$actual = $CI->output->get_header($name);
 
 		if ($actual === null)
@@ -302,7 +302,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;
 
@@ -360,23 +360,23 @@ 
 			$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');
 		}
 
-		if (! preg_match('#^(\w+:)?//#i', $uri))
+		if ( ! preg_match('#^(\w+:)?//#i', $uri))
 		{
 			$uri = site_url($uri);
 		}
 		$absolute_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)
@@ -384,7 +384,7 @@ 
 			$this->assertSame(
 				$code,
 				$status['code'],
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
+				'Status code is not '.$code.' but '.$status['code'].'.'
 			);
 		}
 	}

application/tests/_ci_phpunit_test/CIPHPUnitTestSuperGlobal.php

Spacing +7 added lines, -7 removed lines

@@ -42,9 +42,9 @@ 
 		}
 
 		// Handle single file
-		$file =& $files[$field];
+		$file = & $files[$field];
 
-		if (! file_exists($file['tmp_name']))
+		if ( ! file_exists($file['tmp_name']))
 		{
 			$file['error'] = UPLOAD_ERR_NO_FILE;
 			$file['type'] = '';
@@ -110,7 +110,7 @@ 
 				// Set $_GET if URI string has query string
 				parse_str($query_string, $_GET);
 				// Remove query string from URI string
-				$argv = substr($argv, 0, -strlen($query_string)-1);
+				$argv = substr($argv, 0, -strlen($query_string) - 1);
 			}
 		}
 
@@ -143,12 +143,12 @@ 
 		if ($_GET !== [])
 		{
 			$_SERVER['REQUEST_URI'] =
-				'/' . $path . '?'
+				'/'.$path.'?'
 				. http_build_query($_GET);
 		}
 		else
 		{
-			$_SERVER['REQUEST_URI'] = '/' . $path;
+			$_SERVER['REQUEST_URI'] = '/'.$path;
 		}
 	}
 
@@ -165,7 +165,7 @@ 
 
 		if ($query_string === false)
 		{
-			throw new LogicException('Bad URI string: ' . $uri);
+			throw new LogicException('Bad URI string: '.$uri);
 		}
 
 		return $query_string;
@@ -190,7 +190,7 @@ 
 		}
 		else
 		{
-			$key = 'HTTP_' . $normalized_name;
+			$key = 'HTTP_'.$normalized_name;
 		}
 
 		$_SERVER[$key] = $value;

application/tests/_ci_phpunit_test/replacing/libraries/Upload.php

Spacing +13 added lines, -13 removed lines

@@ -293,8 +293,8 @@ 
 	{
 		empty($config) OR $this->initialize($config, FALSE);
 
-		$this->_mimes =& get_mimes();
-		$this->_CI =& get_instance();
+		$this->_mimes = & get_mimes();
+		$this->_CI = & get_instance();
 
 		log_message('info', 'Upload Class Initialized');
 	}
@@ -480,7 +480,7 @@ 
 			else
 			{
 				// An extension was provided, let's have it!
-				$this->file_ext	= $this->get_extension($this->_file_name_override);
+				$this->file_ext = $this->get_extension($this->_file_name_override);
 			}
 
 			if ( ! $this->is_allowed_filetype(TRUE))
@@ -493,7 +493,7 @@ 
 		// Convert the file size to kilobytes
 		if ($this->file_size > 0)
 		{
-			$this->file_size = round($this->file_size/1024, 2);
+			$this->file_size = round($this->file_size / 1024, 2);
 		}
 
 		// Is the file size within the allowed maximum?
@@ -818,10 +818,10 @@ 
 			{
 				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
 
-				$this->image_width	= $D[0];
-				$this->image_height	= $D[1];
-				$this->image_type	= isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
-				$this->image_size_str	= $D[3]; // string containing height and width
+				$this->image_width = $D[0];
+				$this->image_height = $D[1];
+				$this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
+				$this->image_size_str = $D[3]; // string containing height and width
 			}
 		}
 
@@ -869,7 +869,7 @@ 
 			$this->file_type = 'image/jpeg';
 		}
 
-		$img_mimes = array('image/gif',	'image/jpeg', 'image/png');
+		$img_mimes = array('image/gif', 'image/jpeg', 'image/png');
 
 		return in_array($this->file_type, $img_mimes, TRUE);
 	}
@@ -1011,7 +1011,7 @@ 
 			return FALSE;
 		}
 
-		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/',  $this->upload_path);
+		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path);
 		return TRUE;
 	}
 
@@ -1055,9 +1055,9 @@ 
 		$ext = '';
 		if (strpos($filename, '.') !== FALSE)
 		{
-			$parts		= explode('.', $filename);
-			$ext		= '.'.array_pop($parts);
-			$filename	= implode('.', $parts);
+			$parts = explode('.', $filename);
+			$ext = '.'.array_pop($parts);
+			$filename = implode('.', $parts);
 		}
 
 		return substr($filename, 0, ($length - strlen($ext))).$ext;

Installer.php

Spacing +12 added lines, -12 removed lines

@@ -22,8 +22,8 @@ 
     public function install($app = 'application')
     {
         $this->recursiveCopy(
-            dirname(__FILE__) . '/application/tests',
-            $app . '/' . static::TEST_FOLDER
+            dirname(__FILE__).'/application/tests',
+            $app.'/'.static::TEST_FOLDER
         );
         $this->fixPath($app);
     }
@@ -33,10 +33,10 @@ 
      */
     private function fixPath($app = 'application')
     {
-        $file = $app . '/' . static::TEST_FOLDER . '/Bootstrap.php';
+        $file = $app.'/'.static::TEST_FOLDER.'/Bootstrap.php';
         $contents = file_get_contents($file);
         
-        if (! file_exists('system')) {
+        if ( ! file_exists('system')) {
             if (file_exists('vendor/codeigniter/framework/system')) {
                 $contents = str_replace(
                     '$system_path = \'../../system\';',
@@ -48,7 +48,7 @@ 
             }
         }
         
-        if (! file_exists('index.php')) {
+        if ( ! file_exists('index.php')) {
             if (file_exists('public/index.php')) {
                 // CodeIgniter 3.0.6 and after
                 $contents = str_replace(
@@ -62,7 +62,7 @@ 
                     "define('FCPATH', realpath(dirname(__FILE__).'/../../public').'/');",
                     $contents
                 );
-            } elseif (file_exists($app . '/public/index.php')) {
+            } elseif (file_exists($app.'/public/index.php')) {
                 // CodeIgniter 3.0.6 and after
                 $contents = str_replace(
                     "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
@@ -92,10 +92,10 @@ 
 
     public function update($app = 'application')
     {
-        $target_dir = $app . '/' . static::TEST_FOLDER . '/_ci_phpunit_test';
+        $target_dir = $app.'/'.static::TEST_FOLDER.'/_ci_phpunit_test';
         $this->recursiveUnlink($target_dir);
         $this->recursiveCopy(
-            dirname(__FILE__) . '/application/tests/_ci_phpunit_test',
+            dirname(__FILE__).'/application/tests/_ci_phpunit_test',
             $target_dir
         );
     }
@@ -117,12 +117,12 @@ 
         
         foreach ($iterator as $file) {
             if ($file->isDir()) {
-                @mkdir($dst . '/' . $iterator->getSubPathName());
+                @mkdir($dst.'/'.$iterator->getSubPathName());
             } else {
-                $success = copy($file, $dst . '/' . $iterator->getSubPathName());
+                $success = copy($file, $dst.'/'.$iterator->getSubPathName());
                 if ($success) {
-                    if (! $this->silent) {
-                        echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
+                    if ( ! $this->silent) {
+                        echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
                     }
                 }
             }

application/tests/Bootstrap.php

Spacing +2 added lines, -2 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');
 }
@@ -357,7 +357,7 @@ 
  *  Added for ci-phpunit-test
  * -------------------------------------------------------------------
  */
-require __DIR__ . '/_ci_phpunit_test/CIPHPUnitTest.php';
+require __DIR__.'/_ci_phpunit_test/CIPHPUnitTest.php';
 CIPHPUnitTest::init();
 /*
  * Or you can set directories for autoloading

application/tests/_ci_phpunit_test/functions.php

Spacing +10 added lines, -10 removed lines

@@ -32,7 +32,7 @@ 
 	reset_config();
 
 	// Close db connection
-	$CI =& get_instance();
+	$CI = & get_instance();
 	if (isset($CI->db))
 	{
 		if (
@@ -52,25 +52,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();

application/tests/_ci_phpunit_test/CIPHPUnitTestRequest.php

Spacing +9 added lines, -9 removed lines

@@ -116,7 +116,7 @@ 
 	public function enableHooks()
 	{
 		$this->enableHooks = true;
-		$this->hooks =& load_class('Hooks', 'core');
+		$this->hooks = & load_class('Hooks', 'core');
 	}
 
 	/**
@@ -162,7 +162,7 @@ 
 			{
 				set_status_header($e->getCode());
 			}
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->output->_status['redirect'] = $e->getMessage();
 		}
 		// show_404()
@@ -224,17 +224,17 @@ 
 		$this->setRawInputStream($request_params);
 
 		// 404 checking
-		if (! class_exists($class) || ! method_exists($class, $method))
+		if ( ! class_exists($class) || ! method_exists($class, $method))
 		{
 			// If 404, CodeIgniter instance is not created yet. So create it here
 			// Because we need CI->output->_status to store info
-			$CI =& get_instance();
+			$CI = & get_instance();
 			if ($CI instanceof CIPHPUnitTestNullCodeIgniter)
 			{
 				CIPHPUnitTest::createCodeIgniterInstance();
 			}
 
-			show_404($class.'::'.$method . '() is not found');
+			show_404($class.'::'.$method.'() is not found');
 		}
 
 		$params = $argv;
@@ -296,7 +296,7 @@ 
 	{
 		if (is_string($string))
 		{
-			$INPUT =& load_class('Input', 'core');
+			$INPUT = & load_class('Input', 'core');
 			CIPHPUnitTestReflection::setPrivateProperty(
 				$INPUT,
 				'_raw_input_stream',
@@ -326,7 +326,7 @@ 
 			new CI();
 		}
 		$controller = new $class;
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		// Set CodeIgniter instance to TestCase
 		$this->testCase->setCI($CI);
@@ -372,8 +372,8 @@ 
 	 */
 	public function getStatus()
 	{
-		$CI =& get_instance();
-		if (! isset($CI->output->_status))
+		$CI = & get_instance();
+		if ( ! isset($CI->output->_status))
 		{
 			throw new LogicException('Status code is not set. You must call $this->request() first');
 		}

application/tests/_ci_phpunit_test/CIPHPUnitTestRouter.php

Spacing +3 added lines, -3 removed lines

@@ -19,8 +19,8 @@ 
 	 */
 	public function getRoute()
 	{
-		$RTR =& load_class('Router', 'core');
-		$URI =& load_class('URI', 'core');
+		$RTR = & load_class('Router', 'core');
+		$URI = & load_class('URI', 'core');
 
 		$e404 = FALSE;
 		$class = ucfirst($RTR->class);
@@ -57,7 +57,7 @@ 
 		{
 			// If 404, CodeIgniter instance is not created yet. So create it here.
 			// Because we need CI->output->_status
-			$CI =& get_instance();
+			$CI = & get_instance();
 			if ($CI instanceof CIPHPUnitTestNullCodeIgniter)
 			{
 				CIPHPUnitTest::createCodeIgniterInstance();