@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * NOTE: If you change these, also change the error_reporting() code below |
| 55 | 55 | */ |
| 56 | 56 | // This is needed for @runInSeparateProcess |
| 57 | -if (! defined('ENVIRONMENT')) |
|
| 57 | +if ( ! defined('ENVIRONMENT')) |
|
| 58 | 58 | { |
| 59 | 59 | define('ENVIRONMENT', 'testing'); |
| 60 | 60 | } |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | * Added for CI PHPUnit Test |
| 328 | 328 | * ------------------------------------------------------------------- |
| 329 | 329 | */ |
| 330 | -require __DIR__ . '/_ci_phpunit_test/CIPHPUnitTest.php'; |
|
| 330 | +require __DIR__.'/_ci_phpunit_test/CIPHPUnitTest.php'; |
|
| 331 | 331 | CIPHPUnitTest::init(); |
| 332 | 332 | /* |
| 333 | 333 | * Or you can set directories for autoloading |
@@ -1,40 +1,40 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * CodeIgniter |
|
| 4 | - * |
|
| 5 | - * An open source application development framework for PHP |
|
| 6 | - * |
|
| 7 | - * This content is released under the MIT License (MIT) |
|
| 8 | - * |
|
| 9 | - * Copyright (c) 2014 - 2016, British Columbia Institute of Technology |
|
| 10 | - * |
|
| 11 | - * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
| 12 | - * of this software and associated documentation files (the "Software"), to deal |
|
| 13 | - * in the Software without restriction, including without limitation the rights |
|
| 14 | - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
| 15 | - * copies of the Software, and to permit persons to whom the Software is |
|
| 16 | - * furnished to do so, subject to the following conditions: |
|
| 17 | - * |
|
| 18 | - * The above copyright notice and this permission notice shall be included in |
|
| 19 | - * all copies or substantial portions of the Software. |
|
| 20 | - * |
|
| 21 | - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
| 22 | - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
| 23 | - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
| 24 | - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
| 25 | - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
| 26 | - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|
| 27 | - * THE SOFTWARE. |
|
| 28 | - * |
|
| 29 | - * @package CodeIgniter |
|
| 30 | - * @author EllisLab Dev Team |
|
| 31 | - * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) |
|
| 32 | - * @copyright Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/) |
|
| 33 | - * @license http://opensource.org/licenses/MIT MIT License |
|
| 34 | - * @link https://codeigniter.com |
|
| 35 | - * @since Version 1.0.0 |
|
| 36 | - * @filesource |
|
| 37 | - */ |
|
| 3 | + * CodeIgniter |
|
| 4 | + * |
|
| 5 | + * An open source application development framework for PHP |
|
| 6 | + * |
|
| 7 | + * This content is released under the MIT License (MIT) |
|
| 8 | + * |
|
| 9 | + * Copyright (c) 2014 - 2016, British Columbia Institute of Technology |
|
| 10 | + * |
|
| 11 | + * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
| 12 | + * of this software and associated documentation files (the "Software"), to deal |
|
| 13 | + * in the Software without restriction, including without limitation the rights |
|
| 14 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
| 15 | + * copies of the Software, and to permit persons to whom the Software is |
|
| 16 | + * furnished to do so, subject to the following conditions: |
|
| 17 | + * |
|
| 18 | + * The above copyright notice and this permission notice shall be included in |
|
| 19 | + * all copies or substantial portions of the Software. |
|
| 20 | + * |
|
| 21 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
| 22 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
| 23 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
| 24 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
| 25 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
| 26 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|
| 27 | + * THE SOFTWARE. |
|
| 28 | + * |
|
| 29 | + * @package CodeIgniter |
|
| 30 | + * @author EllisLab Dev Team |
|
| 31 | + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) |
|
| 32 | + * @copyright Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/) |
|
| 33 | + * @license http://opensource.org/licenses/MIT MIT License |
|
| 34 | + * @link https://codeigniter.com |
|
| 35 | + * @since Version 1.0.0 |
|
| 36 | + * @filesource |
|
| 37 | + */ |
|
| 38 | 38 | defined('BASEPATH') OR exit('No direct script access allowed'); |
| 39 | 39 | |
| 40 | 40 | /** |
@@ -69,28 +69,28 @@ |
||
| 69 | 69 | */ |
| 70 | 70 | switch (ENVIRONMENT) |
| 71 | 71 | { |
| 72 | - case 'testing': |
|
| 73 | - case 'development': |
|
| 74 | - error_reporting(-1); |
|
| 75 | - ini_set('display_errors', 1); |
|
| 76 | - break; |
|
| 72 | + case 'testing': |
|
| 73 | + case 'development': |
|
| 74 | + error_reporting(-1); |
|
| 75 | + ini_set('display_errors', 1); |
|
| 76 | + break; |
|
| 77 | 77 | |
| 78 | - case 'production': |
|
| 79 | - ini_set('display_errors', 0); |
|
| 80 | - if (version_compare(PHP_VERSION, '5.3', '>=')) |
|
| 81 | - { |
|
| 82 | - error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); |
|
| 83 | - } |
|
| 84 | - else |
|
| 85 | - { |
|
| 86 | - error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); |
|
| 87 | - } |
|
| 88 | - break; |
|
| 78 | + case 'production': |
|
| 79 | + ini_set('display_errors', 0); |
|
| 80 | + if (version_compare(PHP_VERSION, '5.3', '>=')) |
|
| 81 | + { |
|
| 82 | + error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); |
|
| 83 | + } |
|
| 84 | + else |
|
| 85 | + { |
|
| 86 | + error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); |
|
| 87 | + } |
|
| 88 | + break; |
|
| 89 | 89 | |
| 90 | - default: |
|
| 91 | - header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
|
| 92 | - echo 'The application environment is not set correctly.'; |
|
| 93 | - exit(1); // EXIT_ERROR |
|
| 90 | + default: |
|
| 91 | + header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
|
| 92 | + echo 'The application environment is not set correctly.'; |
|
| 93 | + exit(1); // EXIT_ERROR |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | /* |
@@ -80,8 +80,7 @@ discard block |
||
| 80 | 80 | if (version_compare(PHP_VERSION, '5.3', '>=')) |
| 81 | 81 | { |
| 82 | 82 | error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); |
| 83 | - } |
|
| 84 | - else |
|
| 83 | + } else |
|
| 85 | 84 | { |
| 86 | 85 | error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); |
| 87 | 86 | } |
@@ -204,8 +203,7 @@ discard block |
||
| 204 | 203 | if (($_temp = realpath($system_path)) !== FALSE) |
| 205 | 204 | { |
| 206 | 205 | $system_path = $_temp.DIRECTORY_SEPARATOR; |
| 207 | - } |
|
| 208 | - else |
|
| 206 | + } else |
|
| 209 | 207 | { |
| 210 | 208 | // Ensure there's a trailing slash |
| 211 | 209 | $system_path = strtr( |
@@ -247,8 +245,7 @@ discard block |
||
| 247 | 245 | if (($_temp = realpath($application_folder)) !== FALSE) |
| 248 | 246 | { |
| 249 | 247 | $application_folder = $_temp; |
| 250 | - } |
|
| 251 | - else |
|
| 248 | + } else |
|
| 252 | 249 | { |
| 253 | 250 | $application_folder = strtr( |
| 254 | 251 | rtrim($application_folder, '/\\'), |
@@ -256,16 +253,14 @@ discard block |
||
| 256 | 253 | DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
| 257 | 254 | ); |
| 258 | 255 | } |
| 259 | - } |
|
| 260 | - elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR)) |
|
| 256 | + } elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR)) |
|
| 261 | 257 | { |
| 262 | 258 | $application_folder = BASEPATH.strtr( |
| 263 | 259 | trim($application_folder, '/\\'), |
| 264 | 260 | '/\\', |
| 265 | 261 | DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
| 266 | 262 | ); |
| 267 | - } |
|
| 268 | - else |
|
| 263 | + } else |
|
| 269 | 264 | { |
| 270 | 265 | header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
| 271 | 266 | echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF; |
@@ -278,14 +273,12 @@ discard block |
||
| 278 | 273 | if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR)) |
| 279 | 274 | { |
| 280 | 275 | $view_folder = APPPATH.'views'; |
| 281 | - } |
|
| 282 | - elseif (is_dir($view_folder)) |
|
| 276 | + } elseif (is_dir($view_folder)) |
|
| 283 | 277 | { |
| 284 | 278 | if (($_temp = realpath($view_folder)) !== FALSE) |
| 285 | 279 | { |
| 286 | 280 | $view_folder = $_temp; |
| 287 | - } |
|
| 288 | - else |
|
| 281 | + } else |
|
| 289 | 282 | { |
| 290 | 283 | $view_folder = strtr( |
| 291 | 284 | rtrim($view_folder, '/\\'), |
@@ -293,16 +286,14 @@ discard block |
||
| 293 | 286 | DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
| 294 | 287 | ); |
| 295 | 288 | } |
| 296 | - } |
|
| 297 | - elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR)) |
|
| 289 | + } elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR)) |
|
| 298 | 290 | { |
| 299 | 291 | $view_folder = APPPATH.strtr( |
| 300 | 292 | trim($view_folder, '/\\'), |
| 301 | 293 | '/\\', |
| 302 | 294 | DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
| 303 | 295 | ); |
| 304 | - } |
|
| 305 | - else |
|
| 296 | + } else |
|
| 306 | 297 | { |
| 307 | 298 | header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
| 308 | 299 | echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF; |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | if (in_array($class, $this->alias)) |
| 71 | 71 | { |
| 72 | - $dir = __DIR__ . '/alias'; |
|
| 72 | + $dir = __DIR__.'/alias'; |
|
| 73 | 73 | $this->loadClassFile($dir, $class); |
| 74 | 74 | } |
| 75 | 75 | } |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | } |
| 89 | 89 | else |
| 90 | 90 | { |
| 91 | - $dir = __DIR__ . '/exceptions'; |
|
| 91 | + $dir = __DIR__.'/exceptions'; |
|
| 92 | 92 | $this->loadClassFile($dir, $class); |
| 93 | 93 | } |
| 94 | 94 | } |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | protected function loadClassFile($dir, $class) |
| 131 | 131 | { |
| 132 | - $class_file = $dir . '/' . $class . '.php'; |
|
| 132 | + $class_file = $dir.'/'.$class.'.php'; |
|
| 133 | 133 | if (file_exists($class_file)) |
| 134 | 134 | { |
| 135 | 135 | require $class_file; |
@@ -43,8 +43,7 @@ discard block |
||
| 43 | 43 | APPPATH.'controllers', |
| 44 | 44 | APPPATH.'modules', |
| 45 | 45 | ]; |
| 46 | - } |
|
| 47 | - else |
|
| 46 | + } else |
|
| 48 | 47 | { |
| 49 | 48 | $this->dirs = $dirs; |
| 50 | 49 | } |
@@ -85,8 +84,7 @@ discard block |
||
| 85 | 84 | { |
| 86 | 85 | $dir = __DIR__; |
| 87 | 86 | $this->loadClassFile($dir, $class); |
| 88 | - } |
|
| 89 | - else |
|
| 87 | + } else |
|
| 90 | 88 | { |
| 91 | 89 | $dir = __DIR__ . '/exceptions'; |
| 92 | 90 | $this->loadClassFile($dir, $class); |
@@ -151,8 +149,7 @@ discard block |
||
| 151 | 149 | { |
| 152 | 150 | require $filename; |
| 153 | 151 | return true; |
| 154 | - } |
|
| 155 | - else |
|
| 152 | + } else |
|
| 156 | 153 | { |
| 157 | 154 | unset($this->cache[$class]); |
| 158 | 155 | } |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Part of ci-phpunit-test |
|
| 4 | - * |
|
| 5 | - * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | - * @license MIT License |
|
| 7 | - * @copyright 2015 Kenji Suzuki |
|
| 8 | - * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | - */ |
|
| 3 | + * Part of ci-phpunit-test |
|
| 4 | + * |
|
| 5 | + * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | + * @license MIT License |
|
| 7 | + * @copyright 2015 Kenji Suzuki |
|
| 8 | + * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | + */ |
|
| 10 | 10 | |
| 11 | 11 | class CategorySeeder extends Seeder { |
| 12 | 12 | |
@@ -24,18 +24,18 @@ |
||
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | $dir = dirname($this->file); |
| 27 | - if (! is_dir($dir)) |
|
| 27 | + if ( ! is_dir($dir)) |
|
| 28 | 28 | { |
| 29 | 29 | if (@mkdir($dir, 0777, true) === false) |
| 30 | 30 | { |
| 31 | - throw new RuntimeException('Failed to create folder: ' . $dir); |
|
| 31 | + throw new RuntimeException('Failed to create folder: '.$dir); |
|
| 32 | 32 | } |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | if (file_put_contents($this->file, '') === false) |
| 36 | 36 | { |
| 37 | 37 | throw new RuntimeException( |
| 38 | - 'Failed to write to cache file: ' . $this->file |
|
| 38 | + 'Failed to write to cache file: '.$this->file |
|
| 39 | 39 | ); |
| 40 | 40 | } |
| 41 | 41 | } |
@@ -38,8 +38,7 @@ |
||
| 38 | 38 | { |
| 39 | 39 | $patched = true; |
| 40 | 40 | $new_source = static::generateNewSource($source); |
| 41 | - } |
|
| 42 | - else |
|
| 41 | + } else |
|
| 43 | 42 | { |
| 44 | 43 | $new_source = $source; |
| 45 | 44 | } |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Part of ci-phpunit-test |
|
| 4 | - * |
|
| 5 | - * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | - * @license MIT License |
|
| 7 | - * @copyright 2015 Kenji Suzuki |
|
| 8 | - * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | - */ |
|
| 3 | + * Part of ci-phpunit-test |
|
| 4 | + * |
|
| 5 | + * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | + * @license MIT License |
|
| 7 | + * @copyright 2015 Kenji Suzuki |
|
| 8 | + * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | + */ |
|
| 10 | 10 | |
| 11 | 11 | class CategorySeeder extends Seeder { |
| 12 | 12 | |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | $ref_method->setAccessible(true); |
| 22 | 22 | $obj = (gettype($obj) === 'object') ? $obj : null; |
| 23 | 23 | |
| 24 | - return function () use ($obj, $ref_method) { |
|
| 24 | + return function() use ($obj, $ref_method) { |
|
| 25 | 25 | $args = func_get_args(); |
| 26 | 26 | return $ref_method->invokeArgs($obj, $args); |
| 27 | 27 | }; |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Part of ci-phpunit-test |
|
| 4 | - * |
|
| 5 | - * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | - * @license MIT License |
|
| 7 | - * @copyright 2015 Kenji Suzuki |
|
| 8 | - * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | - */ |
|
| 3 | + * Part of ci-phpunit-test |
|
| 4 | + * |
|
| 5 | + * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | + * @license MIT License |
|
| 7 | + * @copyright 2015 Kenji Suzuki |
|
| 8 | + * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | + */ |
|
| 10 | 10 | |
| 11 | 11 | class CategorySeeder extends Seeder { |
| 12 | 12 | |
@@ -29,16 +29,14 @@ |
||
| 29 | 29 | if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php')) |
| 30 | 30 | { |
| 31 | 31 | $e404 = TRUE; |
| 32 | - } |
|
| 33 | - else |
|
| 32 | + } else |
|
| 34 | 33 | { |
| 35 | 34 | require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php'); |
| 36 | 35 | |
| 37 | 36 | if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method)) |
| 38 | 37 | { |
| 39 | 38 | $e404 = TRUE; |
| 40 | - } |
|
| 41 | - elseif (method_exists($class, '_remap')) |
|
| 39 | + } elseif (method_exists($class, '_remap')) |
|
| 42 | 40 | { |
| 43 | 41 | $params = array($method, array_slice($URI->rsegments, 2)); |
| 44 | 42 | $method = '_remap'; |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | public function getRoute() |
| 21 | 21 | { |
| 22 | - $RTR =& load_class('Router', 'core'); |
|
| 23 | - $URI =& load_class('URI', 'core'); |
|
| 22 | + $RTR = & load_class('Router', 'core'); |
|
| 23 | + $URI = & load_class('URI', 'core'); |
|
| 24 | 24 | |
| 25 | 25 | $e404 = FALSE; |
| 26 | 26 | $class = ucfirst($RTR->class); |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | { |
| 58 | 58 | // If 404, CodeIgniter instance is not created yet. So create it here. |
| 59 | 59 | // Because we need $this->CI->output->_status |
| 60 | - $CI =& get_instance(); |
|
| 60 | + $CI = & get_instance(); |
|
| 61 | 61 | if ($CI === null) |
| 62 | 62 | { |
| 63 | 63 | new CI_Controller(); |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Part of ci-phpunit-test |
|
| 4 | - * |
|
| 5 | - * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | - * @license MIT License |
|
| 7 | - * @copyright 2015 Kenji Suzuki |
|
| 8 | - * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | - */ |
|
| 3 | + * Part of ci-phpunit-test |
|
| 4 | + * |
|
| 5 | + * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | + * @license MIT License |
|
| 7 | + * @copyright 2015 Kenji Suzuki |
|
| 8 | + * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | + */ |
|
| 10 | 10 | |
| 11 | 11 | class CategorySeeder extends Seeder { |
| 12 | 12 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | // Set $_GET if URI string has query string |
| 32 | 32 | parse_str($query_string, $_GET); |
| 33 | 33 | // Remove query string from URI string |
| 34 | - $argv = substr($argv, 0, -strlen($query_string)-1); |
|
| 34 | + $argv = substr($argv, 0, -strlen($query_string) - 1); |
|
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | 37 | |
@@ -64,12 +64,12 @@ discard block |
||
| 64 | 64 | if ($_GET !== []) |
| 65 | 65 | { |
| 66 | 66 | $_SERVER['REQUEST_URI'] = |
| 67 | - '/' . $path . '?' |
|
| 67 | + '/'.$path.'?' |
|
| 68 | 68 | . http_build_query($_GET); |
| 69 | 69 | } |
| 70 | 70 | else |
| 71 | 71 | { |
| 72 | - $_SERVER['REQUEST_URI'] = '/' . $path; |
|
| 72 | + $_SERVER['REQUEST_URI'] = '/'.$path; |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | if ($query_string === false) |
| 88 | 88 | { |
| 89 | - throw new LogicException('Bad URI string: ' . $uri); |
|
| 89 | + throw new LogicException('Bad URI string: '.$uri); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | return $query_string; |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | } |
| 112 | 112 | else |
| 113 | 113 | { |
| 114 | - $key = 'HTTP_' . $normalized_name; |
|
| 114 | + $key = 'HTTP_'.$normalized_name; |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | $_SERVER[$key] = $value; |
@@ -54,8 +54,7 @@ discard block |
||
| 54 | 54 | if (is_string($argv)) |
| 55 | 55 | { |
| 56 | 56 | $path = $argv; |
| 57 | - } |
|
| 58 | - elseif (is_array($argv)) |
|
| 57 | + } elseif (is_array($argv)) |
|
| 59 | 58 | { |
| 60 | 59 | // Generate URI path from array of controller, method, arg, ... |
| 61 | 60 | $path = implode('/', $argv); |
@@ -66,8 +65,7 @@ discard block |
||
| 66 | 65 | $_SERVER['REQUEST_URI'] = |
| 67 | 66 | '/' . $path . '?' |
| 68 | 67 | . http_build_query($_GET); |
| 69 | - } |
|
| 70 | - else |
|
| 68 | + } else |
|
| 71 | 69 | { |
| 72 | 70 | $_SERVER['REQUEST_URI'] = '/' . $path; |
| 73 | 71 | } |
@@ -108,8 +106,7 @@ discard block |
||
| 108 | 106 | ) |
| 109 | 107 | { |
| 110 | 108 | $key = $normalized_name; |
| 111 | - } |
|
| 112 | - else |
|
| 109 | + } else |
|
| 113 | 110 | { |
| 114 | 111 | $key = 'HTTP_' . $normalized_name; |
| 115 | 112 | } |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Part of ci-phpunit-test |
|
| 4 | - * |
|
| 5 | - * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | - * @license MIT License |
|
| 7 | - * @copyright 2015 Kenji Suzuki |
|
| 8 | - * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | - */ |
|
| 3 | + * Part of ci-phpunit-test |
|
| 4 | + * |
|
| 5 | + * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | + * @license MIT License |
|
| 7 | + * @copyright 2015 Kenji Suzuki |
|
| 8 | + * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | + */ |
|
| 10 | 10 | |
| 11 | 11 | class CategorySeeder extends Seeder { |
| 12 | 12 | |
@@ -9,10 +9,10 @@ discard block |
||
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | // Autoloader for ci-phpunit-test |
| 12 | -require __DIR__ . '/CIPHPUnitTestAutoloader.php'; |
|
| 13 | -require __DIR__ . '/CIPHPUnitTestFileCache.php'; |
|
| 12 | +require __DIR__.'/CIPHPUnitTestAutoloader.php'; |
|
| 13 | +require __DIR__.'/CIPHPUnitTestFileCache.php'; |
|
| 14 | 14 | $cache = new CIPHPUnitTestFileCache( |
| 15 | - __DIR__ . '/tmp/cache/autoload.php' |
|
| 15 | + __DIR__.'/tmp/cache/autoload.php' |
|
| 16 | 16 | ); |
| 17 | 17 | $autoload_dirs = CIPHPUnitTest::getAutoloadDirs(); |
| 18 | 18 | $autoloader = new CIPHPUnitTestAutoloader($cache, $autoload_dirs); |
@@ -20,5 +20,5 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | // Register CodeIgniter's tests/mocks/autoloader.php |
| 22 | 22 | define('SYSTEM_PATH', BASEPATH); |
| 23 | -require APPPATH .'tests/mocks/autoloader.php'; |
|
| 23 | +require APPPATH.'tests/mocks/autoloader.php'; |
|
| 24 | 24 | spl_autoload_register('autoload'); |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Part of ci-phpunit-test |
|
| 4 | - * |
|
| 5 | - * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | - * @license MIT License |
|
| 7 | - * @copyright 2015 Kenji Suzuki |
|
| 8 | - * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | - */ |
|
| 3 | + * Part of ci-phpunit-test |
|
| 4 | + * |
|
| 5 | + * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | + * @license MIT License |
|
| 7 | + * @copyright 2015 Kenji Suzuki |
|
| 8 | + * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | + */ |
|
| 10 | 10 | |
| 11 | 11 | class CategorySeeder extends Seeder { |
| 12 | 12 | |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | { |
| 60 | 60 | $this->unwrap(); |
| 61 | 61 | |
| 62 | - MonkeyPatchManager::log('stream_open: ' . $path); |
|
| 62 | + MonkeyPatchManager::log('stream_open: '.$path); |
|
| 63 | 63 | |
| 64 | 64 | $including = (bool) ($options & self::STREAM_OPEN_FOR_INCLUDE); |
| 65 | 65 | if ($including && $this->shouldPreprocess($path)) { |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Part of ci-phpunit-test |
|
| 4 | - * |
|
| 5 | - * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | - * @license MIT License |
|
| 7 | - * @copyright 2015 Kenji Suzuki |
|
| 8 | - * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | - */ |
|
| 3 | + * Part of ci-phpunit-test |
|
| 4 | + * |
|
| 5 | + * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | + * @license MIT License |
|
| 7 | + * @copyright 2015 Kenji Suzuki |
|
| 8 | + * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | + */ |
|
| 10 | 10 | |
| 11 | 11 | class CategorySeeder extends Seeder { |
| 12 | 12 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | PHPUnit_Framework_TestCase::assertEquals( |
| 55 | 55 | $expected_times, |
| 56 | 56 | $actual_times, |
| 57 | - $class_method . '() expected to be not invoked, but invoked ' . $actual_times . ' times.' |
|
| 57 | + $class_method.'() expected to be not invoked, but invoked '.$actual_times.' times.' |
|
| 58 | 58 | ); |
| 59 | 59 | } |
| 60 | 60 | elseif ($expected_times === '+') |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | PHPUnit_Framework_TestCase::assertGreaterThanOrEqual( |
| 63 | 63 | 1, |
| 64 | 64 | $actual_times, |
| 65 | - $class_method . '() expected to be invoked at least one time, but invoked ' . $actual_times . ' times.' |
|
| 65 | + $class_method.'() expected to be invoked at least one time, but invoked '.$actual_times.' times.' |
|
| 66 | 66 | ); |
| 67 | 67 | } |
| 68 | 68 | else |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | PHPUnit_Framework_TestCase::assertEquals( |
| 71 | 71 | $expected_times, |
| 72 | 72 | $actual_times, |
| 73 | - $class_method . '() expected to be invoked ' . $expected_times . ' times, but invoked ' . $actual_times . ' times.' |
|
| 73 | + $class_method.'() expected to be invoked '.$expected_times.' times, but invoked '.$actual_times.' times.' |
|
| 74 | 74 | ); |
| 75 | 75 | } |
| 76 | 76 | } |
@@ -31,12 +31,10 @@ discard block |
||
| 31 | 31 | if ($invoked === false) |
| 32 | 32 | { |
| 33 | 33 | $actual_times = 0; |
| 34 | - } |
|
| 35 | - elseif ($expected_params === null) |
|
| 34 | + } elseif ($expected_params === null) |
|
| 36 | 35 | { |
| 37 | 36 | $actual_times = count($invocations[$class_method]); |
| 38 | - } |
|
| 39 | - else |
|
| 37 | + } else |
|
| 40 | 38 | { |
| 41 | 39 | $count = 0; |
| 42 | 40 | foreach ($invocations[$class_method] as $actual_params) |
@@ -56,16 +54,14 @@ discard block |
||
| 56 | 54 | $actual_times, |
| 57 | 55 | $class_method . '() expected to be not invoked, but invoked ' . $actual_times . ' times.' |
| 58 | 56 | ); |
| 59 | - } |
|
| 60 | - elseif ($expected_times === '+') |
|
| 57 | + } elseif ($expected_times === '+') |
|
| 61 | 58 | { |
| 62 | 59 | PHPUnit_Framework_TestCase::assertGreaterThanOrEqual( |
| 63 | 60 | 1, |
| 64 | 61 | $actual_times, |
| 65 | 62 | $class_method . '() expected to be invoked at least one time, but invoked ' . $actual_times . ' times.' |
| 66 | 63 | ); |
| 67 | - } |
|
| 68 | - else |
|
| 64 | + } else |
|
| 69 | 65 | { |
| 70 | 66 | PHPUnit_Framework_TestCase::assertEquals( |
| 71 | 67 | $expected_times, |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Part of ci-phpunit-test |
|
| 4 | - * |
|
| 5 | - * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | - * @license MIT License |
|
| 7 | - * @copyright 2015 Kenji Suzuki |
|
| 8 | - * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | - */ |
|
| 3 | + * Part of ci-phpunit-test |
|
| 4 | + * |
|
| 5 | + * @author Kenji Suzuki <https://github.com/kenjis> |
|
| 6 | + * @license MIT License |
|
| 7 | + * @copyright 2015 Kenji Suzuki |
|
| 8 | + * @link https://github.com/kenjis/ci-phpunit-test |
|
| 9 | + */ |
|
| 10 | 10 | |
| 11 | 11 | class CategorySeeder extends Seeder { |
| 12 | 12 | |