@@ -34,36 +34,36 @@ |
||
34 | 34 | |
35 | 35 | class SeedGenerator extends \Myth\Forge\BaseGenerator { |
36 | 36 | |
37 | - public function run($segments=[], $quiet=false) |
|
37 | + public function run($segments = [], $quiet = false) |
|
38 | 38 | { |
39 | - $name = array_shift( $segments ); |
|
39 | + $name = array_shift($segments); |
|
40 | 40 | |
41 | - if ( empty( $name ) ) |
|
41 | + if (empty($name)) |
|
42 | 42 | { |
43 | - $name = CLI::prompt( 'Seed name' ); |
|
43 | + $name = CLI::prompt('Seed name'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | // Format to CI Standards |
47 | - $name = str_replace('.php', '', strtolower( $name ) ); |
|
48 | - if (substr( $name, -4) == 'seed') |
|
47 | + $name = str_replace('.php', '', strtolower($name)); |
|
48 | + if (substr($name, -4) == 'seed') |
|
49 | 49 | { |
50 | 50 | $name = substr($name, 0, strlen($name) - 4); |
51 | 51 | } |
52 | - $name = ucfirst($name) .'Seeder'; |
|
52 | + $name = ucfirst($name).'Seeder'; |
|
53 | 53 | |
54 | 54 | $data = [ |
55 | 55 | 'seed_name' => $name, |
56 | - 'today' => date( 'Y-m-d H:ia' ) |
|
56 | + 'today' => date('Y-m-d H:ia') |
|
57 | 57 | ]; |
58 | 58 | |
59 | - $destination = $this->determineOutputPath( 'database/seeds' ) . $name . '.php'; |
|
59 | + $destination = $this->determineOutputPath('database/seeds').$name.'.php'; |
|
60 | 60 | |
61 | 61 | if (strpos($destination, 'modules') !== false) |
62 | 62 | { |
63 | 63 | $destination = str_replace('database/', '', $destination); |
64 | 64 | } |
65 | 65 | |
66 | - if (! $this->copyTemplate( 'seed', $destination, $data, $this->overwrite) ) |
|
66 | + if ( ! $this->copyTemplate('seed', $destination, $data, $this->overwrite)) |
|
67 | 67 | { |
68 | 68 | CLI::error('Error creating seed file.'); |
69 | 69 | } |
@@ -34,21 +34,21 @@ |
||
34 | 34 | |
35 | 35 | class ViewGenerator extends \Myth\Forge\BaseGenerator { |
36 | 36 | |
37 | - public function run($segments=[], $quiet=false) |
|
37 | + public function run($segments = [], $quiet = false) |
|
38 | 38 | { |
39 | - $name = array_shift( $segments ); |
|
39 | + $name = array_shift($segments); |
|
40 | 40 | |
41 | - if ( empty( $name ) ) |
|
41 | + if (empty($name)) |
|
42 | 42 | { |
43 | - $name = CLI::prompt( 'View name' ); |
|
43 | + $name = CLI::prompt('View name'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | // Format to CI Standards |
47 | - $name = str_replace('.php', '', strtolower( $name ) ); |
|
47 | + $name = str_replace('.php', '', strtolower($name)); |
|
48 | 48 | |
49 | - $destination = $this->determineOutputPath( 'views' ) . $name . '.php'; |
|
49 | + $destination = $this->determineOutputPath('views').$name.'.php'; |
|
50 | 50 | |
51 | - if (! $this->createFile($destination, "The {$name}.php view file.", $this->overwrite) ) |
|
51 | + if ( ! $this->createFile($destination, "The {$name}.php view file.", $this->overwrite)) |
|
52 | 52 | { |
53 | 53 | CLI::error('Error creating view file.'); |
54 | 54 | } |
@@ -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 | $BM->mark('total_execution_time_start'); |
190 | 190 | $BM->mark('loading_time:_base_classes_start'); |
191 | 191 | |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | * Instantiate the hooks class |
195 | 195 | * ------------------------------------------------------ |
196 | 196 | */ |
197 | - $EXT =& load_class('Hooks', 'core'); |
|
197 | + $EXT = & load_class('Hooks', 'core'); |
|
198 | 198 | |
199 | 199 | /* |
200 | 200 | * ------------------------------------------------------ |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | * depending on another class that uses it. |
214 | 214 | * |
215 | 215 | */ |
216 | - $CFG =& load_class('Config', 'core'); |
|
216 | + $CFG = & load_class('Config', 'core'); |
|
217 | 217 | |
218 | 218 | // Do we have any manually set config items in the index.php file? |
219 | 219 | if (isset($assign_to_config) && is_array($assign_to_config)) |
@@ -291,28 +291,28 @@ discard block |
||
291 | 291 | * Instantiate the UTF-8 class |
292 | 292 | * ------------------------------------------------------ |
293 | 293 | */ |
294 | - $UNI =& load_class('Utf8', 'core'); |
|
294 | + $UNI = & load_class('Utf8', 'core'); |
|
295 | 295 | |
296 | 296 | /* |
297 | 297 | * ------------------------------------------------------ |
298 | 298 | * Instantiate the URI class |
299 | 299 | * ------------------------------------------------------ |
300 | 300 | */ |
301 | - $URI =& load_class('URI', 'core'); |
|
301 | + $URI = & load_class('URI', 'core'); |
|
302 | 302 | |
303 | 303 | /* |
304 | 304 | * ------------------------------------------------------ |
305 | 305 | * Instantiate the routing class and set the routing |
306 | 306 | * ------------------------------------------------------ |
307 | 307 | */ |
308 | - $RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL); |
|
308 | + $RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL); |
|
309 | 309 | |
310 | 310 | /* |
311 | 311 | * ------------------------------------------------------ |
312 | 312 | * Instantiate the output class |
313 | 313 | * ------------------------------------------------------ |
314 | 314 | */ |
315 | - $OUT =& load_class('Output', 'core'); |
|
315 | + $OUT = & load_class('Output', 'core'); |
|
316 | 316 | |
317 | 317 | /* |
318 | 318 | * ------------------------------------------------------ |
@@ -329,21 +329,21 @@ discard block |
||
329 | 329 | * Load the security class for xss and csrf support |
330 | 330 | * ----------------------------------------------------- |
331 | 331 | */ |
332 | - $SEC =& load_class('Security', 'core'); |
|
332 | + $SEC = & load_class('Security', 'core'); |
|
333 | 333 | |
334 | 334 | /* |
335 | 335 | * ------------------------------------------------------ |
336 | 336 | * Load the Input class and sanitize globals |
337 | 337 | * ------------------------------------------------------ |
338 | 338 | */ |
339 | - $IN =& load_class('Input', 'core'); |
|
339 | + $IN = & load_class('Input', 'core'); |
|
340 | 340 | |
341 | 341 | /* |
342 | 342 | * ------------------------------------------------------ |
343 | 343 | * Load the Language class |
344 | 344 | * ------------------------------------------------------ |
345 | 345 | */ |
346 | - $LANG =& load_class('Lang', 'core'); |
|
346 | + $LANG = & load_class('Lang', 'core'); |
|
347 | 347 | |
348 | 348 | /* |
349 | 349 | * ------------------------------------------------------ |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | if (empty($_config)) |
298 | 298 | { |
299 | 299 | // references cannot be directly assigned to static variables, so we use an array |
300 | - $_config[0] =& get_config(); |
|
300 | + $_config[0] = & get_config(); |
|
301 | 301 | } |
302 | 302 | |
303 | 303 | return isset($_config[0][$item]) ? $_config[0][$item] : NULL; |
@@ -422,7 +422,7 @@ discard block |
||
422 | 422 | $exit_status = 1; // EXIT_ERROR |
423 | 423 | } |
424 | 424 | |
425 | - $_error =& load_class('Exceptions', 'core'); |
|
425 | + $_error = & load_class('Exceptions', 'core'); |
|
426 | 426 | echo $_error->show_error($heading, $message, 'error_general', $status_code); |
427 | 427 | exit($exit_status); |
428 | 428 | } |
@@ -445,7 +445,7 @@ discard block |
||
445 | 445 | */ |
446 | 446 | function show_404($page = '', $log_error = TRUE) |
447 | 447 | { |
448 | - $_error =& load_class('Exceptions', 'core'); |
|
448 | + $_error = & load_class('Exceptions', 'core'); |
|
449 | 449 | $_error->show_404($page, $log_error); |
450 | 450 | exit(4); // EXIT_UNKNOWN_FILE |
451 | 451 | } |
@@ -472,7 +472,7 @@ discard block |
||
472 | 472 | if ($_log === NULL) |
473 | 473 | { |
474 | 474 | // references cannot be directly assigned to static variables, so we use an array |
475 | - $_log[0] =& load_class('Log', 'core'); |
|
475 | + $_log[0] = & load_class('Log', 'core'); |
|
476 | 476 | } |
477 | 477 | |
478 | 478 | $_log[0]->write_log($level, $message); |
@@ -618,7 +618,7 @@ discard block |
||
618 | 618 | return; |
619 | 619 | } |
620 | 620 | |
621 | - $_error =& load_class('Exceptions', 'core'); |
|
621 | + $_error = & load_class('Exceptions', 'core'); |
|
622 | 622 | $_error->log_exception($severity, $message, $filepath, $line); |
623 | 623 | |
624 | 624 | // Should we display the error? |
@@ -653,7 +653,7 @@ discard block |
||
653 | 653 | */ |
654 | 654 | function _exception_handler($exception) |
655 | 655 | { |
656 | - $_error =& load_class('Exceptions', 'core'); |
|
656 | + $_error = & load_class('Exceptions', 'core'); |
|
657 | 657 | $_error->log_exception('error', 'Exception: '.$exception->getMessage(), $exception->getFile(), $exception->getLine()); |
658 | 658 | |
659 | 659 | // Should we display the error? |
@@ -716,11 +716,11 @@ discard block |
||
716 | 716 | // carriage return (dec 13) and horizontal tab (dec 09) |
717 | 717 | if ($url_encoded) |
718 | 718 | { |
719 | - $non_displayables[] = '/%0[0-8bcef]/'; // url encoded 00-08, 11, 12, 14, 15 |
|
720 | - $non_displayables[] = '/%1[0-9a-f]/'; // url encoded 16-31 |
|
719 | + $non_displayables[] = '/%0[0-8bcef]/'; // url encoded 00-08, 11, 12, 14, 15 |
|
720 | + $non_displayables[] = '/%1[0-9a-f]/'; // url encoded 16-31 |
|
721 | 721 | } |
722 | 722 | |
723 | - $non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127 |
|
723 | + $non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127 |
|
724 | 724 | |
725 | 725 | do |
726 | 726 | { |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | * |
63 | 63 | * @var array |
64 | 64 | */ |
65 | - public $is_loaded = array(); |
|
65 | + public $is_loaded = array(); |
|
66 | 66 | |
67 | 67 | /** |
68 | 68 | * List of paths to search when trying to load a config file. |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * @used-by CI_Loader |
71 | 71 | * @var array |
72 | 72 | */ |
73 | - public $_config_paths = array(APPPATH); |
|
73 | + public $_config_paths = array(APPPATH); |
|
74 | 74 | |
75 | 75 | // -------------------------------------------------------------------- |
76 | 76 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | */ |
84 | 84 | public function __construct() |
85 | 85 | { |
86 | - $this->config =& get_config(); |
|
86 | + $this->config = & get_config(); |
|
87 | 87 | |
88 | 88 | // Set the base_url automatically if none was provided |
89 | 89 | if (empty($this->config['base_url'])) |
@@ -65,17 +65,17 @@ |
||
65 | 65 | */ |
66 | 66 | public function __construct() |
67 | 67 | { |
68 | - self::$instance =& $this; |
|
68 | + self::$instance = & $this; |
|
69 | 69 | |
70 | 70 | // Assign all the class objects that were instantiated by the |
71 | 71 | // bootstrap file (CodeIgniter.php) to local class variables |
72 | 72 | // so that CI can run as one big super object. |
73 | 73 | foreach (is_loaded() as $var => $class) |
74 | 74 | { |
75 | - $this->$var =& load_class($class); |
|
75 | + $this->$var = & load_class($class); |
|
76 | 76 | } |
77 | 77 | |
78 | - $this->load =& load_class('Loader', 'core'); |
|
78 | + $this->load = & load_class('Loader', 'core'); |
|
79 | 79 | $this->load->initialize(); |
80 | 80 | log_message('info', 'Controller Class Initialized'); |
81 | 81 | } |
@@ -251,7 +251,7 @@ |
||
251 | 251 | if (FALSE !== strpos($filepath, '/')) |
252 | 252 | { |
253 | 253 | $x = explode('/', $filepath); |
254 | - $filepath = $x[count($x)-2].'/'.end($x); |
|
254 | + $filepath = $x[count($x) - 2].'/'.end($x); |
|
255 | 255 | } |
256 | 256 | |
257 | 257 | $template = 'html'.DIRECTORY_SEPARATOR.'error_php'; |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | * |
63 | 63 | * @var array |
64 | 64 | */ |
65 | - public $hooks = array(); |
|
65 | + public $hooks = array(); |
|
66 | 66 | |
67 | 67 | /** |
68 | 68 | * Array with class objects to use hooks methods |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | */ |
88 | 88 | public function __construct() |
89 | 89 | { |
90 | - $CFG =& load_class('Config', 'core'); |
|
90 | + $CFG = & load_class('Config', 'core'); |
|
91 | 91 | log_message('info', 'Hooks Class Initialized'); |
92 | 92 | |
93 | 93 | // If hooks are not enabled in the config file |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | return; |
115 | 115 | } |
116 | 116 | |
117 | - $this->hooks =& $hook; |
|
117 | + $this->hooks = & $hook; |
|
118 | 118 | $this->enabled = TRUE; |
119 | 119 | } |
120 | 120 | |
@@ -206,9 +206,9 @@ discard block |
||
206 | 206 | } |
207 | 207 | |
208 | 208 | // Determine and class and/or function names |
209 | - $class = empty($data['class']) ? FALSE : $data['class']; |
|
210 | - $function = empty($data['function']) ? FALSE : $data['function']; |
|
211 | - $params = isset($data['params']) ? $data['params'] : ''; |
|
209 | + $class = empty($data['class']) ? FALSE : $data['class']; |
|
210 | + $function = empty($data['function']) ? FALSE : $data['function']; |
|
211 | + $params = isset($data['params']) ? $data['params'] : ''; |
|
212 | 212 | |
213 | 213 | if (empty($function)) |
214 | 214 | { |
@@ -137,17 +137,17 @@ |
||
137 | 137 | */ |
138 | 138 | public function __construct() |
139 | 139 | { |
140 | - $this->_allow_get_array = (config_item('allow_get_array') === TRUE); |
|
141 | - $this->_enable_xss = (config_item('global_xss_filtering') === TRUE); |
|
142 | - $this->_enable_csrf = (config_item('csrf_protection') === TRUE); |
|
143 | - $this->_standardize_newlines = (bool) config_item('standardize_newlines'); |
|
140 | + $this->_allow_get_array = (config_item('allow_get_array') === TRUE); |
|
141 | + $this->_enable_xss = (config_item('global_xss_filtering') === TRUE); |
|
142 | + $this->_enable_csrf = (config_item('csrf_protection') === TRUE); |
|
143 | + $this->_standardize_newlines = (bool) config_item('standardize_newlines'); |
|
144 | 144 | |
145 | - $this->security =& load_class('Security', 'core'); |
|
145 | + $this->security = & load_class('Security', 'core'); |
|
146 | 146 | |
147 | 147 | // Do we need the UTF-8 class? |
148 | 148 | if (UTF8_ENABLED === TRUE) |
149 | 149 | { |
150 | - $this->uni =& load_class('Utf8', 'core'); |
|
150 | + $this->uni = & load_class('Utf8', 'core'); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | // Sanitize global arrays |