@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | * Start the timer... tick tock tick tock... |
| 186 | 186 | * ------------------------------------------------------ |
| 187 | 187 | */ |
| 188 | - $BM =& load_class('Benchmark', 'core'); |
|
| 188 | + $BM = & load_class('Benchmark', 'core'); |
|
| 189 | 189 | CIPHPUnitTestSuperGlobal::set_Global('BM', $BM); |
| 190 | 190 | $BM->mark('total_execution_time_start'); |
| 191 | 191 | $BM->mark('loading_time:_base_classes_start'); |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | * Instantiate the hooks class |
| 196 | 196 | * ------------------------------------------------------ |
| 197 | 197 | */ |
| 198 | - $EXT =& load_class('Hooks', 'core'); |
|
| 198 | + $EXT = & load_class('Hooks', 'core'); |
|
| 199 | 199 | CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT); |
| 200 | 200 | |
| 201 | 201 | /* |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | * depending on another class that uses it. |
| 216 | 216 | * |
| 217 | 217 | */ |
| 218 | - $CFG =& load_class('Config', 'core'); |
|
| 218 | + $CFG = & load_class('Config', 'core'); |
|
| 219 | 219 | CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG); |
| 220 | 220 | |
| 221 | 221 | // Do we have any manually set config items in the index.php file? |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | * Instantiate the UTF-8 class |
| 295 | 295 | * ------------------------------------------------------ |
| 296 | 296 | */ |
| 297 | - $UNI =& load_class('Utf8', 'core'); |
|
| 297 | + $UNI = & load_class('Utf8', 'core'); |
|
| 298 | 298 | CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI); |
| 299 | 299 | |
| 300 | 300 | /* |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | * Instantiate the URI class |
| 303 | 303 | * ------------------------------------------------------ |
| 304 | 304 | */ |
| 305 | - $URI =& load_class('URI', 'core'); |
|
| 305 | + $URI = & load_class('URI', 'core'); |
|
| 306 | 306 | CIPHPUnitTestSuperGlobal::set_Global('URI', $URI); |
| 307 | 307 | |
| 308 | 308 | /* |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | * Instantiate the routing class and set the routing |
| 311 | 311 | * ------------------------------------------------------ |
| 312 | 312 | */ |
| 313 | - $RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL); |
|
| 313 | + $RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL); |
|
| 314 | 314 | CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR); |
| 315 | 315 | |
| 316 | 316 | /* |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | * Instantiate the output class |
| 319 | 319 | * ------------------------------------------------------ |
| 320 | 320 | */ |
| 321 | - $OUT =& load_class('Output', 'core'); |
|
| 321 | + $OUT = & load_class('Output', 'core'); |
|
| 322 | 322 | CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT); |
| 323 | 323 | |
| 324 | 324 | /* |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | * Load the security class for xss and csrf support |
| 337 | 337 | * ----------------------------------------------------- |
| 338 | 338 | */ |
| 339 | - $SEC =& load_class('Security', 'core'); |
|
| 339 | + $SEC = & load_class('Security', 'core'); |
|
| 340 | 340 | CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC); |
| 341 | 341 | |
| 342 | 342 | /* |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | * Load the Input class and sanitize globals |
| 345 | 345 | * ------------------------------------------------------ |
| 346 | 346 | */ |
| 347 | - $IN =& load_class('Input', 'core'); |
|
| 347 | + $IN = & load_class('Input', 'core'); |
|
| 348 | 348 | CIPHPUnitTestSuperGlobal::set_Global('IN', $IN); |
| 349 | 349 | |
| 350 | 350 | /* |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | * Load the Language class |
| 353 | 353 | * ------------------------------------------------------ |
| 354 | 354 | */ |
| 355 | - $LANG =& load_class('Lang', 'core'); |
|
| 355 | + $LANG = & load_class('Lang', 'core'); |
|
| 356 | 356 | CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG); |
| 357 | 357 | |
| 358 | 358 | /* |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | */ |
| 376 | 376 | function &get_instance() |
| 377 | 377 | { |
| 378 | - if (! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
|
| 378 | + if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
|
| 379 | 379 | { |
| 380 | 380 | return CI_Controller::get_instance(); |
| 381 | 381 | } |
@@ -169,12 +169,10 @@ discard block |
||
| 169 | 169 | file_exists(APPPATH.'vendor/autoload.php') |
| 170 | 170 | ? require_once(APPPATH.'vendor/autoload.php') |
| 171 | 171 | : log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.'); |
| 172 | - } |
|
| 173 | - elseif (file_exists($composer_autoload)) |
|
| 172 | + } elseif (file_exists($composer_autoload)) |
|
| 174 | 173 | { |
| 175 | 174 | require_once($composer_autoload); |
| 176 | - } |
|
| 177 | - else |
|
| 175 | + } else |
|
| 178 | 176 | { |
| 179 | 177 | log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload); |
| 180 | 178 | } |
@@ -253,8 +251,7 @@ discard block |
||
| 253 | 251 | // This is required for mb_convert_encoding() to strip invalid characters. |
| 254 | 252 | // That's utilized by CI_Utf8, but it's also done for consistency with iconv. |
| 255 | 253 | mb_substitute_character('none'); |
| 256 | - } |
|
| 257 | - else |
|
| 254 | + } else |
|
| 258 | 255 | { |
| 259 | 256 | define('MB_ENABLED', FALSE); |
| 260 | 257 | } |
@@ -267,8 +264,7 @@ discard block |
||
| 267 | 264 | // iconv.internal_encoding is deprecated starting with PHP 5.6 |
| 268 | 265 | // and it's usage triggers E_DEPRECATED messages. |
| 269 | 266 | @ini_set('iconv.internal_encoding', $charset); |
| 270 | - } |
|
| 271 | - else |
|
| 267 | + } else |
|
| 272 | 268 | { |
| 273 | 269 | define('ICONV_ENABLED', FALSE); |
| 274 | 270 | } |
@@ -378,8 +374,7 @@ discard block |
||
| 378 | 374 | if (! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
| 379 | 375 | { |
| 380 | 376 | return CI_Controller::get_instance(); |
| 381 | - } |
|
| 382 | - else |
|
| 377 | + } else |
|
| 383 | 378 | { |
| 384 | 379 | return CI::$APP; |
| 385 | 380 | } |
@@ -424,21 +419,18 @@ discard block |
||
| 424 | 419 | if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php')) |
| 425 | 420 | { |
| 426 | 421 | $e404 = TRUE; |
| 427 | - } |
|
| 428 | - else |
|
| 422 | + } else |
|
| 429 | 423 | { |
| 430 | 424 | require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php'); |
| 431 | 425 | |
| 432 | 426 | if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method)) |
| 433 | 427 | { |
| 434 | 428 | $e404 = TRUE; |
| 435 | - } |
|
| 436 | - elseif (method_exists($class, '_remap')) |
|
| 429 | + } elseif (method_exists($class, '_remap')) |
|
| 437 | 430 | { |
| 438 | 431 | $params = array($method, array_slice($URI->rsegments, 2)); |
| 439 | 432 | $method = '_remap'; |
| 440 | - } |
|
| 441 | - elseif ( ! method_exists($class, $method)) |
|
| 433 | + } elseif ( ! method_exists($class, $method)) |
|
| 442 | 434 | { |
| 443 | 435 | $e404 = TRUE; |
| 444 | 436 | } |
@@ -490,8 +482,7 @@ discard block |
||
| 490 | 482 | $RTR->directory = ''; |
| 491 | 483 | } |
| 492 | 484 | } |
| 493 | - } |
|
| 494 | - else |
|
| 485 | + } else |
|
| 495 | 486 | { |
| 496 | 487 | $e404 = FALSE; |
| 497 | 488 | } |
@@ -507,8 +498,7 @@ discard block |
||
| 507 | 498 | 1 => $class, |
| 508 | 499 | 2 => $method |
| 509 | 500 | ); |
| 510 | - } |
|
| 511 | - else |
|
| 501 | + } else |
|
| 512 | 502 | { |
| 513 | 503 | show_404($RTR->directory.$class.'/'.$method); |
| 514 | 504 | } |
@@ -13,8 +13,6 @@ |
||
| 13 | 13 | require __DIR__ . '/MethodPatcher/NodeVisitor.php'; |
| 14 | 14 | require __DIR__ . '/MethodPatcher/PatchManager.php'; |
| 15 | 15 | |
| 16 | -use LogicException; |
|
| 17 | - |
|
| 18 | 16 | use Kenjis\MonkeyPatch\Patcher\MethodPatcher\NodeVisitor; |
| 19 | 17 | |
| 20 | 18 | class MethodPatcher extends AbstractPatcher |
@@ -10,8 +10,8 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | namespace Kenjis\MonkeyPatch\Patcher; |
| 12 | 12 | |
| 13 | -require __DIR__ . '/MethodPatcher/NodeVisitor.php'; |
|
| 14 | -require __DIR__ . '/MethodPatcher/PatchManager.php'; |
|
| 13 | +require __DIR__.'/MethodPatcher/NodeVisitor.php'; |
|
| 14 | +require __DIR__.'/MethodPatcher/PatchManager.php'; |
|
| 15 | 15 | |
| 16 | 16 | use LogicException; |
| 17 | 17 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | { |
| 62 | 62 | if ($start_method && $token === '{') |
| 63 | 63 | { |
| 64 | - $new_source .= '{ ' . self::CODE; |
|
| 64 | + $new_source .= '{ '.self::CODE; |
|
| 65 | 65 | $start_method = false; |
| 66 | 66 | $replacement['key'] = key(self::$replacement); |
| 67 | 67 | $replacement['value'] = current(self::$replacement); |
@@ -70,13 +70,11 @@ |
||
| 70 | 70 | { |
| 71 | 71 | $replacement = false; |
| 72 | 72 | } |
| 73 | - } |
|
| 74 | - else |
|
| 73 | + } else |
|
| 75 | 74 | { |
| 76 | 75 | $new_source .= $token; |
| 77 | 76 | } |
| 78 | - } |
|
| 79 | - else |
|
| 77 | + } else |
|
| 80 | 78 | { |
| 81 | 79 | $new_source .= $token[1]; |
| 82 | 80 | } |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | * @link https://github.com/kenjis/ci-phpunit-test |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | -require __DIR__ . '/Installer.php'; |
|
| 11 | +require __DIR__.'/Installer.php'; |
|
| 12 | 12 | |
| 13 | 13 | $installer = new Installer($argv); |
| 14 | 14 | $installer->install(); |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | * @link https://github.com/kenjis/ci-phpunit-test |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | -require __DIR__ . '/Installer.php'; |
|
| 11 | +require __DIR__.'/Installer.php'; |
|
| 12 | 12 | |
| 13 | 13 | $installer = new Installer($argv); |
| 14 | 14 | $installer->update(); |
@@ -10,191 +10,191 @@ |
||
| 10 | 10 | |
| 11 | 11 | class Installer |
| 12 | 12 | { |
| 13 | - private $silent = false; |
|
| 14 | - private $app_dir = 'application'; |
|
| 15 | - private $pub_dir = 'public'; |
|
| 16 | - private $test_dir = 'tests'; |
|
| 17 | - |
|
| 18 | - public function __construct($argv) |
|
| 19 | - { |
|
| 20 | - $this->parse_args($argv); |
|
| 21 | - } |
|
| 22 | - |
|
| 23 | - private function parse_args($argv) |
|
| 24 | - { |
|
| 25 | - $argc = count($argv); |
|
| 26 | - |
|
| 27 | - if ($argc === 1) { |
|
| 28 | - return; |
|
| 29 | - } |
|
| 30 | - |
|
| 31 | - for ($i = 1; $i <= $argc; $i++) { |
|
| 32 | - if (! isset($argv[$i])) { |
|
| 33 | - break; |
|
| 34 | - } |
|
| 35 | - |
|
| 36 | - switch ($argv[$i]) { |
|
| 37 | - // php install.php -s |
|
| 38 | - case '-s': |
|
| 39 | - $this->silent = true; |
|
| 40 | - break; |
|
| 41 | - |
|
| 42 | - // php install.php -a application |
|
| 43 | - case '-a': |
|
| 44 | - if (is_dir($argv[$i+1])) { |
|
| 45 | - $this->app_dir = $argv[$i+1]; |
|
| 46 | - } else { |
|
| 47 | - throw new Exception('No such directory: ' . $argv[$i+1]); |
|
| 48 | - } |
|
| 49 | - $i++; |
|
| 50 | - break; |
|
| 51 | - |
|
| 52 | - // php install.php -p public |
|
| 53 | - case '-p': |
|
| 54 | - if (is_dir($argv[$i+1])) { |
|
| 55 | - $this->pub_dir = $argv[$i+1]; |
|
| 56 | - } else { |
|
| 57 | - throw new Exception('No such directory: ' . $argv[$i+1]); |
|
| 58 | - } |
|
| 59 | - $i++; |
|
| 60 | - break; |
|
| 61 | - |
|
| 62 | - default: |
|
| 63 | - throw new Exception('Unknown argument: ' . $argv[$i]); |
|
| 64 | - } |
|
| 65 | - } |
|
| 66 | - } |
|
| 67 | - |
|
| 68 | - public function install() |
|
| 69 | - { |
|
| 70 | - $this->recursiveCopy( |
|
| 71 | - dirname(__FILE__) . '/application/tests', |
|
| 72 | - $this->app_dir . '/' . $this->test_dir |
|
| 73 | - ); |
|
| 74 | - $this->fixPath(); |
|
| 75 | - } |
|
| 76 | - |
|
| 77 | - /** |
|
| 78 | - * Fix paths in Bootstrap.php |
|
| 79 | - */ |
|
| 80 | - private function fixPath() |
|
| 81 | - { |
|
| 82 | - $file = $this->app_dir . '/' . $this->test_dir . '/Bootstrap.php'; |
|
| 83 | - $contents = file_get_contents($file); |
|
| 84 | - |
|
| 85 | - if (! file_exists('system')) { |
|
| 86 | - if (file_exists('vendor/codeigniter/framework/system')) { |
|
| 87 | - $contents = str_replace( |
|
| 88 | - '$system_path = \'../../system\';', |
|
| 89 | - '$system_path = \'../../vendor/codeigniter/framework/system\';', |
|
| 90 | - $contents |
|
| 91 | - ); |
|
| 92 | - } else { |
|
| 93 | - throw new Exception('Can\'t find "system" folder.'); |
|
| 94 | - } |
|
| 95 | - } |
|
| 96 | - |
|
| 97 | - if (! file_exists('index.php')) { |
|
| 98 | - if (file_exists($this->pub_dir . '/index.php')) { |
|
| 99 | - // CodeIgniter 3.0.6 and after |
|
| 100 | - $contents = str_replace( |
|
| 101 | - "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);", |
|
| 102 | - "define('FCPATH', realpath(dirname(__FILE__).'/../../'. $this->pub_dir).DIRECTORY_SEPARATOR);", |
|
| 103 | - $contents |
|
| 104 | - ); |
|
| 105 | - // CodeIgniter 3.0.5 and before |
|
| 106 | - $contents = str_replace( |
|
| 107 | - "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');", |
|
| 108 | - "define('FCPATH', realpath(dirname(__FILE__).'/../../' . $this->pub_dir).'/');", |
|
| 109 | - $contents |
|
| 110 | - ); |
|
| 111 | - } elseif (file_exists($this->app_dir . '/public/index.php')) { |
|
| 112 | - // CodeIgniter 3.0.6 and after |
|
| 113 | - $contents = str_replace( |
|
| 114 | - "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);", |
|
| 115 | - "define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);", |
|
| 116 | - $contents |
|
| 117 | - ); |
|
| 118 | - // CodeIgniter 3.0.5 and before |
|
| 119 | - $contents = str_replace( |
|
| 120 | - "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');", |
|
| 121 | - "define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');", |
|
| 122 | - $contents |
|
| 123 | - ); |
|
| 124 | - if ($this->app_dir != 'application') { |
|
| 125 | - $contents = str_replace( |
|
| 126 | - "\$application_folder = '../../application';", |
|
| 127 | - "\$application_folder = '../../{$this->app_dir}';", |
|
| 128 | - $contents |
|
| 129 | - ); |
|
| 130 | - } |
|
| 131 | - } else { |
|
| 132 | - throw new Exception('Can\'t find "index.php".'); |
|
| 133 | - } |
|
| 134 | - } |
|
| 135 | - |
|
| 136 | - file_put_contents($file, $contents); |
|
| 137 | - } |
|
| 138 | - |
|
| 139 | - public function update() |
|
| 140 | - { |
|
| 141 | - $target_dir = $this->app_dir . '/' . $this->test_dir . '/_ci_phpunit_test'; |
|
| 142 | - $this->recursiveUnlink($target_dir); |
|
| 143 | - $this->recursiveCopy( |
|
| 144 | - dirname(__FILE__) . '/application/tests/_ci_phpunit_test', |
|
| 145 | - $target_dir |
|
| 146 | - ); |
|
| 147 | - } |
|
| 148 | - |
|
| 149 | - /** |
|
| 150 | - * Recursive Copy |
|
| 151 | - * |
|
| 152 | - * @param string $src |
|
| 153 | - * @param string $dst |
|
| 154 | - */ |
|
| 155 | - private function recursiveCopy($src, $dst) |
|
| 156 | - { |
|
| 157 | - @mkdir($dst, 0755); |
|
| 158 | - |
|
| 159 | - $iterator = new \RecursiveIteratorIterator( |
|
| 160 | - new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS), |
|
| 161 | - \RecursiveIteratorIterator::SELF_FIRST |
|
| 162 | - ); |
|
| 163 | - |
|
| 164 | - foreach ($iterator as $file) { |
|
| 165 | - if ($file->isDir()) { |
|
| 166 | - @mkdir($dst . '/' . $iterator->getSubPathName()); |
|
| 167 | - } else { |
|
| 168 | - $success = copy($file, $dst . '/' . $iterator->getSubPathName()); |
|
| 169 | - if ($success) { |
|
| 170 | - if (! $this->silent) { |
|
| 171 | - echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL; |
|
| 172 | - } |
|
| 173 | - } |
|
| 174 | - } |
|
| 175 | - } |
|
| 176 | - } |
|
| 177 | - |
|
| 178 | - /** |
|
| 179 | - * Recursive Unlink |
|
| 180 | - * |
|
| 181 | - * @param string $dir |
|
| 182 | - */ |
|
| 183 | - private function recursiveUnlink($dir) |
|
| 184 | - { |
|
| 185 | - $iterator = new \RecursiveIteratorIterator( |
|
| 186 | - new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS), |
|
| 187 | - \RecursiveIteratorIterator::CHILD_FIRST |
|
| 188 | - ); |
|
| 189 | - |
|
| 190 | - foreach ($iterator as $file) { |
|
| 191 | - if ($file->isDir()) { |
|
| 192 | - rmdir($file); |
|
| 193 | - } else { |
|
| 194 | - unlink($file); |
|
| 195 | - } |
|
| 196 | - } |
|
| 197 | - |
|
| 198 | - rmdir($dir); |
|
| 199 | - } |
|
| 13 | + private $silent = false; |
|
| 14 | + private $app_dir = 'application'; |
|
| 15 | + private $pub_dir = 'public'; |
|
| 16 | + private $test_dir = 'tests'; |
|
| 17 | + |
|
| 18 | + public function __construct($argv) |
|
| 19 | + { |
|
| 20 | + $this->parse_args($argv); |
|
| 21 | + } |
|
| 22 | + |
|
| 23 | + private function parse_args($argv) |
|
| 24 | + { |
|
| 25 | + $argc = count($argv); |
|
| 26 | + |
|
| 27 | + if ($argc === 1) { |
|
| 28 | + return; |
|
| 29 | + } |
|
| 30 | + |
|
| 31 | + for ($i = 1; $i <= $argc; $i++) { |
|
| 32 | + if (! isset($argv[$i])) { |
|
| 33 | + break; |
|
| 34 | + } |
|
| 35 | + |
|
| 36 | + switch ($argv[$i]) { |
|
| 37 | + // php install.php -s |
|
| 38 | + case '-s': |
|
| 39 | + $this->silent = true; |
|
| 40 | + break; |
|
| 41 | + |
|
| 42 | + // php install.php -a application |
|
| 43 | + case '-a': |
|
| 44 | + if (is_dir($argv[$i+1])) { |
|
| 45 | + $this->app_dir = $argv[$i+1]; |
|
| 46 | + } else { |
|
| 47 | + throw new Exception('No such directory: ' . $argv[$i+1]); |
|
| 48 | + } |
|
| 49 | + $i++; |
|
| 50 | + break; |
|
| 51 | + |
|
| 52 | + // php install.php -p public |
|
| 53 | + case '-p': |
|
| 54 | + if (is_dir($argv[$i+1])) { |
|
| 55 | + $this->pub_dir = $argv[$i+1]; |
|
| 56 | + } else { |
|
| 57 | + throw new Exception('No such directory: ' . $argv[$i+1]); |
|
| 58 | + } |
|
| 59 | + $i++; |
|
| 60 | + break; |
|
| 61 | + |
|
| 62 | + default: |
|
| 63 | + throw new Exception('Unknown argument: ' . $argv[$i]); |
|
| 64 | + } |
|
| 65 | + } |
|
| 66 | + } |
|
| 67 | + |
|
| 68 | + public function install() |
|
| 69 | + { |
|
| 70 | + $this->recursiveCopy( |
|
| 71 | + dirname(__FILE__) . '/application/tests', |
|
| 72 | + $this->app_dir . '/' . $this->test_dir |
|
| 73 | + ); |
|
| 74 | + $this->fixPath(); |
|
| 75 | + } |
|
| 76 | + |
|
| 77 | + /** |
|
| 78 | + * Fix paths in Bootstrap.php |
|
| 79 | + */ |
|
| 80 | + private function fixPath() |
|
| 81 | + { |
|
| 82 | + $file = $this->app_dir . '/' . $this->test_dir . '/Bootstrap.php'; |
|
| 83 | + $contents = file_get_contents($file); |
|
| 84 | + |
|
| 85 | + if (! file_exists('system')) { |
|
| 86 | + if (file_exists('vendor/codeigniter/framework/system')) { |
|
| 87 | + $contents = str_replace( |
|
| 88 | + '$system_path = \'../../system\';', |
|
| 89 | + '$system_path = \'../../vendor/codeigniter/framework/system\';', |
|
| 90 | + $contents |
|
| 91 | + ); |
|
| 92 | + } else { |
|
| 93 | + throw new Exception('Can\'t find "system" folder.'); |
|
| 94 | + } |
|
| 95 | + } |
|
| 96 | + |
|
| 97 | + if (! file_exists('index.php')) { |
|
| 98 | + if (file_exists($this->pub_dir . '/index.php')) { |
|
| 99 | + // CodeIgniter 3.0.6 and after |
|
| 100 | + $contents = str_replace( |
|
| 101 | + "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);", |
|
| 102 | + "define('FCPATH', realpath(dirname(__FILE__).'/../../'. $this->pub_dir).DIRECTORY_SEPARATOR);", |
|
| 103 | + $contents |
|
| 104 | + ); |
|
| 105 | + // CodeIgniter 3.0.5 and before |
|
| 106 | + $contents = str_replace( |
|
| 107 | + "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');", |
|
| 108 | + "define('FCPATH', realpath(dirname(__FILE__).'/../../' . $this->pub_dir).'/');", |
|
| 109 | + $contents |
|
| 110 | + ); |
|
| 111 | + } elseif (file_exists($this->app_dir . '/public/index.php')) { |
|
| 112 | + // CodeIgniter 3.0.6 and after |
|
| 113 | + $contents = str_replace( |
|
| 114 | + "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);", |
|
| 115 | + "define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);", |
|
| 116 | + $contents |
|
| 117 | + ); |
|
| 118 | + // CodeIgniter 3.0.5 and before |
|
| 119 | + $contents = str_replace( |
|
| 120 | + "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');", |
|
| 121 | + "define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');", |
|
| 122 | + $contents |
|
| 123 | + ); |
|
| 124 | + if ($this->app_dir != 'application') { |
|
| 125 | + $contents = str_replace( |
|
| 126 | + "\$application_folder = '../../application';", |
|
| 127 | + "\$application_folder = '../../{$this->app_dir}';", |
|
| 128 | + $contents |
|
| 129 | + ); |
|
| 130 | + } |
|
| 131 | + } else { |
|
| 132 | + throw new Exception('Can\'t find "index.php".'); |
|
| 133 | + } |
|
| 134 | + } |
|
| 135 | + |
|
| 136 | + file_put_contents($file, $contents); |
|
| 137 | + } |
|
| 138 | + |
|
| 139 | + public function update() |
|
| 140 | + { |
|
| 141 | + $target_dir = $this->app_dir . '/' . $this->test_dir . '/_ci_phpunit_test'; |
|
| 142 | + $this->recursiveUnlink($target_dir); |
|
| 143 | + $this->recursiveCopy( |
|
| 144 | + dirname(__FILE__) . '/application/tests/_ci_phpunit_test', |
|
| 145 | + $target_dir |
|
| 146 | + ); |
|
| 147 | + } |
|
| 148 | + |
|
| 149 | + /** |
|
| 150 | + * Recursive Copy |
|
| 151 | + * |
|
| 152 | + * @param string $src |
|
| 153 | + * @param string $dst |
|
| 154 | + */ |
|
| 155 | + private function recursiveCopy($src, $dst) |
|
| 156 | + { |
|
| 157 | + @mkdir($dst, 0755); |
|
| 158 | + |
|
| 159 | + $iterator = new \RecursiveIteratorIterator( |
|
| 160 | + new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS), |
|
| 161 | + \RecursiveIteratorIterator::SELF_FIRST |
|
| 162 | + ); |
|
| 163 | + |
|
| 164 | + foreach ($iterator as $file) { |
|
| 165 | + if ($file->isDir()) { |
|
| 166 | + @mkdir($dst . '/' . $iterator->getSubPathName()); |
|
| 167 | + } else { |
|
| 168 | + $success = copy($file, $dst . '/' . $iterator->getSubPathName()); |
|
| 169 | + if ($success) { |
|
| 170 | + if (! $this->silent) { |
|
| 171 | + echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL; |
|
| 172 | + } |
|
| 173 | + } |
|
| 174 | + } |
|
| 175 | + } |
|
| 176 | + } |
|
| 177 | + |
|
| 178 | + /** |
|
| 179 | + * Recursive Unlink |
|
| 180 | + * |
|
| 181 | + * @param string $dir |
|
| 182 | + */ |
|
| 183 | + private function recursiveUnlink($dir) |
|
| 184 | + { |
|
| 185 | + $iterator = new \RecursiveIteratorIterator( |
|
| 186 | + new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS), |
|
| 187 | + \RecursiveIteratorIterator::CHILD_FIRST |
|
| 188 | + ); |
|
| 189 | + |
|
| 190 | + foreach ($iterator as $file) { |
|
| 191 | + if ($file->isDir()) { |
|
| 192 | + rmdir($file); |
|
| 193 | + } else { |
|
| 194 | + unlink($file); |
|
| 195 | + } |
|
| 196 | + } |
|
| 197 | + |
|
| 198 | + rmdir($dir); |
|
| 199 | + } |
|
| 200 | 200 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | for ($i = 1; $i <= $argc; $i++) { |
| 32 | - if (! isset($argv[$i])) { |
|
| 32 | + if ( ! isset($argv[$i])) { |
|
| 33 | 33 | break; |
| 34 | 34 | } |
| 35 | 35 | |
@@ -41,26 +41,26 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | // php install.php -a application |
| 43 | 43 | case '-a': |
| 44 | - if (is_dir($argv[$i+1])) { |
|
| 45 | - $this->app_dir = $argv[$i+1]; |
|
| 44 | + if (is_dir($argv[$i + 1])) { |
|
| 45 | + $this->app_dir = $argv[$i + 1]; |
|
| 46 | 46 | } else { |
| 47 | - throw new Exception('No such directory: ' . $argv[$i+1]); |
|
| 47 | + throw new Exception('No such directory: '.$argv[$i + 1]); |
|
| 48 | 48 | } |
| 49 | 49 | $i++; |
| 50 | 50 | break; |
| 51 | 51 | |
| 52 | 52 | // php install.php -p public |
| 53 | 53 | case '-p': |
| 54 | - if (is_dir($argv[$i+1])) { |
|
| 55 | - $this->pub_dir = $argv[$i+1]; |
|
| 54 | + if (is_dir($argv[$i + 1])) { |
|
| 55 | + $this->pub_dir = $argv[$i + 1]; |
|
| 56 | 56 | } else { |
| 57 | - throw new Exception('No such directory: ' . $argv[$i+1]); |
|
| 57 | + throw new Exception('No such directory: '.$argv[$i + 1]); |
|
| 58 | 58 | } |
| 59 | 59 | $i++; |
| 60 | 60 | break; |
| 61 | 61 | |
| 62 | 62 | default: |
| 63 | - throw new Exception('Unknown argument: ' . $argv[$i]); |
|
| 63 | + throw new Exception('Unknown argument: '.$argv[$i]); |
|
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | public function install() |
| 69 | 69 | { |
| 70 | 70 | $this->recursiveCopy( |
| 71 | - dirname(__FILE__) . '/application/tests', |
|
| 72 | - $this->app_dir . '/' . $this->test_dir |
|
| 71 | + dirname(__FILE__).'/application/tests', |
|
| 72 | + $this->app_dir.'/'.$this->test_dir |
|
| 73 | 73 | ); |
| 74 | 74 | $this->fixPath(); |
| 75 | 75 | } |
@@ -79,10 +79,10 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | private function fixPath() |
| 81 | 81 | { |
| 82 | - $file = $this->app_dir . '/' . $this->test_dir . '/Bootstrap.php'; |
|
| 82 | + $file = $this->app_dir.'/'.$this->test_dir.'/Bootstrap.php'; |
|
| 83 | 83 | $contents = file_get_contents($file); |
| 84 | 84 | |
| 85 | - if (! file_exists('system')) { |
|
| 85 | + if ( ! file_exists('system')) { |
|
| 86 | 86 | if (file_exists('vendor/codeigniter/framework/system')) { |
| 87 | 87 | $contents = str_replace( |
| 88 | 88 | '$system_path = \'../../system\';', |
@@ -94,8 +94,8 @@ discard block |
||
| 94 | 94 | } |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - if (! file_exists('index.php')) { |
|
| 98 | - if (file_exists($this->pub_dir . '/index.php')) { |
|
| 97 | + if ( ! file_exists('index.php')) { |
|
| 98 | + if (file_exists($this->pub_dir.'/index.php')) { |
|
| 99 | 99 | // CodeIgniter 3.0.6 and after |
| 100 | 100 | $contents = str_replace( |
| 101 | 101 | "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);", |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | "define('FCPATH', realpath(dirname(__FILE__).'/../../' . $this->pub_dir).'/');", |
| 109 | 109 | $contents |
| 110 | 110 | ); |
| 111 | - } elseif (file_exists($this->app_dir . '/public/index.php')) { |
|
| 111 | + } elseif (file_exists($this->app_dir.'/public/index.php')) { |
|
| 112 | 112 | // CodeIgniter 3.0.6 and after |
| 113 | 113 | $contents = str_replace( |
| 114 | 114 | "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);", |
@@ -138,10 +138,10 @@ discard block |
||
| 138 | 138 | |
| 139 | 139 | public function update() |
| 140 | 140 | { |
| 141 | - $target_dir = $this->app_dir . '/' . $this->test_dir . '/_ci_phpunit_test'; |
|
| 141 | + $target_dir = $this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test'; |
|
| 142 | 142 | $this->recursiveUnlink($target_dir); |
| 143 | 143 | $this->recursiveCopy( |
| 144 | - dirname(__FILE__) . '/application/tests/_ci_phpunit_test', |
|
| 144 | + dirname(__FILE__).'/application/tests/_ci_phpunit_test', |
|
| 145 | 145 | $target_dir |
| 146 | 146 | ); |
| 147 | 147 | } |
@@ -163,12 +163,12 @@ discard block |
||
| 163 | 163 | |
| 164 | 164 | foreach ($iterator as $file) { |
| 165 | 165 | if ($file->isDir()) { |
| 166 | - @mkdir($dst . '/' . $iterator->getSubPathName()); |
|
| 166 | + @mkdir($dst.'/'.$iterator->getSubPathName()); |
|
| 167 | 167 | } else { |
| 168 | - $success = copy($file, $dst . '/' . $iterator->getSubPathName()); |
|
| 168 | + $success = copy($file, $dst.'/'.$iterator->getSubPathName()); |
|
| 169 | 169 | if ($success) { |
| 170 | - if (! $this->silent) { |
|
| 171 | - echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL; |
|
| 170 | + if ( ! $this->silent) { |
|
| 171 | + echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL; |
|
| 172 | 172 | } |
| 173 | 173 | } |
| 174 | 174 | } |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | // Support PHPUnit 6.0 |
| 12 | -if (! class_exists('PHPUnit_Framework_TestCase')) |
|
| 12 | +if ( ! class_exists('PHPUnit_Framework_TestCase')) |
|
| 13 | 13 | { |
| 14 | 14 | class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase'); |
| 15 | 15 | } |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | return $this->$name; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - throw new LogicException('No such property: ' . $name); |
|
| 58 | + throw new LogicException('No such property: '.$name); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | public static function setUpBeforeClass() |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | { |
| 79 | 79 | reset_instance(); |
| 80 | 80 | CIPHPUnitTest::createCodeIgniterInstance(); |
| 81 | - $this->CI =& get_instance(); |
|
| 81 | + $this->CI = & get_instance(); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | protected function tearDown() |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | $this->assertSame( |
| 259 | 259 | $code, |
| 260 | 260 | $actual, |
| 261 | - 'Status code is not ' . $code . ' but ' . $actual . '.' |
|
| 261 | + 'Status code is not '.$code.' but '.$actual.'.' |
|
| 262 | 262 | ); |
| 263 | 263 | } |
| 264 | 264 | |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | */ |
| 271 | 271 | public function assertResponseHeader($name, $value) |
| 272 | 272 | { |
| 273 | - $CI =& get_instance(); |
|
| 273 | + $CI = & get_instance(); |
|
| 274 | 274 | $actual = $CI->output->get_header($name); |
| 275 | 275 | |
| 276 | 276 | if ($actual === null) |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | */ |
| 295 | 295 | public function assertResponseCookie($name, $value, $allow_duplicate = false) |
| 296 | 296 | { |
| 297 | - $CI =& get_instance(); |
|
| 297 | + $CI = & get_instance(); |
|
| 298 | 298 | $cookies = isset($CI->output->_cookies[$name]) |
| 299 | 299 | ? $CI->output->_cookies[$name] : null; |
| 300 | 300 | |
@@ -362,23 +362,23 @@ discard block |
||
| 362 | 362 | $this->fail('redirect() is not called.'); |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | - if (! function_exists('site_url')) |
|
| 365 | + if ( ! function_exists('site_url')) |
|
| 366 | 366 | { |
| 367 | - $CI =& get_instance(); |
|
| 367 | + $CI = & get_instance(); |
|
| 368 | 368 | $CI->load->helper('url'); |
| 369 | 369 | } |
| 370 | 370 | |
| 371 | - if (! preg_match('#^(\w+:)?//#i', $uri)) |
|
| 371 | + if ( ! preg_match('#^(\w+:)?//#i', $uri)) |
|
| 372 | 372 | { |
| 373 | 373 | $uri = site_url($uri); |
| 374 | 374 | } |
| 375 | 375 | $absolute_url = $uri; |
| 376 | - $expected = 'Redirect to ' . $absolute_url; |
|
| 376 | + $expected = 'Redirect to '.$absolute_url; |
|
| 377 | 377 | |
| 378 | 378 | $this->assertSame( |
| 379 | 379 | $expected, |
| 380 | 380 | $status['redirect'], |
| 381 | - 'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.' |
|
| 381 | + 'URL to redirect is not '.$expected.' but '.$status['redirect'].'.' |
|
| 382 | 382 | ); |
| 383 | 383 | |
| 384 | 384 | if ($code !== null) |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | $this->assertSame( |
| 387 | 387 | $code, |
| 388 | 388 | $status['code'], |
| 389 | - 'Status code is not ' . $code . ' but ' . $status['code'] . '.' |
|
| 389 | + 'Status code is not '.$code.' but '.$status['code'].'.' |
|
| 390 | 390 | ); |
| 391 | 391 | } |
| 392 | 392 | } |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | { |
| 21 | 21 | reset_instance(); |
| 22 | 22 | $controller = new $classname; |
| 23 | - $this->CI =& get_instance(); |
|
| 23 | + $this->CI = & get_instance(); |
|
| 24 | 24 | return $controller; |
| 25 | 25 | } |
| 26 | 26 | |