kenjis / ci-phpunit-test

application/tests/_ci_phpunit_test/CIPHPUnitTestDbTestCase.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 	{
 		if ($this->db === null)
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->load->database();
 			$this->db = $CI->db;
 		}
@@ -56,7 +56,7 @@ 
 	{
 		$this->checkDbConnId();
 		
-		if (! empty($this->insertCache))
+		if ( ! empty($this->insertCache))
 		{
 			foreach ($this->insertCache as $row)
 			{
@@ -83,7 +83,7 @@ 
 		$this->db->close();
 		$this->db = null;
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->load->database();
 		$this->db = $CI->db;
 	}

application/tests/_ci_phpunit_test/CIPHPUnitTestDouble.php

Doc Comments +5 added lines, -1 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param  string $classname
 	 * @param  array  $params             [method_name => return_value]
-	 * @param  mixed  $constructor_params false: disable constructor, array: constructor params
+	 * @param  boolean  $constructor_params false: disable constructor, array: constructor params
 	 *
 	 * @return mixed PHPUnit mock object
 	 */
@@ -95,6 +95,10 @@ 
 		return $mock;
 	}
 
+	/**
+	 * @param string $method
+	 * @param string $with
+	 */
 	protected function _verify($mock, $method, $params = null, $expects, $with)
 	{
 		$invocation = $mock->expects($expects)

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
 		if ($constructor_params === false)
 		{
 			$mockBuilder->disableOriginalConstructor();
-		}
-		elseif (is_array($constructor_params))
+		} elseif (is_array($constructor_params))
 		{
 			$mockBuilder->setConstructorArgs($constructor_params);
 		}

application/tests/_ci_phpunit_test/replacing/helpers/old/3.1.9-download_helper.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,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]))
@@ -117,7 +117,7 @@ 
 
 		if (TestCase::isTestingEnv())
 		{
-			$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');

Braces +4 added lines, -8 removed lines

@@ -38,8 +38,7 @@ 
 		if ($filename === '' OR $data === '')
 		{
 			return;
-		}
-		elseif ($data === NULL)
+		} elseif ($data === NULL)
 		{
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
 			{
@@ -49,8 +48,7 @@ 
 			$filepath = $filename;
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
 			$filename = end($filename);
-		}
-		else
+		} else
 		{
 			$filesize = strlen($data);
 		}
@@ -137,8 +135,7 @@ 
 			if ( ! TestCase::isTestingEnv())
 			{
 				exit($data);
-			}
-			else
+			} else
 			{
 				echo($data);
 				throw new CIPHPUnitTestExitException('exit() from force_download()');
@@ -155,8 +152,7 @@ 
 		if ( ! TestCase::isTestingEnv())
 		{
 			exit;
-		}
-		else
+		} else
 		{
 			throw new CIPHPUnitTestExitException('exit() from force_download()');
 		}

application/tests/_ci_phpunit_test/replacing/helpers/old/3.1.8-download_helper.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,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]))
@@ -117,7 +117,7 @@ 
 
 		if (TestCase::isTestingEnv())
 		{
-			$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');

Braces +4 added lines, -8 removed lines

@@ -38,8 +38,7 @@ 
 		if ($filename === '' OR $data === '')
 		{
 			return;
-		}
-		elseif ($data === NULL)
+		} elseif ($data === NULL)
 		{
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
 			{
@@ -49,8 +48,7 @@ 
 			$filepath = $filename;
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
 			$filename = end($filename);
-		}
-		else
+		} else
 		{
 			$filesize = strlen($data);
 		}
@@ -137,8 +135,7 @@ 
 			if ( ! TestCase::isTestingEnv())
 			{
 				exit($data);
-			}
-			else
+			} else
 			{
 				echo($data);
 				throw new CIPHPUnitTestExitException('exit() from force_download()');
@@ -155,8 +152,7 @@ 
 		if ( ! TestCase::isTestingEnv())
 		{
 			exit;
-		}
-		else
+		} else
 		{
 			throw new CIPHPUnitTestExitException('exit() from force_download()');
 		}

application/tests/_ci_phpunit_test/replacing/helpers/old/3.1.7-download_helper.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,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]))
@@ -117,7 +117,7 @@ 
 
 		if (TestCase::isTestingEnv())
 		{
-			$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');

Braces +4 added lines, -8 removed lines

@@ -38,8 +38,7 @@ 
 		if ($filename === '' OR $data === '')
 		{
 			return;
-		}
-		elseif ($data === NULL)
+		} elseif ($data === NULL)
 		{
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
 			{
@@ -49,8 +48,7 @@ 
 			$filepath = $filename;
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
 			$filename = end($filename);
-		}
-		else
+		} else
 		{
 			$filesize = strlen($data);
 		}
@@ -137,8 +135,7 @@ 
 			if ( ! TestCase::isTestingEnv())
 			{
 				exit($data);
-			}
-			else
+			} else
 			{
 				echo($data);
 				throw new CIPHPUnitTestExitException('exit() from force_download()');
@@ -155,8 +152,7 @@ 
 		if ( ! TestCase::isTestingEnv())
 		{
 			exit;
-		}
-		else
+		} else
 		{
 			throw new CIPHPUnitTestExitException('exit() from force_download()');
 		}

application/tests/_ci_phpunit_test/replacing/helpers/old/3.1.6-download_helper.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,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]))
@@ -117,7 +117,7 @@ 
 
 		if (TestCase::isTestingEnv())
 		{
-			$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');

Braces +4 added lines, -8 removed lines

@@ -38,8 +38,7 @@ 
 		if ($filename === '' OR $data === '')
 		{
 			return;
-		}
-		elseif ($data === NULL)
+		} elseif ($data === NULL)
 		{
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
 			{
@@ -49,8 +48,7 @@ 
 			$filepath = $filename;
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
 			$filename = end($filename);
-		}
-		else
+		} else
 		{
 			$filesize = strlen($data);
 		}
@@ -137,8 +135,7 @@ 
 			if ( ! TestCase::isTestingEnv())
 			{
 				exit($data);
-			}
-			else
+			} else
 			{
 				echo($data);
 				throw new CIPHPUnitTestExitException('exit() from force_download()');
@@ -155,8 +152,7 @@ 
 		if ( ! TestCase::isTestingEnv())
 		{
 			exit;
-		}
-		else
+		} else
 		{
 			throw new CIPHPUnitTestExitException('exit() from force_download()');
 		}

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

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,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]))
@@ -117,7 +117,7 @@ 
 
 		if (TestCase::isTestingEnv())
 		{
-			$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');

Braces +4 added lines, -8 removed lines

@@ -38,8 +38,7 @@ 
 		if ($filename === '' OR $data === '')
 		{
 			return;
-		}
-		elseif ($data === NULL)
+		} elseif ($data === NULL)
 		{
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
 			{
@@ -49,8 +48,7 @@ 
 			$filepath = $filename;
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
 			$filename = end($filename);
-		}
-		else
+		} else
 		{
 			$filesize = strlen($data);
 		}
@@ -137,8 +135,7 @@ 
 			if ( ! TestCase::isTestingEnv())
 			{
 				exit($data);
-			}
-			else
+			} else
 			{
 				echo($data);
 				throw new CIPHPUnitTestExitException('exit() from force_download()');
@@ -155,8 +152,7 @@ 
 		if ( ! TestCase::isTestingEnv())
 		{
 			exit;
-		}
-		else
+		} else
 		{
 			throw new CIPHPUnitTestExitException('exit() from force_download()');
 		}

lib/Installer.php

Spacing +16 added lines, -16 removed lines

@@ -11,9 +11,9 @@ 
 class Installer
 {
     private $silent = false;
-    private $app_dir = 'application';  // -a DIRECTORY
-    private $pub_dir = 'public';       // -p DIRECTORY
-    private $test_dir = null;          // -t DIRECTORY
+    private $app_dir = 'application'; // -a DIRECTORY
+    private $pub_dir = 'public'; // -p DIRECTORY
+    private $test_dir = null; // -t DIRECTORY
     private $from_composer = false;
 
     public function __construct($argv)
@@ -30,7 +30,7 @@ 
         }
 
         for ($i = 1; $i <= $argc; $i++) {
-            if (! isset($argv[$i])) {
+            if ( ! isset($argv[$i])) {
                 break;
             }
 
@@ -42,29 +42,29 @@ 
 
                 // php install.php -a application
                 case '-a':
-                    if (is_dir($argv[$i+1])) {
-                        $this->app_dir = $argv[$i+1];
+                    if (is_dir($argv[$i + 1])) {
+                        $this->app_dir = $argv[$i + 1];
                     } else {
-                        throw new Exception('No such application directory: '.$argv[$i+1]);
+                        throw new Exception('No such application directory: '.$argv[$i + 1]);
                     }
                     $i++;
                     break;
 
                 // php install.php -p public
                 case '-p':
-                    if (is_dir($argv[$i+1])) {
-                        $this->pub_dir = $argv[$i+1];
+                    if (is_dir($argv[$i + 1])) {
+                        $this->pub_dir = $argv[$i + 1];
                     } else {
-                        throw new Exception('No such public directory: '.$argv[$i+1]);
+                        throw new Exception('No such public directory: '.$argv[$i + 1]);
                     }
                     $i++;
                     break;
                 // php install.php -t application/tests
                 case '-t':
-                    if (is_dir($argv[$i+1])) {
-                        $this->test_dir = $argv[$i+1];
+                    if (is_dir($argv[$i + 1])) {
+                        $this->test_dir = $argv[$i + 1];
                     } else {
-                        throw new Exception('No such test directory: '.$argv[$i+1]);
+                        throw new Exception('No such test directory: '.$argv[$i + 1]);
                     }
                     $i++;
                     break;
@@ -105,7 +105,7 @@ 
         $file = $this->test_dir.'/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\';',
@@ -117,7 +117,7 @@ 
             }
         }
 
-        if (! file_exists('index.php')) {
+        if ( ! file_exists('index.php')) {
             if (file_exists($this->pub_dir.'/index.php')) {
                 // CodeIgniter 3.0.6 and after
                 $contents = str_replace(
@@ -190,7 +190,7 @@ 
             } else {
                 $success = copy($file, $dst.'/'.$iterator->getSubPathName());
                 if ($success) {
-                    if (! $this->silent) {
+                    if ( ! $this->silent) {
                         echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
                     }
                 }

Indentation +215 added lines, -215 removed lines

@@ -10,219 +10,219 @@
 
 class Installer
 {
-    private $silent = false;
-    private $app_dir = 'application';  // -a DIRECTORY
-    private $pub_dir = 'public';       // -p DIRECTORY
-    private $test_dir = null;          // -t DIRECTORY
-    private $from_composer = false;
-
-    public function __construct($argv)
-    {
-        $this->parse_args($argv);
-    }
-
-    private function parse_args($argv)
-    {
-        $argc = count($argv);
-
-        if ($argc === 1) {
-            if (is_null($this->test_dir)) {
-                $this->test_dir = $this->app_dir.'/tests';
-            }
-
-            return;
-        }
-
-        for ($i = 1; $i <= $argc; $i++) {
-            if (! isset($argv[$i])) {
-                break;
-            }
-
-            switch ($argv[$i]) {
-                // php install.php -s
-                case '-s':
-                    $this->silent = true;
-                    break;
-
-                // php install.php -a application
-                case '-a':
-                    if (is_dir($argv[$i+1])) {
-                        $this->app_dir = $argv[$i+1];
-                    } else {
-                        throw new Exception('No such application directory: '.$argv[$i+1]);
-                    }
-                    $i++;
-                    break;
-
-                // php install.php -p public
-                case '-p':
-                    if (is_dir($argv[$i+1])) {
-                        $this->pub_dir = $argv[$i+1];
-                    } else {
-                        throw new Exception('No such public directory: '.$argv[$i+1]);
-                    }
-                    $i++;
-                    break;
-
-                // php install.php -t application/tests
-                case '-t':
-                    if (is_dir($argv[$i+1])) {
-                        $this->test_dir = $argv[$i+1];
-                    } else {
-                        throw new Exception('No such test directory: '.$argv[$i+1]);
-                    }
-                    $i++;
-                    break;
-
-                case '--from-composer':
-                    $this->from_composer = true;
-                    break;
-
-                default:
-                    throw new Exception('Unknown argument: '.$argv[$i]);
-            }
-        }
-
-        if (is_null($this->test_dir)) {
-            $this->test_dir = $this->app_dir.'/tests';
-        }
-    }
-
-    public function install()
-    {
-        $this->recursiveCopy(
-            dirname(dirname(__FILE__)).'/application/tests',
-            $this->test_dir
-        );
-        $this->fixPath();
-        if ($this->from_composer) {
-            $this->recursiveUnlink($this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test');
-        }
-    }
-
-    /**
-     * Fix paths in Bootstrap.php
-     *
-     * @FIXME Too ad hoc. Must rewrite, because can't handle complex paths.
-     */
-    private function fixPath()
-    {
-        $file = $this->test_dir.'/Bootstrap.php';
-        $contents = file_get_contents($file);
-
-        if (! file_exists('system')) {
-            if (file_exists('vendor/codeigniter/framework/system')) {
-                $contents = str_replace(
-                    '$system_path = \'../../system\';',
-                    '$system_path = \'../../vendor/codeigniter/framework/system\';',
-                    $contents
-                );
-            } else {
-                throw new Exception('Can\'t find "system" folder.');
-            }
-        }
-
-        if (! file_exists('index.php')) {
-            if (file_exists($this->pub_dir.'/index.php')) {
-                // CodeIgniter 3.0.6 and after
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').DIRECTORY_SEPARATOR);",
-                    $contents
-                );
-                // CodeIgniter 3.0.5 and before
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').'/');",
-                    $contents
-                );
-            } elseif (file_exists($this->app_dir.'/public/index.php')) {
-                // CodeIgniter 3.0.6 and after
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);",
-                    $contents
-                );
-                // CodeIgniter 3.0.5 and before
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
-                    $contents
-                );
-                if ($this->app_dir !== 'application') {
-                    $contents = str_replace(
-                        "\$application_folder = '../../application';",
-                        "\$application_folder = '../../{$this->app_dir}';",
-                        $contents
-                    );
-                }
-            } else {
-                throw new Exception('Can\'t find "index.php".');
-            }
-        }
-
-        file_put_contents($file, $contents);
-    }
-
-    public function update()
-    {
-        $target_dir = $this->test_dir.'/_ci_phpunit_test';
-        $this->recursiveUnlink($target_dir);
-        $this->recursiveCopy(
-            dirname(dirname(__FILE__)).'/application/tests/_ci_phpunit_test',
-            $target_dir
-        );
-    }
-
-    /**
-     * Recursive Copy
-     *
-     * @param string $src
-     * @param string $dst
-     */
-    private function recursiveCopy($src, $dst)
-    {
-        @mkdir($dst, 0755);
-
-        $iterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
-            \RecursiveIteratorIterator::SELF_FIRST
-        );
-
-        foreach ($iterator as $file) {
-            if ($file->isDir()) {
-                @mkdir($dst.'/'.$iterator->getSubPathName());
-            } else {
-                $success = copy($file, $dst.'/'.$iterator->getSubPathName());
-                if ($success) {
-                    if (! $this->silent) {
-                        echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Recursive Unlink
-     *
-     * @param string $dir
-     */
-    private function recursiveUnlink($dir)
-    {
-        $iterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
-            \RecursiveIteratorIterator::CHILD_FIRST
-        );
-
-        foreach ($iterator as $file) {
-            if ($file->isDir()) {
-                rmdir($file);
-            } else {
-                unlink($file);
-            }
-        }
-
-        rmdir($dir);
-    }
+	private $silent = false;
+	private $app_dir = 'application';  // -a DIRECTORY
+	private $pub_dir = 'public';       // -p DIRECTORY
+	private $test_dir = null;          // -t DIRECTORY
+	private $from_composer = false;
+
+	public function __construct($argv)
+	{
+		$this->parse_args($argv);
+	}
+
+	private function parse_args($argv)
+	{
+		$argc = count($argv);
+
+		if ($argc === 1) {
+			if (is_null($this->test_dir)) {
+				$this->test_dir = $this->app_dir.'/tests';
+			}
+
+			return;
+		}
+
+		for ($i = 1; $i <= $argc; $i++) {
+			if (! isset($argv[$i])) {
+				break;
+			}
+
+			switch ($argv[$i]) {
+				// php install.php -s
+				case '-s':
+					$this->silent = true;
+					break;
+
+				// php install.php -a application
+				case '-a':
+					if (is_dir($argv[$i+1])) {
+						$this->app_dir = $argv[$i+1];
+					} else {
+						throw new Exception('No such application directory: '.$argv[$i+1]);
+					}
+					$i++;
+					break;
+
+				// php install.php -p public
+				case '-p':
+					if (is_dir($argv[$i+1])) {
+						$this->pub_dir = $argv[$i+1];
+					} else {
+						throw new Exception('No such public directory: '.$argv[$i+1]);
+					}
+					$i++;
+					break;
+
+				// php install.php -t application/tests
+				case '-t':
+					if (is_dir($argv[$i+1])) {
+						$this->test_dir = $argv[$i+1];
+					} else {
+						throw new Exception('No such test directory: '.$argv[$i+1]);
+					}
+					$i++;
+					break;
+
+				case '--from-composer':
+					$this->from_composer = true;
+					break;
+
+				default:
+					throw new Exception('Unknown argument: '.$argv[$i]);
+			}
+		}
+
+		if (is_null($this->test_dir)) {
+			$this->test_dir = $this->app_dir.'/tests';
+		}
+	}
+
+	public function install()
+	{
+		$this->recursiveCopy(
+			dirname(dirname(__FILE__)).'/application/tests',
+			$this->test_dir
+		);
+		$this->fixPath();
+		if ($this->from_composer) {
+			$this->recursiveUnlink($this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test');
+		}
+	}
+
+	/**
+	 * Fix paths in Bootstrap.php
+	 *
+	 * @FIXME Too ad hoc. Must rewrite, because can't handle complex paths.
+	 */
+	private function fixPath()
+	{
+		$file = $this->test_dir.'/Bootstrap.php';
+		$contents = file_get_contents($file);
+
+		if (! file_exists('system')) {
+			if (file_exists('vendor/codeigniter/framework/system')) {
+				$contents = str_replace(
+					'$system_path = \'../../system\';',
+					'$system_path = \'../../vendor/codeigniter/framework/system\';',
+					$contents
+				);
+			} else {
+				throw new Exception('Can\'t find "system" folder.');
+			}
+		}
+
+		if (! file_exists('index.php')) {
+			if (file_exists($this->pub_dir.'/index.php')) {
+				// CodeIgniter 3.0.6 and after
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').DIRECTORY_SEPARATOR);",
+					$contents
+				);
+				// CodeIgniter 3.0.5 and before
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').'/');",
+					$contents
+				);
+			} elseif (file_exists($this->app_dir.'/public/index.php')) {
+				// CodeIgniter 3.0.6 and after
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);",
+					$contents
+				);
+				// CodeIgniter 3.0.5 and before
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
+					$contents
+				);
+				if ($this->app_dir !== 'application') {
+					$contents = str_replace(
+						"\$application_folder = '../../application';",
+						"\$application_folder = '../../{$this->app_dir}';",
+						$contents
+					);
+				}
+			} else {
+				throw new Exception('Can\'t find "index.php".');
+			}
+		}
+
+		file_put_contents($file, $contents);
+	}
+
+	public function update()
+	{
+		$target_dir = $this->test_dir.'/_ci_phpunit_test';
+		$this->recursiveUnlink($target_dir);
+		$this->recursiveCopy(
+			dirname(dirname(__FILE__)).'/application/tests/_ci_phpunit_test',
+			$target_dir
+		);
+	}
+
+	/**
+	 * Recursive Copy
+	 *
+	 * @param string $src
+	 * @param string $dst
+	 */
+	private function recursiveCopy($src, $dst)
+	{
+		@mkdir($dst, 0755);
+
+		$iterator = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
+			\RecursiveIteratorIterator::SELF_FIRST
+		);
+
+		foreach ($iterator as $file) {
+			if ($file->isDir()) {
+				@mkdir($dst.'/'.$iterator->getSubPathName());
+			} else {
+				$success = copy($file, $dst.'/'.$iterator->getSubPathName());
+				if ($success) {
+					if (! $this->silent) {
+						echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Recursive Unlink
+	 *
+	 * @param string $dir
+	 */
+	private function recursiveUnlink($dir)
+	{
+		$iterator = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
+			\RecursiveIteratorIterator::CHILD_FIRST
+		);
+
+		foreach ($iterator as $file) {
+			if ($file->isDir()) {
+				rmdir($file);
+			} else {
+				unlink($file);
+			}
+		}
+
+		rmdir($dir);
+	}
 }

application/tests/_ci_phpunit_test/patcher/4.5/MonkeyPatchManager.php

Doc Comments +9 added lines

@@ -40,6 +40,9 @@ 
 		'ConstantPatcher',
 	];
 
+	/**
+	 * @param string $message
+	 */
 	public static function log($message)
 	{
 		if (! self::$debug)
@@ -224,6 +227,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $patcher
+	 */
 	public static function isEnabled($patcher)
 	{
 		return in_array($patcher, self::$patcher_list);
@@ -316,6 +322,9 @@ 
 		self::$load_patchers = true;
 	}
 
+	/**
+	 * @param string $source
+	 */
 	protected static function execPatchers($source)
 	{
 		$patched = false;

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 namespace Kenjis\MonkeyPatch;
 
 use LogicException;
-use RuntimeException;
 use PhpParser\ParserFactory;
 use Kenjis\MonkeyPatch\Patcher\FunctionPatcher;
 

Spacing +17 added lines, -17 removed lines

@@ -41,7 +41,7 @@ 
 
 	public static function log($message)
 	{
-		if (! self::$debug)
+		if ( ! self::$debug)
 		{
 			return;
 		}
@@ -80,7 +80,7 @@ 
 		}
 		if (is_null(self::$log_file))
 		{
-			self::$log_file = __DIR__ . '/debug.log';
+			self::$log_file = __DIR__.'/debug.log';
 		}
 	}
 
@@ -93,10 +93,10 @@ 
 		else
 		{
 			// APPPATH is constant in CodeIgniter
-			Cache::setProjectRootDir(APPPATH . '../');
+			Cache::setProjectRootDir(APPPATH.'../');
 		}
 
-		if (! isset($config['cache_dir']))
+		if ( ! isset($config['cache_dir']))
 		{
 			throw new LogicException('You have to set "cache_dir"');
 		}
@@ -105,7 +105,7 @@ 
 
 	protected static function setPaths(array $config)
 	{
-		if (! isset($config['include_paths']))
+		if ( ! isset($config['include_paths']))
 		{
 			throw new LogicException('You have to set "include_paths"');
 		}
@@ -166,7 +166,7 @@ 
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpIncludePaths($current);
 		}
@@ -177,7 +177,7 @@ 
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpExcludePaths($current);
 		}
@@ -190,7 +190,7 @@ 
 		// Updated?
 		if ($cached !== self::$patcher_list)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpPatcherList(self::$patcher_list);
 		}
@@ -204,7 +204,7 @@ 
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpFunctionWhitelist($current);
 		}
@@ -266,7 +266,7 @@ 
 	 */
 	public static function patch($path)
 	{
-		if (! is_readable($path))
+		if ( ! is_readable($path))
 		{
 			throw new LogicException("Can't read '$path'");
 		}
@@ -274,17 +274,17 @@ 
 		// Check cache file
 		if ($cache_file = Cache::getValidSrcCachePath($path))
 		{
-			self::log('cache_hit: ' . $path);
+			self::log('cache_hit: '.$path);
 			return fopen($cache_file, 'r');
 		}
 
-		self::log('cache_miss: ' . $path);
+		self::log('cache_miss: '.$path);
 		$source = file_get_contents($path);
 
 		list($new_source, $patched) = self::execPatchers($source);
 
 		// Write to cache file
-		self::log('write_cache: ' . $path);
+		self::log('write_cache: '.$path);
 		Cache::writeSrcCacheFile($path, $new_source);
 
 		$resource = fopen('php://memory', 'rb+');
@@ -300,12 +300,12 @@ 
 			return;
 		}
 
-		require __DIR__ . '/Patcher/AbstractPatcher.php';
-		require __DIR__ . '/Patcher/Backtrace.php';
+		require __DIR__.'/Patcher/AbstractPatcher.php';
+		require __DIR__.'/Patcher/Backtrace.php';
 
 		foreach (self::$patcher_list as $classname)
 		{
-			require __DIR__ . '/Patcher/' . $classname . '.php';
+			require __DIR__.'/Patcher/'.$classname.'.php';
 		}
 
 		self::$load_patchers = true;
@@ -316,7 +316,7 @@ 
 		$patched = false;
 		foreach (self::$patcher_list as $classname)
 		{
-			$classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname;
+			$classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname;
 			$patcher = new $classname;
 			list($source, $patched_this) = $patcher->patch($source);
 			$patched = $patched || $patched_this;

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 		if (isset($config['root_dir']))
 		{
 			Cache::setProjectRootDir($config['root_dir']);
-		}
-		else
+		} else
 		{
 			// APPPATH is constant in CodeIgniter
 			Cache::setProjectRootDir(APPPATH . '../');