Completed
Push — master ( cda6f6...6b8ea4 )
by Kenji
03:20
created
application/tests/_ci_phpunit_test/CIPHPUnitTest.php 2 patches
Spacing   +14 added lines, -14 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
 		// Change current directroy
57 57
 		chdir(FCPATH);
@@ -63,12 +63,12 @@  discard block
 block discarded – undo
63 63
 		 *
64 64
 		 * And away we go...
65 65
 		 */
66
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
66
+		require __DIR__.'/replacing/core/CodeIgniter.php';
67 67
 
68 68
 		self::replaceHelpers();
69 69
 
70 70
 		// Create CodeIgniter instance
71
-		if (! self::wiredesignzHmvcInstalled())
71
+		if ( ! self::wiredesignzHmvcInstalled())
72 72
 		{
73 73
 			new CI_Controller();
74 74
 		}
@@ -102,11 +102,11 @@  discard block
 block discarded – undo
102 102
 	protected static function replaceLoader()
103 103
 	{
104 104
 		$my_loader_file = 
105
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
105
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
106 106
 
107 107
 		if (file_exists($my_loader_file))
108 108
 		{
109
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
109
+			self::$loader_class = config_item('subclass_prefix').'Loader';
110 110
 			if ( ! class_exists(self::$loader_class))
111 111
 			{
112 112
 				require $my_loader_file;
@@ -117,19 +117,19 @@  discard block
 block discarded – undo
117 117
 
118 118
 	protected static function replaceHelpers()
119 119
 	{
120
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . 'url_helper.php';
120
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').'url_helper.php';
121 121
 		if (file_exists($my_helper_file))
122 122
 		{
123 123
 			require $my_helper_file;
124 124
 		}
125
-		require __DIR__ . '/replacing/helpers/url_helper.php';
125
+		require __DIR__.'/replacing/helpers/url_helper.php';
126 126
 	}
127 127
 
128 128
 	public static function setPatcherCacheDir($dir = null)
129 129
 	{
130 130
 		if ($dir === null)
131 131
 		{
132
-			$dir = APPPATH . 'tests/_ci_phpunit_test/tmp/cache';
132
+			$dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache';
133 133
 		}
134 134
 
135 135
 		MonkeyPatchManager::setCacheDir(
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,8 +38,7 @@
 block discarded – undo
38 38
 		{
39 39
 			$patched = true;
40 40
 			$new_source = static::generateNewSource($source);
41
-		}
42
-		else
41
+		} else
43 42
 		{
44 43
 			$new_source = $source;
45 44
 		}
Please login to merge, or discard this patch.