@@ -293,8 +293,8 @@ discard block |
||
293 | 293 | { |
294 | 294 | empty($config) OR $this->initialize($config, FALSE); |
295 | 295 | |
296 | - $this->_mimes =& get_mimes(); |
|
297 | - $this->_CI =& get_instance(); |
|
296 | + $this->_mimes = & get_mimes(); |
|
297 | + $this->_CI = & get_instance(); |
|
298 | 298 | |
299 | 299 | log_message('info', 'Upload Class Initialized'); |
300 | 300 | } |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | else |
481 | 481 | { |
482 | 482 | // An extension was provided, let's have it! |
483 | - $this->file_ext = $this->get_extension($this->_file_name_override); |
|
483 | + $this->file_ext = $this->get_extension($this->_file_name_override); |
|
484 | 484 | } |
485 | 485 | |
486 | 486 | if ( ! $this->is_allowed_filetype(TRUE)) |
@@ -493,7 +493,7 @@ discard block |
||
493 | 493 | // Convert the file size to kilobytes |
494 | 494 | if ($this->file_size > 0) |
495 | 495 | { |
496 | - $this->file_size = round($this->file_size/1024, 2); |
|
496 | + $this->file_size = round($this->file_size / 1024, 2); |
|
497 | 497 | } |
498 | 498 | |
499 | 499 | // Is the file size within the allowed maximum? |
@@ -818,10 +818,10 @@ discard block |
||
818 | 818 | { |
819 | 819 | $types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png'); |
820 | 820 | |
821 | - $this->image_width = $D[0]; |
|
822 | - $this->image_height = $D[1]; |
|
823 | - $this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown'; |
|
824 | - $this->image_size_str = $D[3]; // string containing height and width |
|
821 | + $this->image_width = $D[0]; |
|
822 | + $this->image_height = $D[1]; |
|
823 | + $this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown'; |
|
824 | + $this->image_size_str = $D[3]; // string containing height and width |
|
825 | 825 | } |
826 | 826 | } |
827 | 827 | |
@@ -869,7 +869,7 @@ discard block |
||
869 | 869 | $this->file_type = 'image/jpeg'; |
870 | 870 | } |
871 | 871 | |
872 | - $img_mimes = array('image/gif', 'image/jpeg', 'image/png'); |
|
872 | + $img_mimes = array('image/gif', 'image/jpeg', 'image/png'); |
|
873 | 873 | |
874 | 874 | return in_array($this->file_type, $img_mimes, TRUE); |
875 | 875 | } |
@@ -1011,7 +1011,7 @@ discard block |
||
1011 | 1011 | return FALSE; |
1012 | 1012 | } |
1013 | 1013 | |
1014 | - $this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path); |
|
1014 | + $this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path); |
|
1015 | 1015 | return TRUE; |
1016 | 1016 | } |
1017 | 1017 | |
@@ -1055,9 +1055,9 @@ discard block |
||
1055 | 1055 | $ext = ''; |
1056 | 1056 | if (strpos($filename, '.') !== FALSE) |
1057 | 1057 | { |
1058 | - $parts = explode('.', $filename); |
|
1059 | - $ext = '.'.array_pop($parts); |
|
1060 | - $filename = implode('.', $parts); |
|
1058 | + $parts = explode('.', $filename); |
|
1059 | + $ext = '.'.array_pop($parts); |
|
1060 | + $filename = implode('.', $parts); |
|
1061 | 1061 | } |
1062 | 1062 | |
1063 | 1063 | return substr($filename, 0, ($length - strlen($ext))).$ext; |
@@ -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,20 +41,20 @@ 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; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 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,7 +94,7 @@ discard block |
||
94 | 94 | } |
95 | 95 | } |
96 | 96 | |
97 | - if (! file_exists('index.php')) { |
|
97 | + if ( ! file_exists('index.php')) { |
|
98 | 98 | if (file_exists($this->pub_dir.'/index.php')) { |
99 | 99 | // CodeIgniter 3.0.6 and after |
100 | 100 | $contents = str_replace( |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | } else { |
168 | 168 | $success = copy($file, $dst.'/'.$iterator->getSubPathName()); |
169 | 169 | if ($success) { |
170 | - if (! $this->silent) { |
|
170 | + if ( ! $this->silent) { |
|
171 | 171 | echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL; |
172 | 172 | } |
173 | 173 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $method = isset($info['class_method']) ? $info['class_method'] : $info['function']; |
64 | 64 | |
65 | 65 | MonkeyPatchManager::log( |
66 | - 'invoke_const: ' . $constant . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()' |
|
66 | + 'invoke_const: '.$constant.') on line '.$line.' in '.$file.' by '.$method.'()' |
|
67 | 67 | ); |
68 | 68 | } |
69 | 69 | } |
@@ -106,12 +106,12 @@ discard block |
||
106 | 106 | { |
107 | 107 | self::logInvocation($constant); |
108 | 108 | |
109 | - if (! empty(self::$patches_to_apply[$constant])) |
|
109 | + if ( ! empty(self::$patches_to_apply[$constant])) |
|
110 | 110 | { |
111 | - if (! self::checkCalledMethod($constant)) |
|
111 | + if ( ! self::checkCalledMethod($constant)) |
|
112 | 112 | { |
113 | 113 | MonkeyPatchManager::log( |
114 | - 'invoke_const: ' . $constant . ' not patched (out of scope)' |
|
114 | + 'invoke_const: '.$constant.' not patched (out of scope)' |
|
115 | 115 | ); |
116 | 116 | return constant($constant); |
117 | 117 | } |
@@ -119,12 +119,12 @@ discard block |
||
119 | 119 | |
120 | 120 | if (array_key_exists($constant, self::$patches)) |
121 | 121 | { |
122 | - MonkeyPatchManager::log('invoke_const: ' . $constant . ' patched'); |
|
122 | + MonkeyPatchManager::log('invoke_const: '.$constant.' patched'); |
|
123 | 123 | return self::$patches[$constant]; |
124 | 124 | } |
125 | 125 | |
126 | 126 | MonkeyPatchManager::log( |
127 | - 'invoke_const: ' . $constant . ' not patched (no patch)' |
|
127 | + 'invoke_const: '.$constant.' not patched (no patch)' |
|
128 | 128 | ); |
129 | 129 | return constant($constant); |
130 | 130 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $method = isset($info['class_method']) ? $info['class_method'] : $info['function']; |
64 | 64 | |
65 | 65 | MonkeyPatchManager::log( |
66 | - 'invoke_const: ' . $constant . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()' |
|
66 | + 'invoke_const: '.$constant.') on line '.$line.' in '.$file.' by '.$method.'()' |
|
67 | 67 | ); |
68 | 68 | } |
69 | 69 | } |
@@ -106,12 +106,12 @@ discard block |
||
106 | 106 | { |
107 | 107 | self::logInvocation($constant); |
108 | 108 | |
109 | - if (! empty(self::$patches_to_apply[$constant])) |
|
109 | + if ( ! empty(self::$patches_to_apply[$constant])) |
|
110 | 110 | { |
111 | - if (! self::checkCalledMethod($constant)) |
|
111 | + if ( ! self::checkCalledMethod($constant)) |
|
112 | 112 | { |
113 | 113 | MonkeyPatchManager::log( |
114 | - 'invoke_const: ' . $constant . ' not patched (out of scope)' |
|
114 | + 'invoke_const: '.$constant.' not patched (out of scope)' |
|
115 | 115 | ); |
116 | 116 | return constant($constant); |
117 | 117 | } |
@@ -119,12 +119,12 @@ discard block |
||
119 | 119 | |
120 | 120 | if (array_key_exists($constant, self::$patches)) |
121 | 121 | { |
122 | - MonkeyPatchManager::log('invoke_const: ' . $constant . ' patched'); |
|
122 | + MonkeyPatchManager::log('invoke_const: '.$constant.' patched'); |
|
123 | 123 | return self::$patches[$constant]; |
124 | 124 | } |
125 | 125 | |
126 | 126 | MonkeyPatchManager::log( |
127 | - 'invoke_const: ' . $constant . ' not patched (no patch)' |
|
127 | + 'invoke_const: '.$constant.' not patched (no patch)' |
|
128 | 128 | ); |
129 | 129 | return constant($constant); |
130 | 130 | } |
@@ -8,7 +8,7 @@ |
||
8 | 8 | * @link https://github.com/kenjis/ci-phpunit-test |
9 | 9 | */ |
10 | 10 | |
11 | -require __DIR__ . '/lib/Installer.php'; |
|
11 | +require __DIR__.'/lib/Installer.php'; |
|
12 | 12 | |
13 | 13 | $installer = new Installer($argv); |
14 | 14 | $installer->update(); |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | { |
36 | 36 | if ($this->db === null) |
37 | 37 | { |
38 | - $CI =& get_instance(); |
|
38 | + $CI = & get_instance(); |
|
39 | 39 | $CI->load->database(); |
40 | 40 | $this->db = $CI->db; |
41 | 41 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | protected function tearDown() |
56 | 56 | { |
57 | - if (! empty($this->insertCache)) |
|
57 | + if ( ! empty($this->insertCache)) |
|
58 | 58 | { |
59 | 59 | foreach ($this->insertCache as $row) |
60 | 60 | { |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | $this->db->close(); |
72 | 72 | $this->db = null; |
73 | 73 | |
74 | - $CI =& get_instance(); |
|
74 | + $CI = & get_instance(); |
|
75 | 75 | $CI->load->database(); |
76 | 76 | $this->db = $this->CI->db; |
77 | 77 | } |
@@ -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 | |
@@ -64,11 +64,11 @@ discard block |
||
64 | 64 | { |
65 | 65 | if ($start_method && $token === '{') |
66 | 66 | { |
67 | - if(self::isVoidFunction($tokens, $key)){ |
|
68 | - $new_source .= '{ ' . self::CODENORET; |
|
67 | + if (self::isVoidFunction($tokens, $key)) { |
|
68 | + $new_source .= '{ '.self::CODENORET; |
|
69 | 69 | } |
70 | - else{ |
|
71 | - $new_source .= '{ ' . self::CODE; |
|
70 | + else { |
|
71 | + $new_source .= '{ '.self::CODE; |
|
72 | 72 | } |
73 | 73 | $start_method = false; |
74 | 74 | $replacement['key'] = key(self::$replacement); |
@@ -100,22 +100,22 @@ discard block |
||
100 | 100 | * @param $key |
101 | 101 | * @return bool |
102 | 102 | */ |
103 | - protected static function isVoidFunction($tokens, $key){ |
|
104 | - if($key - 1 <= 0){ |
|
103 | + protected static function isVoidFunction($tokens, $key) { |
|
104 | + if ($key - 1 <= 0) { |
|
105 | 105 | return false; |
106 | 106 | } |
107 | 107 | $token = $tokens[$key - 1]; |
108 | - if(is_array($token)){ |
|
108 | + if (is_array($token)) { |
|
109 | 109 | $token = $token[1]; |
110 | 110 | } |
111 | 111 | //Loop backwards though the start of the function block till you either find "void" or the end of the |
112 | 112 | //parameters declaration. |
113 | - while($token !== ")"){ |
|
114 | - if(strpos($token, "void") !== false){ |
|
113 | + while ($token !== ")") { |
|
114 | + if (strpos($token, "void") !== false) { |
|
115 | 115 | return true; |
116 | 116 | } |
117 | 117 | $token = $tokens[$key - 1]; |
118 | - if(is_array($token)){ |
|
118 | + if (is_array($token)) { |
|
119 | 119 | $token = $token[1]; |
120 | 120 | } |
121 | 121 | $key--; |
@@ -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 | |
@@ -64,11 +64,11 @@ discard block |
||
64 | 64 | { |
65 | 65 | if ($start_method && $token === '{') |
66 | 66 | { |
67 | - if(self::isVoidFunction($tokens, $key)){ |
|
68 | - $new_source .= '{ ' . self::CODENORET; |
|
67 | + if (self::isVoidFunction($tokens, $key)) { |
|
68 | + $new_source .= '{ '.self::CODENORET; |
|
69 | 69 | } |
70 | - else{ |
|
71 | - $new_source .= '{ ' . self::CODE; |
|
70 | + else { |
|
71 | + $new_source .= '{ '.self::CODE; |
|
72 | 72 | } |
73 | 73 | $start_method = false; |
74 | 74 | $replacement['key'] = key(self::$replacement); |
@@ -100,22 +100,22 @@ discard block |
||
100 | 100 | * @param $key |
101 | 101 | * @return bool |
102 | 102 | */ |
103 | - protected static function isVoidFunction($tokens, $key){ |
|
104 | - if($key - 1 <= 0){ |
|
103 | + protected static function isVoidFunction($tokens, $key) { |
|
104 | + if ($key - 1 <= 0) { |
|
105 | 105 | return false; |
106 | 106 | } |
107 | 107 | $token = $tokens[$key - 1]; |
108 | - if(is_array($token)){ |
|
108 | + if (is_array($token)) { |
|
109 | 109 | $token = $token[1]; |
110 | 110 | } |
111 | 111 | //Loop backwards though the start of the function block till you either find "void" or the end of the |
112 | 112 | //parameters declaration. |
113 | - while($token !== ")"){ |
|
114 | - if(strpos($token, "void") !== false){ |
|
113 | + while ($token !== ")") { |
|
114 | + if (strpos($token, "void") !== false) { |
|
115 | 115 | return true; |
116 | 116 | } |
117 | 117 | $token = $tokens[$key - 1]; |
118 | - if(is_array($token)){ |
|
118 | + if (is_array($token)) { |
|
119 | 119 | $token = $token[1]; |
120 | 120 | } |
121 | 121 | $key--; |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | |
264 | 264 | // Save status code in Output object |
265 | 265 | // added by ci-phpunit-test |
266 | - $CI =& get_instance(); |
|
266 | + $CI = & get_instance(); |
|
267 | 267 | $output = $CI->output; |
268 | 268 | $output->_status = [ |
269 | 269 | 'code' => $code, |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | if (empty($_config)) |
377 | 377 | { |
378 | 378 | // references cannot be directly assigned to static variables, so we use an array |
379 | - $_config[0] =& get_config(); |
|
379 | + $_config[0] = & get_config(); |
|
380 | 380 | } |
381 | 381 | |
382 | 382 | return isset($_config[0][$item]) ? $_config[0][$item] : NULL; |