Completed
Pull Request — master (#290)
by Kenji
04:19
created
tests/_ci_phpunit_test/patcher/2.x/Patcher/ConstantPatcher/NodeVisitor.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
 	public function enterNode(Node $node)
26 26
 	{
27
-		$callback = [$this, 'before' . ucfirst($node->getType())];
27
+		$callback = [$this, 'before'.ucfirst($node->getType())];
28 28
 		if (is_callable($callback)) {
29 29
 			call_user_func_array($callback, [$node]);
30 30
 		}
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
 
33 33
 	public function leaveNode(Node $node)
34 34
 	{
35
-		if (! ($node instanceof ConstFetch))
35
+		if ( ! ($node instanceof ConstFetch))
36 36
 		{
37
-			$callback = [$this, 'rewrite' . ucfirst($node->getType())];
37
+			$callback = [$this, 'rewrite'.ucfirst($node->getType())];
38 38
 			if (is_callable($callback)) {
39 39
 				call_user_func_array($callback, [$node]);
40 40
 			}
@@ -47,26 +47,26 @@  discard block
 block discarded – undo
47 47
 			return;
48 48
 		}
49 49
 
50
-		if (! ($node->name instanceof Name))
50
+		if ( ! ($node->name instanceof Name))
51 51
 		{
52 52
 			return;
53 53
 		}
54 54
 
55
-		if (! $node->name->isUnqualified())
55
+		if ( ! $node->name->isUnqualified())
56 56
 		{
57 57
 			return;
58 58
 		}
59 59
 
60
-		if (! ConstantPatcher::isBlacklisted((string) $node->name))
60
+		if ( ! ConstantPatcher::isBlacklisted((string) $node->name))
61 61
 		{
62 62
 			$replacement = new FullyQualified(array());
63 63
 			$replacement->set(
64
-				'\__ConstProxy__::get(\'' . (string) $node->name . '\')'
64
+				'\__ConstProxy__::get(\''.(string) $node->name.'\')'
65 65
 			);
66 66
 
67 67
 			$pos = $node->getAttribute('startTokenPos');
68 68
 			ConstantPatcher::$replacement[$pos] = 
69
-				'\__ConstProxy__::get(\'' . (string) $node->name .'\')';
69
+				'\__ConstProxy__::get(\''.(string) $node->name.'\')';
70 70
 
71 71
 			$node->name = $replacement;
72 72
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/2.x/Patcher/ExitPatcher.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 namespace Kenjis\MonkeyPatch\Patcher;
12 12
 
13
-require __DIR__ . '/../Exception/ExitException.php';
13
+require __DIR__.'/../Exception/ExitException.php';
14 14
 
15 15
 class ExitPatcher
16 16
 {
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 			}
31 31
 			elseif ($token[0] === T_EXIT)
32 32
 			{
33
-				if ($tokens[$i+1] === ';')
33
+				if ($tokens[$i + 1] === ';')
34 34
 				{
35 35
 					$new_source .= 'exit__()';
36 36
 				}
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/2.x/Patcher/MethodPatcher/NodeVisitor.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 {
21 21
 	public function leaveNode(Node $node)
22 22
 	{
23
-		if (! ($node instanceof ClassMethod))
23
+		if ( ! ($node instanceof ClassMethod))
24 24
 		{
25 25
 			return;
26 26
 		}
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/2.x/Patcher/MethodPatcher/PatchManager.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,16 +66,16 @@
 block discarded – undo
66 66
 				$called_method = 'n/a';
67 67
 			}
68 68
 			
69
-			$log_args = function () use ($params) {
69
+			$log_args = function() use ($params) {
70 70
 				$output = '';
71 71
 				foreach ($params as $arg) {
72
-					$output .= var_export($arg, true) . ', ';
72
+					$output .= var_export($arg, true).', ';
73 73
 				}
74 74
 				$output = rtrim($output, ', ');
75 75
 				return $output;
76 76
 			};
77 77
 			MonkeyPatchManager::log(
78
-				'invoke_method: ' . $class.'::'.$method . '(' . $log_args() . ') on line ' . $line . ' in ' . $file . ' by ' . $called_method
78
+				'invoke_method: '.$class.'::'.$method.'('.$log_args().') on line '.$line.' in '.$file.' by '.$called_method
79 79
 			);
80 80
 //			var_dump($trace); exit;
81 81
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/2.x/Patcher/Backtrace.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 	public static function getInfo($patcher, $backtrace)
23 23
 	{
24
-		if (! isset(self::$map[$patcher]))
24
+		if ( ! isset(self::$map[$patcher]))
25 25
 		{
26 26
 			throw new LogicException("No such a patcher: $patcher");
27 27
 		}
@@ -41,12 +41,12 @@  discard block
 block discarded – undo
41 41
 		$line = isset($backtrace[$offset]['line'])
42 42
 				? $backtrace[$offset]['line'] : null;
43 43
 
44
-		if (isset($backtrace[$offset+2]))
44
+		if (isset($backtrace[$offset + 2]))
45 45
 		{
46
-			$class  = isset($backtrace[$offset+2]['class'])
47
-					? $backtrace[$offset+2]['class']
46
+			$class = isset($backtrace[$offset + 2]['class'])
47
+					? $backtrace[$offset + 2]['class']
48 48
 					: null;
49
-			$function = $backtrace[$offset+2]['function'];
49
+			$function = $backtrace[$offset + 2]['function'];
50 50
 		}
51 51
 		else
52 52
 		{
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		if (isset($class))
58 58
 		{
59 59
 			$method = $function;
60
-			$class_method = $class . '::' . $function;
60
+			$class_method = $class.'::'.$function;
61 61
 			$function = null;
62 62
 		}
63 63
 		else
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/2.x/Patcher/FunctionPatcher.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@
 block discarded – undo
10 10
 
11 11
 namespace Kenjis\MonkeyPatch\Patcher;
12 12
 
13
-require __DIR__ . '/FunctionPatcher/NodeVisitor.php';
14
-require __DIR__ . '/FunctionPatcher/Proxy.php';
13
+require __DIR__.'/FunctionPatcher/NodeVisitor.php';
14
+require __DIR__.'/FunctionPatcher/Proxy.php';
15 15
 
16 16
 use LogicException;
17 17
 
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/2.x/Patcher/ConstantPatcher.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@
 block discarded – undo
10 10
 
11 11
 namespace Kenjis\MonkeyPatch\Patcher;
12 12
 
13
-require __DIR__ . '/ConstantPatcher/NodeVisitor.php';
14
-require __DIR__ . '/ConstantPatcher/Proxy.php';
13
+require __DIR__.'/ConstantPatcher/NodeVisitor.php';
14
+require __DIR__.'/ConstantPatcher/Proxy.php';
15 15
 
16 16
 use LogicException;
17 17
 
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/libraries/old/3.1.2-Upload.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -293,8 +293,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/old/3.0.1-Loader.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -63,63 +63,63 @@  discard block
 block discarded – undo
63 63
 	 *
64 64
 	 * @var	array
65 65
 	 */
66
-	protected $_ci_view_paths =	array(VIEWPATH	=> TRUE);
66
+	protected $_ci_view_paths = array(VIEWPATH	=> TRUE);
67 67
 
68 68
 	/**
69 69
 	 * List of paths to load libraries from
70 70
 	 *
71 71
 	 * @var	array
72 72
 	 */
73
-	protected $_ci_library_paths =	array(APPPATH, BASEPATH);
73
+	protected $_ci_library_paths = array(APPPATH, BASEPATH);
74 74
 
75 75
 	/**
76 76
 	 * List of paths to load models from
77 77
 	 *
78 78
 	 * @var	array
79 79
 	 */
80
-	protected $_ci_model_paths =	array(APPPATH);
80
+	protected $_ci_model_paths = array(APPPATH);
81 81
 
82 82
 	/**
83 83
 	 * List of paths to load helpers from
84 84
 	 *
85 85
 	 * @var	array
86 86
 	 */
87
-	protected $_ci_helper_paths =	array(APPPATH, BASEPATH);
87
+	protected $_ci_helper_paths = array(APPPATH, BASEPATH);
88 88
 
89 89
 	/**
90 90
 	 * List of cached variables
91 91
 	 *
92 92
 	 * @var	array
93 93
 	 */
94
-	protected $_ci_cached_vars =	array();
94
+	protected $_ci_cached_vars = array();
95 95
 
96 96
 	/**
97 97
 	 * List of loaded classes
98 98
 	 *
99 99
 	 * @var	array
100 100
 	 */
101
-	protected $_ci_classes =	array();
101
+	protected $_ci_classes = array();
102 102
 
103 103
 	/**
104 104
 	 * List of loaded models
105 105
 	 *
106 106
 	 * @var	array
107 107
 	 */
108
-	protected $_ci_models =	array();
108
+	protected $_ci_models = array();
109 109
 
110 110
 	/**
111 111
 	 * List of loaded helpers
112 112
 	 *
113 113
 	 * @var	array
114 114
 	 */
115
-	protected $_ci_helpers =	array();
115
+	protected $_ci_helpers = array();
116 116
 
117 117
 	/**
118 118
 	 * List of class name mappings
119 119
 	 *
120 120
 	 * @var	array
121 121
 	 */
122
-	protected $_ci_varmap =	array(
122
+	protected $_ci_varmap = array(
123 123
 		'unit_test' => 'unit',
124 124
 		'user_agent' => 'agent'
125 125
 	);
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 	public function __construct()
137 137
 	{
138 138
 		$this->_ci_ob_level = ob_get_level();
139
-		$this->_ci_classes =& is_loaded();
139
+		$this->_ci_classes = & is_loaded();
140 140
 
141 141
 		log_message('info', 'Loader Class Initialized');
142 142
 	}
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 			return $this;
272 272
 		}
273 273
 
274
-		$CI =& get_instance();
274
+		$CI = & get_instance();
275 275
 		if (isset($CI->$name))
276 276
 		{
277 277
 			throw new RuntimeException('The model name you are loading is the name of a resource that is already being used: '.$name);
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 	public function database($params = '', $return = FALSE, $query_builder = NULL)
343 343
 	{
344 344
 		// Grab the super object
345
-		$CI =& get_instance();
345
+		$CI = & get_instance();
346 346
 
347 347
 		// Do we even need to load the database class?
348 348
 		if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id))
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
 		$CI->db = '';
363 363
 
364 364
 		// Load the DB class
365
-		$CI->db =& DB($params, $query_builder);
365
+		$CI->db = & DB($params, $query_builder);
366 366
 		return $this;
367 367
 	}
368 368
 
@@ -377,12 +377,12 @@  discard block
 block discarded – undo
377 377
 	 */
378 378
 	public function dbutil($db = NULL, $return = FALSE)
379 379
 	{
380
-		$CI =& get_instance();
380
+		$CI = & get_instance();
381 381
 
382 382
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
383 383
 		{
384 384
 			class_exists('CI_DB', FALSE) OR $this->database();
385
-			$db =& $CI->db;
385
+			$db = & $CI->db;
386 386
 		}
387 387
 
388 388
 		require_once(BASEPATH.'database/DB_utility.php');
@@ -409,11 +409,11 @@  discard block
 block discarded – undo
409 409
 	 */
410 410
 	public function dbforge($db = NULL, $return = FALSE)
411 411
 	{
412
-		$CI =& get_instance();
412
+		$CI = & get_instance();
413 413
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
414 414
 		{
415 415
 			class_exists('CI_DB', FALSE) OR $this->database();
416
-			$db =& $CI->db;
416
+			$db = & $CI->db;
417 417
 		}
418 418
 
419 419
 		require_once(BASEPATH.'database/DB_forge.php');
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 		$this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths;
747 747
 
748 748
 		// Add config file path
749
-		$config =& $this->_ci_get_component('config');
749
+		$config = & $this->_ci_get_component('config');
750 750
 		$config->_config_paths[] = $path;
751 751
 
752 752
 		return $this;
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
781 781
 	 */
782 782
 	public function remove_package_path($path = '')
783 783
 	{
784
-		$config =& $this->_ci_get_component('config');
784
+		$config = & $this->_ci_get_component('config');
785 785
 
786 786
 		if ($path === '')
787 787
 		{
@@ -882,12 +882,12 @@  discard block
 block discarded – undo
882 882
 
883 883
 		// This allows anything loaded using $this->load (views, files, etc.)
884 884
 		// to become accessible from within the Controller and Model functions.
885
-		$_ci_CI =& get_instance();
885
+		$_ci_CI = & get_instance();
886 886
 		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var)
887 887
 		{
888 888
 			if ( ! isset($this->$_ci_key))
889 889
 			{
890
-				$this->$_ci_key =& $_ci_CI->$_ci_key;
890
+				$this->$_ci_key = & $_ci_CI->$_ci_key;
891 891
 			}
892 892
 		}
893 893
 
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
1026 1026
 				// return a new instance of the object
1027 1027
 				if ($object_name !== NULL)
1028 1028
 				{
1029
-					$CI =& get_instance();
1029
+					$CI = & get_instance();
1030 1030
 					if ( ! isset($CI->$object_name))
1031 1031
 					{
1032 1032
 						return $this->_ci_init_library($class, '', $params, $object_name);
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
 			// return a new instance of the object
1090 1090
 			if ($object_name !== NULL)
1091 1091
 			{
1092
-				$CI =& get_instance();
1092
+				$CI = & get_instance();
1093 1093
 				if ( ! isset($CI->$object_name))
1094 1094
 				{
1095 1095
 					return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
@@ -1232,7 +1232,7 @@  discard block
 block discarded – undo
1232 1232
 		}
1233 1233
 
1234 1234
 		// Don't overwrite existing properties
1235
-		$CI =& get_instance();
1235
+		$CI = & get_instance();
1236 1236
 		if (isset($CI->$object_name))
1237 1237
 		{
1238 1238
 			if ($CI->$object_name instanceof $class_name)
@@ -1365,7 +1365,7 @@  discard block
 block discarded – undo
1365 1365
 	 */
1366 1366
 	protected function &_ci_get_component($component)
1367 1367
 	{
1368
-		$CI =& get_instance();
1368
+		$CI = & get_instance();
1369 1369
 		return $CI->$component;
1370 1370
 	}
1371 1371
 
Please login to merge, or discard this patch.