Inspection of "Monkey patch PHP 7.1 syntax support" - kenjis/ci-phpunit-test - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#165)

by Kenji

created 2017-02-03 10:43 UTC

Status

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -33,39 +33,39 @@  discard block
 block discarded – undo
 		$cwd_backup = getcwd();
 
 		// Load autoloader for ci-phpunit-test
-		require __DIR__ . '/autoloader.php';
+		require __DIR__.'/autoloader.php';
 
 		// Autoloader for PHP-Parser
 		// Don't use `require`, because we may have required already
 		// in `patcher/bootstrap.php`
 		if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
-			require_once __DIR__ . '/patcher/third_party/PHP-Parser-3.0.2/lib/bootstrap.php';
+			require_once __DIR__.'/patcher/third_party/PHP-Parser-3.0.2/lib/bootstrap.php';
 		} else {
-			require_once __DIR__ . '/patcher/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
+			require_once __DIR__.'/patcher/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
 		}
 
-		require APPPATH . '/tests/TestCase.php';
+		require APPPATH.'/tests/TestCase.php';
 
-		$db_test_case_file = APPPATH . '/tests/DbTestCase.php';
+		$db_test_case_file = APPPATH.'/tests/DbTestCase.php';
 		if (is_readable($db_test_case_file))
 		{
 			require $db_test_case_file;
 		}
 
 		// Replace a few Common functions
-		require __DIR__ . '/replacing/core/Common.php';
-		require BASEPATH . 'core/Common.php';
+		require __DIR__.'/replacing/core/Common.php';
+		require BASEPATH.'core/Common.php';
 
 		// Workaround for missing CodeIgniter's error handler
 		// See https://github.com/kenjis/ci-phpunit-test/issues/37
 		set_error_handler('_error_handler');
 
 		// Load new functions of CIPHPUnitTest
-		require __DIR__ . '/functions.php';
+		require __DIR__.'/functions.php';
 		// Load ci-phpunit-test CI_Loader
-		require __DIR__ . '/replacing/core/Loader.php';
+		require __DIR__.'/replacing/core/Loader.php';
 		// Load ci-phpunit-test CI_Input
-		require __DIR__ . '/replacing/core/Input.php';
+		require __DIR__.'/replacing/core/Input.php';
 
 		// Change current directroy
 		chdir(FCPATH);
@@ -77,12 +77,12 @@  discard block
 block discarded – undo
 		 *
 		 * And away we go...
 		 */
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
+		require __DIR__.'/replacing/core/CodeIgniter.php';
 
 		self::replaceHelpers();
 
 		// Create CodeIgniter instance
-		if (! self::wiredesignzHmvcInstalled())
+		if ( ! self::wiredesignzHmvcInstalled())
 		{
 			new CI_Controller();
 		}
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
 
 	public static function createCodeIgniterInstance()
 	{
-		if (! self::wiredesignzHmvcInstalled())
+		if ( ! self::wiredesignzHmvcInstalled())
 		{
 			new CI_Controller();
 		}
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
 	protected static function replaceLoader()
 	{
 		$my_loader_file = 
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
 
 		if (file_exists($my_loader_file))
 		{
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
+			self::$loader_class = config_item('subclass_prefix').'Loader';
 			if ( ! class_exists(self::$loader_class))
 			{
 				require $my_loader_file;
@@ -155,19 +155,19 @@  discard block
 block discarded – undo
 
 	protected static function loadHelper($helper)
 	{
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php';
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php';
 		if (file_exists($my_helper_file))
 		{
 			require $my_helper_file;
 		}
-		require __DIR__ . '/replacing/helpers/' . $helper . '.php';
+		require __DIR__.'/replacing/helpers/'.$helper.'.php';
 	}
 
 	public static function setPatcherCacheDir($dir = null)
 	{
 		if ($dir === null)
 		{
-			$dir = APPPATH . 'tests/_ci_phpunit_test/tmp/cache';
+			$dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache';
 		}
 
 		MonkeyPatchManager::setCacheDir(

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
 {
 	public function leaveNode(Node $node)
 	{
-		if (! ($node instanceof FuncCall))
+		if ( ! ($node instanceof FuncCall))
 		{
 			return;
 		}
 
-		if (! ($node->name instanceof Name))
+		if ( ! ($node->name instanceof Name))
 		{
 			return;
 		}
 
-		if (! $node->name->isUnqualified())
+		if ( ! $node->name->isUnqualified())
 		{
 			return;
 		}
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
 			FunctionPatcher::isWhitelisted((string) $node->name)
 			&& ! FunctionPatcher::isBlacklisted((string) $node->name)
 		) {
-			$replacement = new FullyQualified('\__FuncProxy__::' . (string) $node->name);
+			$replacement = new FullyQualified('\__FuncProxy__::'.(string) $node->name);
 
 			$pos = $node->getAttribute('startTokenPos');
 			FunctionPatcher::$replacement[$pos] = 
-				'\__FuncProxy__::' . (string) $node->name;
+				'\__FuncProxy__::'.(string) $node->name;
 
 			$node->name = $replacement;
 		}

Please login to merge, or discard this patch.

tests/_ci_phpunit_test/patcher/3.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
 
 	public function enterNode(Node $node)
 	{
-		$callback = [$this, 'before' . ucfirst($node->getType())];
+		$callback = [$this, 'before'.ucfirst($node->getType())];
 		if (is_callable($callback)) {
 			call_user_func_array($callback, [$node]);
 		}
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
 
 	public function leaveNode(Node $node)
 	{
-		if (! ($node instanceof ConstFetch))
+		if ( ! ($node instanceof ConstFetch))
 		{
-			$callback = [$this, 'rewrite' . ucfirst($node->getType())];
+			$callback = [$this, 'rewrite'.ucfirst($node->getType())];
 			if (is_callable($callback)) {
 				call_user_func_array($callback, [$node]);
 			}
@@ -47,23 +47,23 @@  discard block
 block discarded – undo
 			return;
 		}
 
-		if (! ($node->name instanceof Name))
+		if ( ! ($node->name instanceof Name))
 		{
 			return;
 		}
 
-		if (! $node->name->isUnqualified())
+		if ( ! $node->name->isUnqualified())
 		{
 			return;
 		}
 
-		if (! ConstantPatcher::isBlacklisted((string) $node->name))
+		if ( ! ConstantPatcher::isBlacklisted((string) $node->name))
 		{
-			$replacement = new FullyQualified('\__ConstProxy__::get(\'' . (string) $node->name . '\')');
+			$replacement = new FullyQualified('\__ConstProxy__::get(\''.(string) $node->name.'\')');
 
 			$pos = $node->getAttribute('startTokenPos');
 			ConstantPatcher::$replacement[$pos] = 
-				'\__ConstProxy__::get(\'' . (string) $node->name .'\')';
+				'\__ConstProxy__::get(\''.(string) $node->name.'\')';
 
 			$node->name = $replacement;
 		}

Please login to merge, or discard this patch.

application/tests/_ci_phpunit_test/patcher/3.x/MonkeyPatchManager.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 
 	public static function log($message)
 	{
-		if (! self::$debug)
+		if ( ! self::$debug)
 		{
 			return;
 		}
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
 		}
 		if (self::$debug)
 		{
-			self::$log_file = __DIR__ . '/debug.log';
+			self::$log_file = __DIR__.'/debug.log';
 		}
 	}
 
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
 		else
 		{
 			// APPPATH is constant in CodeIgniter
-			Cache::setProjectRootDir(APPPATH . '../');
+			Cache::setProjectRootDir(APPPATH.'../');
 		}
 
-		if (! isset($config['cache_dir']))
+		if ( ! isset($config['cache_dir']))
 		{
 			throw new LogicException('You have to set "cache_dir"');
 		}
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
 
 	protected static function setPaths(array $config)
 	{
-		if (! isset($config['include_paths']))
+		if ( ! isset($config['include_paths']))
 		{
 			throw new LogicException('You have to set "include_paths"');
 		}
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpIncludePaths($current);
 		}
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpExcludePaths($current);
 		}
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
 		// Updated?
 		if ($cached !== self::$patcher_list)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpPatcherList(self::$patcher_list);
 		}
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpFunctionWhitelist($current);
 		}
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
 	 */
 	public static function patch($path)
 	{
-		if (! is_readable($path))
+		if ( ! is_readable($path))
 		{
 			throw new LogicException("Can't read '$path'");
 		}
@@ -266,17 +266,17 @@  discard block
 block discarded – undo
 		// Check cache file
 		if ($cache_file = Cache::getValidSrcCachePath($path))
 		{
-			self::log('cache_hit: ' . $path);
+			self::log('cache_hit: '.$path);
 			return fopen($cache_file, 'r');
 		}
 
-		self::log('cache_miss: ' . $path);
+		self::log('cache_miss: '.$path);
 		$source = file_get_contents($path);
 
 		list($new_source, $patched) = self::execPatchers($source);
 
 		// Write to cache file
-		self::log('write_cache: ' . $path);
+		self::log('write_cache: '.$path);
 		Cache::writeSrcCacheFile($path, $new_source);
 
 		$resource = fopen('php://memory', 'rb+');
@@ -292,12 +292,12 @@  discard block
 block discarded – undo
 			return;
 		}
 
-		require __DIR__ . '/Patcher/AbstractPatcher.php';
-		require __DIR__ . '/Patcher/Backtrace.php';
+		require __DIR__.'/Patcher/AbstractPatcher.php';
+		require __DIR__.'/Patcher/Backtrace.php';
 
 		foreach (self::$patcher_list as $classname)
 		{
-			require __DIR__ . '/Patcher/' . $classname . '.php';
+			require __DIR__.'/Patcher/'.$classname.'.php';
 		}
 
 		self::$load_patchers = true;
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
 		$patched = false;
 		foreach (self::$patcher_list as $classname)
 		{
-			$classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname;
+			$classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname;
 			$patcher = new $classname;
 			list($source, $patched_this) = $patcher->patch($source);
 			$patched = $patched || $patched_this;

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
 	// Autoloader for PHP-Parser
 	// Don't use `require`, because we must require it in CIPHPUnitTest::init()
 	// for providing autoloading when we don't use Monkey Patching
-	require_once __DIR__ . '/third_party/PHP-Parser-3.0.2/lib/bootstrap.php';
+	require_once __DIR__.'/third_party/PHP-Parser-3.0.2/lib/bootstrap.php';
 
-	require __DIR__ . '/3.x/MonkeyPatchManager.php';
+	require __DIR__.'/3.x/MonkeyPatchManager.php';
 } else {
 	// Autoloader for PHP-Parser
 	// Don't use `require`, because we must require it in CIPHPUnitTest::init()
 	// for providing autoloading when we don't use Monkey Patching
-	require_once __DIR__ . '/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
+	require_once __DIR__.'/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
 	
-	require __DIR__ . '/2.x/MonkeyPatchManager.php';
+	require __DIR__.'/2.x/MonkeyPatchManager.php';
 }
 
-require __DIR__ . '/IncludeStream.php';
-require __DIR__ . '/PathChecker.php';
-require __DIR__ . '/MonkeyPatch.php';
-require __DIR__ . '/Cache.php';
-require __DIR__ . '/InvocationVerifier.php';
+require __DIR__.'/IncludeStream.php';
+require __DIR__.'/PathChecker.php';
+require __DIR__.'/MonkeyPatch.php';
+require __DIR__.'/Cache.php';
+require __DIR__.'/InvocationVerifier.php';
 
-require __DIR__ . '/functions/exit__.php';
+require __DIR__.'/functions/exit__.php';
 
 const __GO_TO_ORIG__ = '__GO_TO_ORIG__';
 

Please login to merge, or discard this patch.

application/tests/_ci_phpunit_test/patcher/2.x/MonkeyPatchManager.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 
 	public static function log($message)
 	{
-		if (! self::$debug)
+		if ( ! self::$debug)
 		{
 			return;
 		}
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
 		}
 		if (self::$debug)
 		{
-			self::$log_file = __DIR__ . '/debug.log';
+			self::$log_file = __DIR__.'/debug.log';
 		}
 	}
 
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
 		else
 		{
 			// APPPATH is constant in CodeIgniter
-			Cache::setProjectRootDir(APPPATH . '../');
+			Cache::setProjectRootDir(APPPATH.'../');
 		}
 
-		if (! isset($config['cache_dir']))
+		if ( ! isset($config['cache_dir']))
 		{
 			throw new LogicException('You have to set "cache_dir"');
 		}
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
 
 	protected static function setPaths(array $config)
 	{
-		if (! isset($config['include_paths']))
+		if ( ! isset($config['include_paths']))
 		{
 			throw new LogicException('You have to set "include_paths"');
 		}
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpIncludePaths($current);
 		}
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpExcludePaths($current);
 		}
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
 		// Updated?
 		if ($cached !== self::$patcher_list)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpPatcherList(self::$patcher_list);
 		}
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpFunctionWhitelist($current);
 		}
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
 	 */
 	public static function patch($path)
 	{
-		if (! is_readable($path))
+		if ( ! is_readable($path))
 		{
 			throw new LogicException("Can't read '$path'");
 		}
@@ -266,17 +266,17 @@  discard block
 block discarded – undo
 		// Check cache file
 		if ($cache_file = Cache::getValidSrcCachePath($path))
 		{
-			self::log('cache_hit: ' . $path);
+			self::log('cache_hit: '.$path);
 			return fopen($cache_file, 'r');
 		}
 
-		self::log('cache_miss: ' . $path);
+		self::log('cache_miss: '.$path);
 		$source = file_get_contents($path);
 
 		list($new_source, $patched) = self::execPatchers($source);
 
 		// Write to cache file
-		self::log('write_cache: ' . $path);
+		self::log('write_cache: '.$path);
 		Cache::writeSrcCacheFile($path, $new_source);
 
 		$resource = fopen('php://memory', 'rb+');
@@ -292,12 +292,12 @@  discard block
 block discarded – undo
 			return;
 		}
 
-		require __DIR__ . '/Patcher/AbstractPatcher.php';
-		require __DIR__ . '/Patcher/Backtrace.php';
+		require __DIR__.'/Patcher/AbstractPatcher.php';
+		require __DIR__.'/Patcher/Backtrace.php';
 
 		foreach (self::$patcher_list as $classname)
 		{
-			require __DIR__ . '/Patcher/' . $classname . '.php';
+			require __DIR__.'/Patcher/'.$classname.'.php';
 		}
 
 		self::$load_patchers = true;
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
 		$patched = false;
 		foreach (self::$patcher_list as $classname)
 		{
-			$classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname;
+			$classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname;
 			$patcher = new $classname;
 			list($source, $patched_this) = $patcher->patch($source);
 			$patched = $patched || $patched_this;

Please login to merge, or discard this 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(

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37
38	38	public static function log($message)
39	39	{
40		- if (! self::$debug)
	40	+ if ( ! self::$debug)
41	41	{
42	42	return;
43	43	}
		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	}
73	73	if (self::$debug)
74	74	{
75		- self::$log_file = __DIR__ . '/debug.log';
	75	+ self::$log_file = __DIR__.'/debug.log';
76	76	}
77	77	}
78	78
		@@ -85,10 +85,10 @@ discard block
		block discarded – undo
85	85	else
86	86	{
87	87	// APPPATH is constant in CodeIgniter
88		- Cache::setProjectRootDir(APPPATH . '../');
	88	+ Cache::setProjectRootDir(APPPATH.'../');
89	89	}
90	90
91		- if (! isset($config['cache_dir']))
	91	+ if ( ! isset($config['cache_dir']))
92	92	{
93	93	throw new LogicException('You have to set "cache_dir"');
94	94	}
		@@ -97,7 +97,7 @@ discard block
		block discarded – undo
97	97
98	98	protected static function setPaths(array $config)
99	99	{
100		- if (! isset($config['include_paths']))
	100	+ if ( ! isset($config['include_paths']))
101	101	{
102	102	throw new LogicException('You have to set "include_paths"');
103	103	}
		@@ -158,7 +158,7 @@ discard block
		block discarded – undo
158	158	// Updated?
159	159	if ($cached !== $current)
160	160	{
161		- MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
	161	+ MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
162	162	Cache::clearSrcCache();
163	163	Cache::writeTmpIncludePaths($current);
164	164	}
		@@ -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::writeTmpExcludePaths($current);
175	175	}
		@@ -182,7 +182,7 @@ discard block
		block discarded – undo
182	182	// Updated?
183	183	if ($cached !== self::$patcher_list)
184	184	{
185		- MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
	185	+ MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
186	186	Cache::clearSrcCache();
187	187	Cache::writeTmpPatcherList(self::$patcher_list);
188	188	}
		@@ -196,7 +196,7 @@ discard block
		block discarded – undo
196	196	// Updated?
197	197	if ($cached !== $current)
198	198	{
199		- MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
	199	+ MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
200	200	Cache::clearSrcCache();
201	201	Cache::writeTmpFunctionWhitelist($current);
202	202	}
		@@ -258,7 +258,7 @@ discard block
		block discarded – undo
258	258	*/
259	259	public static function patch($path)
260	260	{
261		- if (! is_readable($path))
	261	+ if ( ! is_readable($path))
262	262	{
263	263	throw new LogicException("Can't read '$path'");
264	264	}
		@@ -266,17 +266,17 @@ discard block
		block discarded – undo
266	266	// Check cache file
267	267	if ($cache_file = Cache::getValidSrcCachePath($path))
268	268	{
269		- self::log('cache_hit: ' . $path);
	269	+ self::log('cache_hit: '.$path);
270	270	return fopen($cache_file, 'r');
271	271	}
272	272
273		- self::log('cache_miss: ' . $path);
	273	+ self::log('cache_miss: '.$path);
274	274	$source = file_get_contents($path);
275	275
276	276	list($new_source, $patched) = self::execPatchers($source);
277	277
278	278	// Write to cache file
279		- self::log('write_cache: ' . $path);
	279	+ self::log('write_cache: '.$path);
280	280	Cache::writeSrcCacheFile($path, $new_source);
281	281
282	282	$resource = fopen('php://memory', 'rb+');
		@@ -292,12 +292,12 @@ discard block
		block discarded – undo
292	292	return;
293	293	}
294	294
295		- require __DIR__ . '/Patcher/AbstractPatcher.php';
296		- require __DIR__ . '/Patcher/Backtrace.php';
	295	+ require __DIR__.'/Patcher/AbstractPatcher.php';
	296	+ require __DIR__.'/Patcher/Backtrace.php';
297	297
298	298	foreach (self::$patcher_list as $classname)
299	299	{
300		- require __DIR__ . '/Patcher/' . $classname . '.php';
	300	+ require __DIR__.'/Patcher/'.$classname.'.php';
301	301	}
302	302
303	303	self::$load_patchers = true;
		@@ -308,7 +308,7 @@ discard block
		block discarded – undo
308	308	$patched = false;
309	309	foreach (self::$patcher_list as $classname)
310	310	{
311		- $classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname;
	311	+ $classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname;
312	312	$patcher = new $classname;
313	313	list($source, $patched_this) = $patcher->patch($source);
314	314	$patched = $patched \|\| $patched_this;

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37
38	38	public static function log($message)
39	39	{
40		- if (! self::$debug)
	40	+ if ( ! self::$debug)
41	41	{
42	42	return;
43	43	}
		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	}
73	73	if (self::$debug)
74	74	{
75		- self::$log_file = __DIR__ . '/debug.log';
	75	+ self::$log_file = __DIR__.'/debug.log';
76	76	}
77	77	}
78	78
		@@ -85,10 +85,10 @@ discard block
		block discarded – undo
85	85	else
86	86	{
87	87	// APPPATH is constant in CodeIgniter
88		- Cache::setProjectRootDir(APPPATH . '../');
	88	+ Cache::setProjectRootDir(APPPATH.'../');
89	89	}
90	90
91		- if (! isset($config['cache_dir']))
	91	+ if ( ! isset($config['cache_dir']))
92	92	{
93	93	throw new LogicException('You have to set "cache_dir"');
94	94	}
		@@ -97,7 +97,7 @@ discard block
		block discarded – undo
97	97
98	98	protected static function setPaths(array $config)
99	99	{
100		- if (! isset($config['include_paths']))
	100	+ if ( ! isset($config['include_paths']))
101	101	{
102	102	throw new LogicException('You have to set "include_paths"');
103	103	}
		@@ -158,7 +158,7 @@ discard block
		block discarded – undo
158	158	// Updated?
159	159	if ($cached !== $current)
160	160	{
161		- MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
	161	+ MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
162	162	Cache::clearSrcCache();
163	163	Cache::writeTmpIncludePaths($current);
164	164	}
		@@ -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::writeTmpExcludePaths($current);
175	175	}
		@@ -182,7 +182,7 @@ discard block
		block discarded – undo
182	182	// Updated?
183	183	if ($cached !== self::$patcher_list)
184	184	{
185		- MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
	185	+ MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
186	186	Cache::clearSrcCache();
187	187	Cache::writeTmpPatcherList(self::$patcher_list);
188	188	}
		@@ -196,7 +196,7 @@ discard block
		block discarded – undo
196	196	// Updated?
197	197	if ($cached !== $current)
198	198	{
199		- MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
	199	+ MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
200	200	Cache::clearSrcCache();
201	201	Cache::writeTmpFunctionWhitelist($current);
202	202	}
		@@ -258,7 +258,7 @@ discard block
		block discarded – undo
258	258	*/
259	259	public static function patch($path)
260	260	{
261		- if (! is_readable($path))
	261	+ if ( ! is_readable($path))
262	262	{
263	263	throw new LogicException("Can't read '$path'");
264	264	}
		@@ -266,17 +266,17 @@ discard block
		block discarded – undo
266	266	// Check cache file
267	267	if ($cache_file = Cache::getValidSrcCachePath($path))
268	268	{
269		- self::log('cache_hit: ' . $path);
	269	+ self::log('cache_hit: '.$path);
270	270	return fopen($cache_file, 'r');
271	271	}
272	272
273		- self::log('cache_miss: ' . $path);
	273	+ self::log('cache_miss: '.$path);
274	274	$source = file_get_contents($path);
275	275
276	276	list($new_source, $patched) = self::execPatchers($source);
277	277
278	278	// Write to cache file
279		- self::log('write_cache: ' . $path);
	279	+ self::log('write_cache: '.$path);
280	280	Cache::writeSrcCacheFile($path, $new_source);
281	281
282	282	$resource = fopen('php://memory', 'rb+');
		@@ -292,12 +292,12 @@ discard block
		block discarded – undo
292	292	return;
293	293	}
294	294
295		- require __DIR__ . '/Patcher/AbstractPatcher.php';
296		- require __DIR__ . '/Patcher/Backtrace.php';
	295	+ require __DIR__.'/Patcher/AbstractPatcher.php';
	296	+ require __DIR__.'/Patcher/Backtrace.php';
297	297
298	298	foreach (self::$patcher_list as $classname)
299	299	{
300		- require __DIR__ . '/Patcher/' . $classname . '.php';
	300	+ require __DIR__.'/Patcher/'.$classname.'.php';
301	301	}
302	302
303	303	self::$load_patchers = true;
		@@ -308,7 +308,7 @@ discard block
		block discarded – undo
308	308	$patched = false;
309	309	foreach (self::$patcher_list as $classname)
310	310	{
311		- $classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname;
	311	+ $classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname;
312	312	$patcher = new $classname;
313	313	list($source, $patched_this) = $patcher->patch($source);
314	314	$patched = $patched \|\| $patched_this;

		@@ -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	}

		@@ -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	}

		@@ -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

kenjis / ci-phpunit-test

Pull Request — master (#165)

Status

Category

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch