Completed
Pull Request — master (#274)
by
unknown
02:33
created
tests/_ci_phpunit_test/patcher/4.x/Patcher/ConstantPatcher/Proxy.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/4.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,23 +47,23 @@  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
-			$replacement = new FullyQualified('\__ConstProxy__::get(\'' . (string) $node->name . '\')');
62
+			$replacement = new FullyQualified('\__ConstProxy__::get(\''.(string) $node->name.'\')');
63 63
 
64 64
 			$pos = $node->getAttribute('startTokenPos');
65 65
 			ConstantPatcher::$replacement[$pos] = 
66
-				'\__ConstProxy__::get(\'' . (string) $node->name .'\')';
66
+				'\__ConstProxy__::get(\''.(string) $node->name.'\')';
67 67
 
68 68
 			$node->name = $replacement;
69 69
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/4.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.
application/tests/_ci_phpunit_test/patcher/bootstrap.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -12,36 +12,36 @@
 block discarded – undo
12 12
 if (class_exists('PhpParser\Autoloader')) {
13 13
 	if (class_exists('PhpParser\Node\Identifier')) {
14 14
 		// PHP-Parser 4.x
15
-		require __DIR__ . '/4.x/MonkeyPatchManager.php';
15
+		require __DIR__.'/4.x/MonkeyPatchManager.php';
16 16
 	}
17
-	elseif (method_exists('PhpParser\Node\Name','set')) {
17
+	elseif (method_exists('PhpParser\Node\Name', 'set')) {
18 18
 		// PHP-Parser 2.x
19
-		require __DIR__ . '/2.x/MonkeyPatchManager.php';
19
+		require __DIR__.'/2.x/MonkeyPatchManager.php';
20 20
 	} else {
21 21
 		// PHP-Parser 3.x
22
-		require __DIR__ . '/3.x/MonkeyPatchManager.php';
22
+		require __DIR__.'/3.x/MonkeyPatchManager.php';
23 23
 	}
24 24
 }
25 25
 // If you don't use Composer
26 26
 else {
27 27
 	if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
28 28
 		// Use PHP-Parser 3.x
29
-		require __DIR__ . '/third_party/PHP-Parser-3.1.5/lib/bootstrap.php';
30
-		require __DIR__ . '/3.x/MonkeyPatchManager.php';
29
+		require __DIR__.'/third_party/PHP-Parser-3.1.5/lib/bootstrap.php';
30
+		require __DIR__.'/3.x/MonkeyPatchManager.php';
31 31
 	} else {
32 32
 		// Use PHP-Parser 2.x
33
-		require __DIR__ . '/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
34
-		require __DIR__ . '/2.x/MonkeyPatchManager.php';
33
+		require __DIR__.'/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
34
+		require __DIR__.'/2.x/MonkeyPatchManager.php';
35 35
 	}
36 36
 }
37 37
 
38
-require __DIR__ . '/IncludeStream.php';
39
-require __DIR__ . '/PathChecker.php';
40
-require __DIR__ . '/MonkeyPatch.php';
41
-require __DIR__ . '/Cache.php';
42
-require __DIR__ . '/InvocationVerifier.php';
38
+require __DIR__.'/IncludeStream.php';
39
+require __DIR__.'/PathChecker.php';
40
+require __DIR__.'/MonkeyPatch.php';
41
+require __DIR__.'/Cache.php';
42
+require __DIR__.'/InvocationVerifier.php';
43 43
 
44
-require __DIR__ . '/functions/exit__.php';
44
+require __DIR__.'/functions/exit__.php';
45 45
 
46 46
 const __GO_TO_ORIG__ = '__GO_TO_ORIG__';
47 47
 
Please login to merge, or discard this patch.
application/tests/Bootstrap.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
  * NOTE: If you change these, also change the error_reporting() code below
55 55
  */
56 56
 // This `if` statemant is needed for @runInSeparateProcess
57
-if (! defined('ENVIRONMENT'))
57
+if ( ! defined('ENVIRONMENT'))
58 58
 {
59 59
 	define('ENVIRONMENT', 'testing');
60 60
 }
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
233 233
 
234 234
 	// Path to the test directory containing all the test files.
235
-	define('TESTPATH', __dir__.DIRECTORY_SEPARATOR);  // Should be the folder this `Bootstrap.php` file is in.
235
+	define('TESTPATH', __dir__.DIRECTORY_SEPARATOR); // Should be the folder this `Bootstrap.php` file is in.
236 236
 
237 237
 	// Path to the system directory
238 238
 	define('BASEPATH', $system_path);
@@ -314,9 +314,9 @@  discard block
 block discarded – undo
314 314
 	define('VIEWPATH', $view_folder.DIRECTORY_SEPARATOR);
315 315
 
316 316
 	// Path to the ci-phpunit-test directory
317
-	if (is_file(TESTPATH . '_ci_phpunit_test' . DIRECTORY_SEPARATOR . 'CIPHPUnitTest.php'))
317
+	if (is_file(TESTPATH.'_ci_phpunit_test'.DIRECTORY_SEPARATOR.'CIPHPUnitTest.php'))
318 318
 	{
319
-		define('CI_PHPUNIT_TESTPATH', TESTPATH . '_ci_phpunit_test' . DIRECTORY_SEPARATOR);
319
+		define('CI_PHPUNIT_TESTPATH', TESTPATH.'_ci_phpunit_test'.DIRECTORY_SEPARATOR);
320 320
 	}
321 321
 	else
322 322
 	{
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 define('TESTPATH', APPPATH.'tests'.DIRECTORY_SEPARATOR);
383 383
 */
384 384
 
385
-require CI_PHPUNIT_TESTPATH . '/CIPHPUnitTest.php';
385
+require CI_PHPUNIT_TESTPATH.'/CIPHPUnitTest.php';
386 386
 
387 387
 CIPHPUnitTest::init();
388 388
 // Or you can set directories for autoloading
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTest.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -27,11 +27,11 @@  discard block
 block discarded – undo
27 27
 	 */
28 28
 	public static function init(array $autoload_dirs = null)
29 29
 	{
30
-		if (! defined('TESTPATH')) {
30
+		if ( ! defined('TESTPATH')) {
31 31
 			define('TESTPATH', APPPATH.'tests'.DIRECTORY_SEPARATOR);
32 32
 		}
33 33
         // Current Bootstrap.php should define this, but in case it doesn't:
34
-		if (! defined('CI_PHPUNIT_TESTPATH')) {
34
+		if ( ! defined('CI_PHPUNIT_TESTPATH')) {
35 35
 			define('CI_PHPUNIT_TESTPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
36 36
 		}
37 37
 
@@ -48,38 +48,38 @@  discard block
 block discarded – undo
48 48
 		$cwd_backup = getcwd();
49 49
 
50 50
 		// Load autoloader for ci-phpunit-test
51
-		require __DIR__ . '/autoloader.php';
51
+		require __DIR__.'/autoloader.php';
52 52
 
53
-		require TESTPATH . 'TestCase.php';
53
+		require TESTPATH.'TestCase.php';
54 54
 
55
-		$db_test_case_file = TESTPATH . 'DbTestCase.php';
55
+		$db_test_case_file = TESTPATH.'DbTestCase.php';
56 56
 		if (is_readable($db_test_case_file))
57 57
 		{
58 58
 			require $db_test_case_file;
59 59
 		}
60 60
 
61
-		$unit_test_case_file = TESTPATH . 'UnitTestCase.php';
61
+		$unit_test_case_file = TESTPATH.'UnitTestCase.php';
62 62
 		if (is_readable($unit_test_case_file))
63 63
 		{
64 64
 			require $unit_test_case_file;
65 65
 		}
66 66
 
67 67
 		// Replace a few Common functions
68
-		require __DIR__ . '/replacing/core/Common.php';
69
-		require BASEPATH . 'core/Common.php';
68
+		require __DIR__.'/replacing/core/Common.php';
69
+		require BASEPATH.'core/Common.php';
70 70
 
71 71
 		// Workaround for missing CodeIgniter's error handler
72 72
 		// See https://github.com/kenjis/ci-phpunit-test/issues/37
73 73
 		set_error_handler('_error_handler');
74 74
 
75 75
 		// Load new functions of CIPHPUnitTest
76
-		require __DIR__ . '/functions.php';
76
+		require __DIR__.'/functions.php';
77 77
 		// Load ci-phpunit-test CI_Loader
78
-		require __DIR__ . '/replacing/core/Loader.php';
78
+		require __DIR__.'/replacing/core/Loader.php';
79 79
 		// Load ci-phpunit-test CI_Input
80
-		require __DIR__ . '/replacing/core/Input.php';
80
+		require __DIR__.'/replacing/core/Input.php';
81 81
 		// Load ci-phpunit-test CI_Output
82
-		require __DIR__ . '/replacing/core/Output.php';
82
+		require __DIR__.'/replacing/core/Output.php';
83 83
 
84 84
 		// Change current directory
85 85
 		chdir(FCPATH);
@@ -91,12 +91,12 @@  discard block
 block discarded – undo
91 91
 		 *
92 92
 		 * And away we go...
93 93
 		 */
94
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
94
+		require __DIR__.'/replacing/core/CodeIgniter.php';
95 95
 
96 96
 		self::replaceHelpers();
97 97
 
98 98
 		// Create CodeIgniter instance
99
-		if (! self::wiredesignzHmvcInstalled())
99
+		if ( ! self::wiredesignzHmvcInstalled())
100 100
 		{
101 101
 			new CI_Controller();
102 102
 		}
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 	 */
121 121
 	public static function createCodeIgniterInstance($use_my_controller = false)
122 122
 	{
123
-		if (! self::wiredesignzHmvcInstalled())
123
+		if ( ! self::wiredesignzHmvcInstalled())
124 124
 		{
125 125
 			if ($use_my_controller && self::hasMyController())
126 126
 			{
@@ -145,11 +145,11 @@  discard block
 block discarded – undo
145 145
 		}
146 146
 
147 147
 		$my_controller_file =
148
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Controller.php';
148
+			APPPATH.'core/'.config_item('subclass_prefix').'Controller.php';
149 149
 
150 150
 		if (file_exists($my_controller_file))
151 151
 		{
152
-			$controller_class = config_item('subclass_prefix') . 'Controller';
152
+			$controller_class = config_item('subclass_prefix').'Controller';
153 153
 			if ( ! class_exists($controller_class))
154 154
 			{
155 155
 				require $my_controller_file;
@@ -181,11 +181,11 @@  discard block
 block discarded – undo
181 181
 	protected static function replaceLoader()
182 182
 	{
183 183
 		$my_loader_file =
184
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
184
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
185 185
 
186 186
 		if (file_exists($my_loader_file))
187 187
 		{
188
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
188
+			self::$loader_class = config_item('subclass_prefix').'Loader';
189 189
 			if ( ! class_exists(self::$loader_class))
190 190
 			{
191 191
 				require $my_loader_file;
@@ -204,19 +204,19 @@  discard block
 block discarded – undo
204 204
 
205 205
 	protected static function loadHelper($helper)
206 206
 	{
207
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php';
207
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php';
208 208
 		if (file_exists($my_helper_file))
209 209
 		{
210 210
 			require $my_helper_file;
211 211
 		}
212
-		require __DIR__ . '/replacing/helpers/' . $helper . '.php';
212
+		require __DIR__.'/replacing/helpers/'.$helper.'.php';
213 213
 	}
214 214
 
215 215
 	public static function setPatcherCacheDir($dir = null)
216 216
 	{
217 217
 		if ($dir === null)
218 218
 		{
219
-			$dir = CI_PHPUNIT_TESTPATH . 'tmp/cache';
219
+			$dir = CI_PHPUNIT_TESTPATH.'tmp/cache';
220 220
 		}
221 221
 
222 222
 		MonkeyPatchManager::setCacheDir(
Please login to merge, or discard this patch.