Completed
Push — master ( 14612f...0c1033 )
by Kenji
02:44
created
application/tests/_ci_phpunit_test/patcher/MonkeyPatchManager.php 2 patches
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -11,8 +11,6 @@
 block discarded – undo
11 11
 namespace Kenjis\MonkeyPatch;
12 12
 
13 13
 use LogicException;
14
-use RuntimeException;
15
-
16 14
 use Kenjis\MonkeyPatch\Patcher\FunctionPatcher;
17 15
 
18 16
 class MonkeyPatchManager
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
 	public static function log($message)
36 36
 	{
37
-		if (! self::$debug)
37
+		if ( ! self::$debug)
38 38
 		{
39 39
 			return;
40 40
 		}
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 		}
65 65
 		if (self::$debug)
66 66
 		{
67
-			self::$log_file = __DIR__ . '/debug.log';
67
+			self::$log_file = __DIR__.'/debug.log';
68 68
 		}
69 69
 
70 70
 		if (isset($config['root_dir']))
@@ -74,16 +74,16 @@  discard block
 block discarded – undo
74 74
 		else
75 75
 		{
76 76
 			// APPPATH is constant in CodeIgniter
77
-			Cache::setProjectRootDir(APPPATH . '../');
77
+			Cache::setProjectRootDir(APPPATH.'../');
78 78
 		}
79 79
 
80
-		if (! isset($config['cache_dir']))
80
+		if ( ! isset($config['cache_dir']))
81 81
 		{
82 82
 			throw new LogicException('You have to set "cache_dir"');
83 83
 		}
84 84
 		self::setCacheDir($config['cache_dir']);
85 85
 
86
-		if (! isset($config['include_paths']))
86
+		if ( ! isset($config['include_paths']))
87 87
 		{
88 88
 			throw new LogicException('You have to set "include_paths"');
89 89
 		}
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		// Updated?
132 132
 		if ($cached !== $current)
133 133
 		{
134
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
134
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
135 135
 			Cache::clearSrcCache();
136 136
 			Cache::writeTmpIncludePaths($current);
137 137
 		}
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 		// Updated?
143 143
 		if ($cached !== $current)
144 144
 		{
145
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
145
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
146 146
 			Cache::clearSrcCache();
147 147
 			Cache::writeTmpExcludePaths($current);
148 148
 		}
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 		// Updated?
156 156
 		if ($cached !== self::$patcher_list)
157 157
 		{
158
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
158
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
159 159
 			Cache::clearSrcCache();
160 160
 			Cache::writeTmpPatcherList(self::$patcher_list);
161 161
 		}
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 		// Updated?
170 170
 		if ($cached !== $current)
171 171
 		{
172
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
172
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
173 173
 			Cache::clearSrcCache();
174 174
 			Cache::writeTmpFunctionWhitelist($current);
175 175
 		}
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 	 */
232 232
 	public static function patch($path)
233 233
 	{
234
-		if (! is_readable($path))
234
+		if ( ! is_readable($path))
235 235
 		{
236 236
 			throw new LogicException("Can't read '$path'");
237 237
 		}
@@ -239,17 +239,17 @@  discard block
 block discarded – undo
239 239
 		// Check cache file
240 240
 		if ($cache_file = Cache::getValidSrcCachePath($path))
241 241
 		{
242
-			self::log('cache_hit: ' . $path);
242
+			self::log('cache_hit: '.$path);
243 243
 			return fopen($cache_file, 'r');
244 244
 		}
245 245
 
246
-		self::log('cache_miss: ' . $path);
246
+		self::log('cache_miss: '.$path);
247 247
 		$source = file_get_contents($path);
248 248
 
249 249
 		list($new_source, $patched) = self::execPatchers($source);
250 250
 
251 251
 		// Write to cache file
252
-		self::log('write_cache: ' . $path);
252
+		self::log('write_cache: '.$path);
253 253
 		Cache::writeSrcCacheFile($path, $new_source);
254 254
 
255 255
 		$resource = fopen('php://memory', 'rb+');
@@ -265,12 +265,12 @@  discard block
 block discarded – undo
265 265
 			return;
266 266
 		}
267 267
 
268
-		require __DIR__ . '/Patcher/AbstractPatcher.php';
269
-		require __DIR__ . '/Patcher/Backtrace.php';
268
+		require __DIR__.'/Patcher/AbstractPatcher.php';
269
+		require __DIR__.'/Patcher/Backtrace.php';
270 270
 
271 271
 		foreach (self::$patcher_list as $classname)
272 272
 		{
273
-			require __DIR__ . '/Patcher/' . $classname . '.php';
273
+			require __DIR__.'/Patcher/'.$classname.'.php';
274 274
 		}
275 275
 
276 276
 		self::$load_patchers = true;
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 		$patched = false;
282 282
 		foreach (self::$patcher_list as $classname)
283 283
 		{
284
-			$classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname;
284
+			$classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname;
285 285
 			$patcher = new $classname;
286 286
 			list($source, $patched_this) = $patcher->patch($source);
287 287
 			$patched = $patched || $patched_this;
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/Patcher/FunctionPatcher/NodeVisitor.php 2 patches
Unused Use Statements   -4 removed lines patch added patch discarded remove patch
@@ -21,15 +21,11 @@
 block discarded – undo
21 21
 
22 22
 namespace Kenjis\MonkeyPatch\Patcher\FunctionPatcher;
23 23
 
24
-use ReflectionFunction;
25
-use ReflectionException;
26
-
27 24
 use PhpParser\Node;
28 25
 use PhpParser\Node\Expr\FuncCall;
29 26
 use PhpParser\Node\Name;
30 27
 use PhpParser\Node\Name\FullyQualified;
31 28
 use PhpParser\NodeVisitorAbstract;
32
-
33 29
 use Kenjis\MonkeyPatch\Patcher\FunctionPatcher;
34 30
 
35 31
 class NodeVisitor extends NodeVisitorAbstract
Please login to merge, or discard this 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
 		}
@@ -57,12 +57,12 @@  discard block
 block discarded – undo
57 57
 		) {
58 58
 			$replacement = new FullyQualified(array());
59 59
 			$replacement->set(
60
-				'\__FuncProxy__::' . (string) $node->name
60
+				'\__FuncProxy__::'.(string) $node->name
61 61
 			);
62 62
 
63 63
 			$pos = $node->getAttribute('startTokenPos');
64 64
 			FunctionPatcher::$replacement[$pos] = 
65
-				'\__FuncProxy__::' . (string) $node->name;
65
+				'\__FuncProxy__::'.(string) $node->name;
66 66
 
67 67
 			$node->name = $replacement;
68 68
 		}
Please login to merge, or discard this patch.
tests/_ci_phpunit_test/patcher/Patcher/MethodPatcher/NodeVisitor.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,6 @@
 block discarded – undo
13 13
 use PhpParser\Node;
14 14
 use PhpParser\Node\Stmt\ClassMethod;
15 15
 use PhpParser\NodeVisitorAbstract;
16
-
17 16
 use Kenjis\MonkeyPatch\Patcher\MethodPatcher;
18 17
 
19 18
 class NodeVisitor extends NodeVisitorAbstract
Please login to merge, or discard this 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.
Installer.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,10 +26,10 @@  discard block
 block discarded – undo
26 26
      */
27 27
     private static function fixPath()
28 28
     {
29
-        $file = static::TEST_FOLDER . '/Bootstrap.php';
29
+        $file = static::TEST_FOLDER.'/Bootstrap.php';
30 30
         $contents = file_get_contents($file);
31 31
         
32
-        if (! file_exists('system')) {
32
+        if ( ! file_exists('system')) {
33 33
             if (file_exists('vendor/codeigniter/framework/system')) {
34 34
                 $contents = str_replace(
35 35
                     '$system_path = \'../../system\';',
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
             }
42 42
         }
43 43
         
44
-        if (! file_exists('index.php')) {
44
+        if ( ! file_exists('index.php')) {
45 45
             if (file_exists('public/index.php')) {
46 46
                 $contents = str_replace(
47 47
                     "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
@@ -82,11 +82,11 @@  discard block
 block discarded – undo
82 82
         
83 83
         foreach ($iterator as $file) {
84 84
             if ($file->isDir()) {
85
-                @mkdir($dst . '/' . $iterator->getSubPathName());
85
+                @mkdir($dst.'/'.$iterator->getSubPathName());
86 86
             } else {
87
-                $success = copy($file, $dst . '/' . $iterator->getSubPathName());
87
+                $success = copy($file, $dst.'/'.$iterator->getSubPathName());
88 88
                 if ($success) {
89
-                    echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
89
+                    echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
90 90
                 }
91 91
             }
92 92
         }
Please login to merge, or discard this patch.
application/libraries/Seeder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 
17 17
 	public function __construct()
18 18
 	{
19
-		$this->CI =& get_instance();
19
+		$this->CI = & get_instance();
20 20
 		$this->CI->load->database();
21 21
 		$this->CI->load->dbforge();
22 22
 		$this->db = $this->CI->db;
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function call($seeder)
32 32
 	{
33
-		$file = APPPATH . 'database/seeds/' . $seeder . '.php';
33
+		$file = APPPATH.'database/seeds/'.$seeder.'.php';
34 34
 		require_once $file;
35 35
 		$obj = new $seeder;
36 36
 		$obj->run();
Please login to merge, or discard this patch.
application/tests/Bootstrap.php 1 patch
Spacing   +2 added lines, -2 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 is needed for @runInSeparateProcess
57
-if (! defined('ENVIRONMENT'))
57
+if ( ! defined('ENVIRONMENT'))
58 58
 {
59 59
 	define('ENVIRONMENT', 'testing');
60 60
 }
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
  *  Added for CI PHPUnit Test
328 328
  * -------------------------------------------------------------------
329 329
  */
330
-require __DIR__ . '/_ci_phpunit_test/CIPHPUnitTest.php';
330
+require __DIR__.'/_ci_phpunit_test/CIPHPUnitTest.php';
331 331
 CIPHPUnitTest::init();
332 332
 /*
333 333
  * 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   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -31,27 +31,27 @@  discard block
 block discarded – undo
31 31
 		self::$autoload_dirs = $autoload_dirs;
32 32
 
33 33
 		// Load autoloader for ci-phpunit-test
34
-		require __DIR__ . '/autoloader.php';
34
+		require __DIR__.'/autoloader.php';
35 35
 
36 36
 		// Autoloader for PHP-Parser
37 37
 		// Don't use `require`, because we may have required already
38 38
 		// in `patcher/bootstrap.php`
39
-		require_once __DIR__ . '/patcher/third_party/PHP-Parser/lib/bootstrap.php';
39
+		require_once __DIR__.'/patcher/third_party/PHP-Parser/lib/bootstrap.php';
40 40
 
41
-		require APPPATH . '/tests/TestCase.php';
41
+		require APPPATH.'/tests/TestCase.php';
42 42
 
43 43
 		// Replace a few Common functions
44
-		require __DIR__ . '/replacing/core/Common.php';
45
-		require BASEPATH . 'core/Common.php';
44
+		require __DIR__.'/replacing/core/Common.php';
45
+		require BASEPATH.'core/Common.php';
46 46
 
47 47
 		// Workaround for missing CodeIgniter's error handler
48 48
 		// See https://github.com/kenjis/ci-phpunit-test/issues/37
49 49
 		set_error_handler('_error_handler');
50 50
 
51 51
 		// Load new functions of CIPHPUnitTest
52
-		require __DIR__ . '/functions.php';
52
+		require __DIR__.'/functions.php';
53 53
 		// Load ci-phpunit-test CI_Loader
54
-		require __DIR__ . '/replacing/core/Loader.php';
54
+		require __DIR__.'/replacing/core/Loader.php';
55 55
 
56 56
 		self::replaceHelpers();
57 57
 
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 		 *
66 66
 		 * And away we go...
67 67
 		 */
68
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
68
+		require __DIR__.'/replacing/core/CodeIgniter.php';
69 69
 		new CI_Controller();
70 70
 
71 71
 		// This code is here, not to cause errors with HMVC
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
 	protected static function replaceLoader()
84 84
 	{
85 85
 		$my_loader_file = 
86
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
86
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
87 87
 
88 88
 		if (file_exists($my_loader_file))
89 89
 		{
90
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
90
+			self::$loader_class = config_item('subclass_prefix').'Loader';
91 91
 			if ( ! class_exists(self::$loader_class))
92 92
 			{
93 93
 				require $my_loader_file;
@@ -98,19 +98,19 @@  discard block
 block discarded – undo
98 98
 
99 99
 	protected static function replaceHelpers()
100 100
 	{
101
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . 'url_helper.php';
101
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').'url_helper.php';
102 102
 		if (file_exists($my_helper_file))
103 103
 		{
104 104
 			require $my_helper_file;
105 105
 		}
106
-		require __DIR__ . '/replacing/helpers/url_helper.php';
106
+		require __DIR__.'/replacing/helpers/url_helper.php';
107 107
 	}
108 108
 
109 109
 	public static function setPatcherCacheDir($dir = null)
110 110
 	{
111 111
 		if ($dir === null)
112 112
 		{
113
-			$dir = APPPATH . 'tests/_ci_phpunit_test/tmp/cache';
113
+			$dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache';
114 114
 		}
115 115
 
116 116
 		MonkeyPatchManager::setCacheDir(
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestAutoloader.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	{
70 70
 		if (in_array($class, $this->alias))
71 71
 		{
72
-			$dir = __DIR__ . '/alias';
72
+			$dir = __DIR__.'/alias';
73 73
 			$this->loadClassFile($dir, $class);
74 74
 		}
75 75
 	}
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 		}
89 89
 		else
90 90
 		{
91
-			$dir = __DIR__ . '/exceptions';
91
+			$dir = __DIR__.'/exceptions';
92 92
 			$this->loadClassFile($dir, $class);
93 93
 		}
94 94
 	}
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 
130 130
 	protected function loadClassFile($dir, $class)
131 131
 	{
132
-		$class_file = $dir . '/' . $class . '.php';
132
+		$class_file = $dir.'/'.$class.'.php';
133 133
 		if (file_exists($class_file))
134 134
 		{
135 135
 			require $class_file;
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 			return $this->$name;
42 42
 		}
43 43
 
44
-		throw new LogicException('No such property: ' . $name);
44
+		throw new LogicException('No such property: '.$name);
45 45
 	}
46 46
 
47 47
 	public static function setUpBeforeClass()
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	{
62 62
 		reset_instance();
63 63
 		new CI_Controller();
64
-		$this->CI =& get_instance();
64
+		$this->CI = & get_instance();
65 65
 	}
66 66
 
67 67
 	protected function tearDown()
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 		$this->assertSame(
236 236
 			$code,
237 237
 			$actual,
238
-			'Status code is not ' . $code . ' but ' . $actual . '.'
238
+			'Status code is not '.$code.' but '.$actual.'.'
239 239
 		);
240 240
 	}
241 241
 
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 	 */
248 248
 	public function assertResponseHeader($name, $value)
249 249
 	{
250
-		$CI =& get_instance();
250
+		$CI = & get_instance();
251 251
 		$actual = $CI->output->get_header($name);
252 252
 
253 253
 		if ($actual === null)
@@ -277,18 +277,18 @@  discard block
 block discarded – undo
277 277
 			$this->fail('redirect() is not called.');
278 278
 		}
279 279
 
280
-		if (! function_exists('site_url'))
280
+		if ( ! function_exists('site_url'))
281 281
 		{
282
-			$CI =& get_instance();
282
+			$CI = & get_instance();
283 283
 			$CI->load->helper('url');
284 284
 		}
285 285
 		$absolute_url = site_url($uri);
286
-		$expected = 'Redirect to ' . $absolute_url;
286
+		$expected = 'Redirect to '.$absolute_url;
287 287
 
288 288
 		$this->assertSame(
289 289
 			$expected,
290 290
 			$status['redirect'],
291
-			'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.'
291
+			'URL to redirect is not '.$expected.' but '.$status['redirect'].'.'
292 292
 		);
293 293
 
294 294
 		if ($code !== null)
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
 			$this->assertSame(
297 297
 				$code,
298 298
 				$status['code'],
299
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
299
+				'Status code is not '.$code.' but '.$status['code'].'.'
300 300
 			);
301 301
 		}
302 302
 	}
Please login to merge, or discard this patch.