@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | // Load the mime types |
104 | - $mimes =& get_mimes(); |
|
104 | + $mimes = & get_mimes(); |
|
105 | 105 | |
106 | 106 | // Only change the default MIME if we can find one |
107 | 107 | if (isset($mimes[$extension])) |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | if (ENVIRONMENT === 'testing') |
148 | 148 | { |
149 | - $CI =& get_instance(); |
|
149 | + $CI = & get_instance(); |
|
150 | 150 | $CI->output->set_header('Content-Type: '.$mime); |
151 | 151 | $CI->output->set_header('Content-Disposition: attachment; filename="'.$filename.'"'); |
152 | 152 | $CI->output->set_header('Expires: 0'); |
@@ -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; |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | |
42 | 42 | public static function log($message) |
43 | 43 | { |
44 | - if (! self::$debug) |
|
44 | + if ( ! self::$debug) |
|
45 | 45 | { |
46 | 46 | return; |
47 | 47 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | } |
81 | 81 | if (is_null(self::$log_file)) |
82 | 82 | { |
83 | - self::$log_file = __DIR__ . '/debug.log'; |
|
83 | + self::$log_file = __DIR__.'/debug.log'; |
|
84 | 84 | } |
85 | 85 | } |
86 | 86 | |
@@ -93,10 +93,10 @@ discard block |
||
93 | 93 | else |
94 | 94 | { |
95 | 95 | // APPPATH is constant in CodeIgniter |
96 | - Cache::setProjectRootDir(APPPATH . '../'); |
|
96 | + Cache::setProjectRootDir(APPPATH.'../'); |
|
97 | 97 | } |
98 | 98 | |
99 | - if (! isset($config['cache_dir'])) |
|
99 | + if ( ! isset($config['cache_dir'])) |
|
100 | 100 | { |
101 | 101 | throw new LogicException('You have to set "cache_dir"'); |
102 | 102 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | protected static function setPaths(array $config) |
107 | 107 | { |
108 | - if (! isset($config['include_paths'])) |
|
108 | + if ( ! isset($config['include_paths'])) |
|
109 | 109 | { |
110 | 110 | throw new LogicException('You have to set "include_paths"'); |
111 | 111 | } |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | // Updated? |
167 | 167 | if ($cached !== $current) |
168 | 168 | { |
169 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
169 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
170 | 170 | Cache::clearSrcCache(); |
171 | 171 | Cache::writeTmpIncludePaths($current); |
172 | 172 | } |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | // Updated? |
178 | 178 | if ($cached !== $current) |
179 | 179 | { |
180 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
180 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
181 | 181 | Cache::clearSrcCache(); |
182 | 182 | Cache::writeTmpExcludePaths($current); |
183 | 183 | } |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | // Updated? |
191 | 191 | if ($cached !== self::$patcher_list) |
192 | 192 | { |
193 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
193 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
194 | 194 | Cache::clearSrcCache(); |
195 | 195 | Cache::writeTmpPatcherList(self::$patcher_list); |
196 | 196 | } |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | // Updated? |
205 | 205 | if ($cached !== $current) |
206 | 206 | { |
207 | - MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__); |
|
207 | + MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__); |
|
208 | 208 | Cache::clearSrcCache(); |
209 | 209 | Cache::writeTmpFunctionWhitelist($current); |
210 | 210 | } |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | */ |
267 | 267 | public static function patch($path) |
268 | 268 | { |
269 | - if (! is_readable($path)) |
|
269 | + if ( ! is_readable($path)) |
|
270 | 270 | { |
271 | 271 | throw new LogicException("Can't read '$path'"); |
272 | 272 | } |
@@ -274,17 +274,17 @@ discard block |
||
274 | 274 | // Check cache file |
275 | 275 | if ($cache_file = Cache::getValidSrcCachePath($path)) |
276 | 276 | { |
277 | - self::log('cache_hit: ' . $path); |
|
277 | + self::log('cache_hit: '.$path); |
|
278 | 278 | return fopen($cache_file, 'r'); |
279 | 279 | } |
280 | 280 | |
281 | - self::log('cache_miss: ' . $path); |
|
281 | + self::log('cache_miss: '.$path); |
|
282 | 282 | $source = file_get_contents($path); |
283 | 283 | |
284 | 284 | list($new_source, $patched) = self::execPatchers($source); |
285 | 285 | |
286 | 286 | // Write to cache file |
287 | - self::log('write_cache: ' . $path); |
|
287 | + self::log('write_cache: '.$path); |
|
288 | 288 | Cache::writeSrcCacheFile($path, $new_source); |
289 | 289 | |
290 | 290 | $resource = fopen('php://memory', 'rb+'); |
@@ -300,12 +300,12 @@ discard block |
||
300 | 300 | return; |
301 | 301 | } |
302 | 302 | |
303 | - require __DIR__ . '/Patcher/AbstractPatcher.php'; |
|
304 | - require __DIR__ . '/Patcher/Backtrace.php'; |
|
303 | + require __DIR__.'/Patcher/AbstractPatcher.php'; |
|
304 | + require __DIR__.'/Patcher/Backtrace.php'; |
|
305 | 305 | |
306 | 306 | foreach (self::$patcher_list as $classname) |
307 | 307 | { |
308 | - require __DIR__ . '/Patcher/' . $classname . '.php'; |
|
308 | + require __DIR__.'/Patcher/'.$classname.'.php'; |
|
309 | 309 | } |
310 | 310 | |
311 | 311 | self::$load_patchers = true; |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | $patched = false; |
317 | 317 | foreach (self::$patcher_list as $classname) |
318 | 318 | { |
319 | - $classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname; |
|
319 | + $classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname; |
|
320 | 320 | $patcher = new $classname; |
321 | 321 | list($source, $patched_this) = $patcher->patch($source); |
322 | 322 | $patched = $patched || $patched_this; |
@@ -10,34 +10,34 @@ |
||
10 | 10 | |
11 | 11 | // If you use Composer |
12 | 12 | if (class_exists('PhpParser\Autoloader')) { |
13 | - if (method_exists('PhpParser\Node\Name','set')) { |
|
13 | + if (method_exists('PhpParser\Node\Name', 'set')) { |
|
14 | 14 | // PHP-Parser 2.x |
15 | - require __DIR__ . '/2.x/MonkeyPatchManager.php'; |
|
15 | + require __DIR__.'/2.x/MonkeyPatchManager.php'; |
|
16 | 16 | } else { |
17 | 17 | // PHP-Parser 3.x |
18 | - require __DIR__ . '/3.x/MonkeyPatchManager.php'; |
|
18 | + require __DIR__.'/3.x/MonkeyPatchManager.php'; |
|
19 | 19 | } |
20 | 20 | } |
21 | 21 | // If you don't use Composer |
22 | 22 | else { |
23 | 23 | if (version_compare(PHP_VERSION, '5.5.0', '>=')) { |
24 | 24 | // Use PHP-Parser 3.x |
25 | - require __DIR__ . '/third_party/PHP-Parser-3.1.5/lib/bootstrap.php'; |
|
26 | - require __DIR__ . '/3.x/MonkeyPatchManager.php'; |
|
25 | + require __DIR__.'/third_party/PHP-Parser-3.1.5/lib/bootstrap.php'; |
|
26 | + require __DIR__.'/3.x/MonkeyPatchManager.php'; |
|
27 | 27 | } else { |
28 | 28 | // Use PHP-Parser 2.x |
29 | - require __DIR__ . '/third_party/PHP-Parser-2.1.1/lib/bootstrap.php'; |
|
30 | - require __DIR__ . '/2.x/MonkeyPatchManager.php'; |
|
29 | + require __DIR__.'/third_party/PHP-Parser-2.1.1/lib/bootstrap.php'; |
|
30 | + require __DIR__.'/2.x/MonkeyPatchManager.php'; |
|
31 | 31 | } |
32 | 32 | } |
33 | 33 | |
34 | -require __DIR__ . '/IncludeStream.php'; |
|
35 | -require __DIR__ . '/PathChecker.php'; |
|
36 | -require __DIR__ . '/MonkeyPatch.php'; |
|
37 | -require __DIR__ . '/Cache.php'; |
|
38 | -require __DIR__ . '/InvocationVerifier.php'; |
|
34 | +require __DIR__.'/IncludeStream.php'; |
|
35 | +require __DIR__.'/PathChecker.php'; |
|
36 | +require __DIR__.'/MonkeyPatch.php'; |
|
37 | +require __DIR__.'/Cache.php'; |
|
38 | +require __DIR__.'/InvocationVerifier.php'; |
|
39 | 39 | |
40 | -require __DIR__ . '/functions/exit__.php'; |
|
40 | +require __DIR__.'/functions/exit__.php'; |
|
41 | 41 | |
42 | 42 | const __GO_TO_ORIG__ = '__GO_TO_ORIG__'; |
43 | 43 |