Completed
Pull Request — master (#165)
by Kenji
02:47
created
application/tests/_ci_phpunit_test/patcher/3.x/Patcher/MethodPatcher.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -13,8 +13,6 @@
 block discarded – undo
13 13
 require __DIR__ . '/MethodPatcher/NodeVisitor.php';
14 14
 require __DIR__ . '/MethodPatcher/PatchManager.php';
15 15
 
16
-use LogicException;
17
-
18 16
 use Kenjis\MonkeyPatch\Patcher\MethodPatcher\NodeVisitor;
19 17
 
20 18
 class MethodPatcher extends AbstractPatcher
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTest.php 2 patches
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -33,39 +33,39 @@  discard block
 block discarded – undo
33 33
 		$cwd_backup = getcwd();
34 34
 
35 35
 		// Load autoloader for ci-phpunit-test
36
-		require __DIR__ . '/autoloader.php';
36
+		require __DIR__.'/autoloader.php';
37 37
 
38 38
 		// Autoloader for PHP-Parser
39 39
 		// Don't use `require`, because we may have required already
40 40
 		// in `patcher/bootstrap.php`
41 41
 		if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
42
-			require_once __DIR__ . '/patcher/third_party/PHP-Parser-3.0.2/lib/bootstrap.php';
42
+			require_once __DIR__.'/patcher/third_party/PHP-Parser-3.0.2/lib/bootstrap.php';
43 43
 		} else {
44
-			require_once __DIR__ . '/patcher/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
44
+			require_once __DIR__.'/patcher/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
45 45
 		}
46 46
 
47
-		require APPPATH . '/tests/TestCase.php';
47
+		require APPPATH.'/tests/TestCase.php';
48 48
 
49
-		$db_test_case_file = APPPATH . '/tests/DbTestCase.php';
49
+		$db_test_case_file = APPPATH.'/tests/DbTestCase.php';
50 50
 		if (is_readable($db_test_case_file))
51 51
 		{
52 52
 			require $db_test_case_file;
53 53
 		}
54 54
 
55 55
 		// Replace a few Common functions
56
-		require __DIR__ . '/replacing/core/Common.php';
57
-		require BASEPATH . 'core/Common.php';
56
+		require __DIR__.'/replacing/core/Common.php';
57
+		require BASEPATH.'core/Common.php';
58 58
 
59 59
 		// Workaround for missing CodeIgniter's error handler
60 60
 		// See https://github.com/kenjis/ci-phpunit-test/issues/37
61 61
 		set_error_handler('_error_handler');
62 62
 
63 63
 		// Load new functions of CIPHPUnitTest
64
-		require __DIR__ . '/functions.php';
64
+		require __DIR__.'/functions.php';
65 65
 		// Load ci-phpunit-test CI_Loader
66
-		require __DIR__ . '/replacing/core/Loader.php';
66
+		require __DIR__.'/replacing/core/Loader.php';
67 67
 		// Load ci-phpunit-test CI_Input
68
-		require __DIR__ . '/replacing/core/Input.php';
68
+		require __DIR__.'/replacing/core/Input.php';
69 69
 
70 70
 		// Change current directroy
71 71
 		chdir(FCPATH);
@@ -77,12 +77,12 @@  discard block
 block discarded – undo
77 77
 		 *
78 78
 		 * And away we go...
79 79
 		 */
80
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
80
+		require __DIR__.'/replacing/core/CodeIgniter.php';
81 81
 
82 82
 		self::replaceHelpers();
83 83
 
84 84
 		// Create CodeIgniter instance
85
-		if (! self::wiredesignzHmvcInstalled())
85
+		if ( ! self::wiredesignzHmvcInstalled())
86 86
 		{
87 87
 			new CI_Controller();
88 88
 		}
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 
104 104
 	public static function createCodeIgniterInstance()
105 105
 	{
106
-		if (! self::wiredesignzHmvcInstalled())
106
+		if ( ! self::wiredesignzHmvcInstalled())
107 107
 		{
108 108
 			new CI_Controller();
109 109
 		}
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
 	protected static function replaceLoader()
133 133
 	{
134 134
 		$my_loader_file = 
135
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
135
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
136 136
 
137 137
 		if (file_exists($my_loader_file))
138 138
 		{
139
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
139
+			self::$loader_class = config_item('subclass_prefix').'Loader';
140 140
 			if ( ! class_exists(self::$loader_class))
141 141
 			{
142 142
 				require $my_loader_file;
@@ -155,19 +155,19 @@  discard block
 block discarded – undo
155 155
 
156 156
 	protected static function loadHelper($helper)
157 157
 	{
158
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php';
158
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php';
159 159
 		if (file_exists($my_helper_file))
160 160
 		{
161 161
 			require $my_helper_file;
162 162
 		}
163
-		require __DIR__ . '/replacing/helpers/' . $helper . '.php';
163
+		require __DIR__.'/replacing/helpers/'.$helper.'.php';
164 164
 	}
165 165
 
166 166
 	public static function setPatcherCacheDir($dir = null)
167 167
 	{
168 168
 		if ($dir === null)
169 169
 		{
170
-			$dir = APPPATH . 'tests/_ci_phpunit_test/tmp/cache';
170
+			$dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache';
171 171
 		}
172 172
 
173 173
 		MonkeyPatchManager::setCacheDir(
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -85,8 +85,7 @@  discard block
 block discarded – undo
85 85
 		if (! self::wiredesignzHmvcInstalled())
86 86
 		{
87 87
 			new CI_Controller();
88
-		}
89
-		else
88
+		} else
90 89
 		{
91 90
 			new MX_Controller();
92 91
 		}
@@ -106,8 +105,7 @@  discard block
 block discarded – undo
106 105
 		if (! self::wiredesignzHmvcInstalled())
107 106
 		{
108 107
 			new CI_Controller();
109
-		}
110
-		else
108
+		} else
111 109
 		{
112 110
 			new CI();
113 111
 			new MX_Controller();
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/3.x/Patcher/FunctionPatcher/NodeVisitor.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -36,17 +36,17 @@  discard block
 block discarded – undo
36 36
 {
37 37
 	public function leaveNode(Node $node)
38 38
 	{
39
-		if (! ($node instanceof FuncCall))
39
+		if ( ! ($node instanceof FuncCall))
40 40
 		{
41 41
 			return;
42 42
 		}
43 43
 
44
-		if (! ($node->name instanceof Name))
44
+		if ( ! ($node->name instanceof Name))
45 45
 		{
46 46
 			return;
47 47
 		}
48 48
 
49
-		if (! $node->name->isUnqualified())
49
+		if ( ! $node->name->isUnqualified())
50 50
 		{
51 51
 			return;
52 52
 		}
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
55 55
 			FunctionPatcher::isWhitelisted((string) $node->name)
56 56
 			&& ! FunctionPatcher::isBlacklisted((string) $node->name)
57 57
 		) {
58
-			$replacement = new FullyQualified('\__FuncProxy__::' . (string) $node->name);
58
+			$replacement = new FullyQualified('\__FuncProxy__::'.(string) $node->name);
59 59
 
60 60
 			$pos = $node->getAttribute('startTokenPos');
61 61
 			FunctionPatcher::$replacement[$pos] = 
62
-				'\__FuncProxy__::' . (string) $node->name;
62
+				'\__FuncProxy__::'.(string) $node->name;
63 63
 
64 64
 			$node->name = $replacement;
65 65
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/patcher/bootstrap.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -12,25 +12,25 @@
 block discarded – undo
12 12
 	// Autoloader for PHP-Parser
13 13
 	// Don't use `require`, because we must require it in CIPHPUnitTest::init()
14 14
 	// for providing autoloading when we don't use Monkey Patching
15
-	require_once __DIR__ . '/third_party/PHP-Parser-3.0.2/lib/bootstrap.php';
15
+	require_once __DIR__.'/third_party/PHP-Parser-3.0.2/lib/bootstrap.php';
16 16
 
17
-	require __DIR__ . '/3.x/MonkeyPatchManager.php';
17
+	require __DIR__.'/3.x/MonkeyPatchManager.php';
18 18
 } else {
19 19
 	// Autoloader for PHP-Parser
20 20
 	// Don't use `require`, because we must require it in CIPHPUnitTest::init()
21 21
 	// for providing autoloading when we don't use Monkey Patching
22
-	require_once __DIR__ . '/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
22
+	require_once __DIR__.'/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
23 23
 	
24
-	require __DIR__ . '/2.x/MonkeyPatchManager.php';
24
+	require __DIR__.'/2.x/MonkeyPatchManager.php';
25 25
 }
26 26
 
27
-require __DIR__ . '/IncludeStream.php';
28
-require __DIR__ . '/PathChecker.php';
29
-require __DIR__ . '/MonkeyPatch.php';
30
-require __DIR__ . '/Cache.php';
31
-require __DIR__ . '/InvocationVerifier.php';
27
+require __DIR__.'/IncludeStream.php';
28
+require __DIR__.'/PathChecker.php';
29
+require __DIR__.'/MonkeyPatch.php';
30
+require __DIR__.'/Cache.php';
31
+require __DIR__.'/InvocationVerifier.php';
32 32
 
33
-require __DIR__ . '/functions/exit__.php';
33
+require __DIR__.'/functions/exit__.php';
34 34
 
35 35
 const __GO_TO_ORIG__ = '__GO_TO_ORIG__';
36 36
 
Please login to merge, or discard this patch.