Completed
Branch master (a77cc1)
by Baris
03:02
created
bootstrap/paths.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
     |
13 13
     */
14 14
 
15
-	'solution_path' => ROOT_PATH."/apps/",
15
+    'solution_path' => ROOT_PATH."/apps/",
16 16
 
17 17
     /*
18 18
     |--------------------------------------------------------------------------
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     |
27 27
     */
28 28
 
29
-	'storage_path' => ROOT_PATH."/storage/",
29
+    'storage_path' => ROOT_PATH."/storage/",
30 30
 
31 31
     /*
32 32
     |--------------------------------------------------------------------------
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
     |
39 39
     */
40 40
 
41
-	'public_path' => ROOT_PATH."/public/",
41
+    'public_path' => ROOT_PATH."/public/",
42 42
 
43 43
     /*
44 44
     |--------------------------------------------------------------------------
@@ -50,5 +50,5 @@  discard block
 block discarded – undo
50 50
     |
51 51
     */
52 52
 
53
-	'vendor_path' => ROOT_PATH."/vendor/",
53
+    'vendor_path' => ROOT_PATH."/vendor/",
54 54
 );
55 55
\ No newline at end of file
Please login to merge, or discard this patch.
bootstrap/autoload.php 1 patch
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -9,30 +9,30 @@  discard block
 block discarded – undo
9 9
 
10 10
 # Global function for getting included file name
11 11
 function _if($folderName, $fileName, $enviroment = null ) {
12
-	if ( is_null($enviroment) )
13
-		$enviroment = "ENVIRONMENT";
14
-	$file = "{$folderName}{$enviroment}/{$fileName}";
12
+    if ( is_null($enviroment) )
13
+        $enviroment = "ENVIRONMENT";
14
+    $file = "{$folderName}{$enviroment}/{$fileName}";
15 15
     if (!file_exists($file)) {
16
-		$file = "{$folderName}{$fileName}";
17
-	    if (!file_exists($file))
18
-	    	return false;
16
+        $file = "{$folderName}{$fileName}";
17
+        if (!file_exists($file))
18
+            return false;
19 19
     }
20
-	return $file;
20
+    return $file;
21 21
 }
22 22
 
23 23
 # Global function for short var_dump
24 24
 function _dd($object, $isDie = true) {
25
-	echo "<pre>";
26
-	var_dump($object);
27
-	echo "</pre>";
28
-	if ( $isDie ) {
29
-		die();
30
-	}
25
+    echo "<pre>";
26
+    var_dump($object);
27
+    echo "</pre>";
28
+    if ( $isDie ) {
29
+        die();
30
+    }
31 31
 }
32 32
 
33 33
 # Global function for short die
34 34
 function _d($string) {
35
-	die($string);
35
+    die($string);
36 36
 }
37 37
 
38 38
 if (!extension_loaded('phalcon')) {
@@ -44,9 +44,9 @@  discard block
 block discarded – undo
44 44
 
45 45
 # The FactoryDefault Dependency Injector automatically registers the right services providing a full-stack framework
46 46
 if (PHP_SAPI === 'cli') {
47
-	$di = new \Phalcon\DI\FactoryDefault\CLI();
47
+    $di = new \Phalcon\DI\FactoryDefault\CLI();
48 48
 } else {
49
-	$di = new \Phalcon\DI\FactoryDefault();
49
+    $di = new \Phalcon\DI\FactoryDefault();
50 50
 }
51 51
 
52 52
 $pathConfigs = new \Phalcon\Config(
@@ -64,24 +64,24 @@  discard block
 block discarded – undo
64 64
 
65 65
 $configurationName = null;
66 66
 if (PHP_SAPI === 'cli') {    
67
-	if ( isset( $_SERVER['argv'][1] ) AND strpos($argv[1], "@") !== FALSE  ) {
68
-		$arguments = explode("@", $argv[1]);
69
-		$configurationName = $arguments[0];
70
-	}
67
+    if ( isset( $_SERVER['argv'][1] ) AND strpos($argv[1], "@") !== FALSE  ) {
68
+        $arguments = explode("@", $argv[1]);
69
+        $configurationName = $arguments[0];
70
+    }
71 71
 } else {
72
-	if ( isset( $_SERVER['SERVER_NAME'] ) ) {
73
-		$configurationName = $_SERVER['SERVER_NAME'];
74
-	}
72
+    if ( isset( $_SERVER['SERVER_NAME'] ) ) {
73
+        $configurationName = $_SERVER['SERVER_NAME'];
74
+    }
75 75
 }
76 76
 
77 77
 if ( !isset($applicationRouting->routing->$configurationName->name) ) {
78
-	if ( isset( $applicationRouting->routing->default->name ) ) {
79
-		$applicationName = $applicationRouting->routing->default->name;
80
-	} else {
81
-		_d("Solution routing configuration is failed. Please check your application route configurations");
82
-	}
78
+    if ( isset( $applicationRouting->routing->default->name ) ) {
79
+        $applicationName = $applicationRouting->routing->default->name;
80
+    } else {
81
+        _d("Solution routing configuration is failed. Please check your application route configurations");
82
+    }
83 83
 } else {
84
-	$applicationName = $applicationRouting->routing->$configurationName->name;
84
+    $applicationName = $applicationRouting->routing->$configurationName->name;
85 85
 }
86 86
 
87 87
 define("APPLICATION_NAME", $applicationName);
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 */
113 113
 
114 114
 if ( !is_dir( APPLICATION_PATH ) ) 
115
-	_d("There is no application called \"".APPLICATION_NAME."\" in your apps folder.");
115
+    _d("There is no application called \"".APPLICATION_NAME."\" in your apps folder.");
116 116
 
117 117
 /*
118 118
 |--------------------------------------------------------------------------
@@ -126,9 +126,9 @@  discard block
 block discarded – undo
126 126
 */
127 127
 
128 128
 if ( !is_file( VENDOR_PATH.'autoload.php' ) ) {
129
-	_d("There is no autoload.php in your \"".VENDOR_PATH."\". Please update your vendor folder.");
129
+    _d("There is no autoload.php in your \"".VENDOR_PATH."\". Please update your vendor folder.");
130 130
 } else {
131
-	require VENDOR_PATH.'autoload.php';
131
+    require VENDOR_PATH.'autoload.php';
132 132
 }
133 133
 
134 134
 /*
@@ -144,16 +144,16 @@  discard block
 block discarded – undo
144 144
 
145 145
 if (PHP_SAPI !== 'cli') 
146 146
 {
147
-	$profiler 	= new \Fabfuel\Prophiler\Profiler();
147
+    $profiler 	= new \Fabfuel\Prophiler\Profiler();
148 148
 
149
-	$profiler->addAggregator(new \Fabfuel\Prophiler\Aggregator\Database\QueryAggregator());
150
-	$profiler->addAggregator(new \Fabfuel\Prophiler\Aggregator\Cache\CacheAggregator());
149
+    $profiler->addAggregator(new \Fabfuel\Prophiler\Aggregator\Database\QueryAggregator());
150
+    $profiler->addAggregator(new \Fabfuel\Prophiler\Aggregator\Cache\CacheAggregator());
151 151
 
152 152
 
153
-	$pluginManager = new \Fabfuel\Prophiler\Plugin\Manager\Phalcon($profiler);
153
+    $pluginManager = new \Fabfuel\Prophiler\Plugin\Manager\Phalcon($profiler);
154 154
 
155
-	$pluginManager->registerDispatcher();
156
-	$pluginManager->registerView();
155
+    $pluginManager->registerDispatcher();
156
+    $pluginManager->registerView();
157 157
 }
158 158
 
159 159
 /*
Please login to merge, or discard this patch.
apps/default.app/configs/application.php 1 patch
Indentation   +69 added lines, -69 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 return array(
4 4
 
5
-	/*
5
+    /*
6 6
 	|--------------------------------------------------------------------------
7 7
 	| Database Connections
8 8
 	|--------------------------------------------------------------------------
@@ -25,22 +25,22 @@  discard block
 block discarded – undo
25 25
 	|
26 26
 	*/
27 27
 
28
-	'databases' => array (
29
-		'db1' => array (
30
-	        'type' => '\Phalcon\Db\Adapter\Pdo\Mysql',
31
-	        'config' => array (
32
-	        	'host' => '127.0.0.1',
33
-				'port' => 3306,
34
-		        'username' => 'root',
35
-		        'password' => '',
36
-		        'dbname' => '',
37
-				'dbname' => 'northwind',
38
-				'persistent' => false
39
-		    )
40
-		)
41
-	),
42
-
43
-	/*
28
+    'databases' => array (
29
+        'db1' => array (
30
+            'type' => '\Phalcon\Db\Adapter\Pdo\Mysql',
31
+            'config' => array (
32
+                'host' => '127.0.0.1',
33
+                'port' => 3306,
34
+                'username' => 'root',
35
+                'password' => '',
36
+                'dbname' => '',
37
+                'dbname' => 'northwind',
38
+                'persistent' => false
39
+            )
40
+        )
41
+    ),
42
+
43
+    /*
44 44
 	|--------------------------------------------------------------------------
45 45
 	| Application Name
46 46
 	|--------------------------------------------------------------------------
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
 	|
51 51
 	*/
52 52
 
53
-	'name' => "default.app",
53
+    'name' => "default.app",
54 54
 
55
-	/*
55
+    /*
56 56
 	|--------------------------------------------------------------------------
57 57
 	| * Layout Name
58 58
 	|--------------------------------------------------------------------------
@@ -63,9 +63,9 @@  discard block
 block discarded – undo
63 63
 	|
64 64
 	*/
65 65
 
66
-	'layout_name' => "default",
66
+    'layout_name' => "default",
67 67
 
68
-	/*
68
+    /*
69 69
 	|--------------------------------------------------------------------------
70 70
 	| * Default Language
71 71
 	|--------------------------------------------------------------------------
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
75 75
 	|
76 76
 	*/
77 77
 
78
-	'default_language' => 'en',
78
+    'default_language' => 'en',
79 79
 
80
-	/*
80
+    /*
81 81
 	|--------------------------------------------------------------------------
82 82
 	| Default settings (MVC)
83 83
 	|--------------------------------------------------------------------------
@@ -87,13 +87,13 @@  discard block
 block discarded – undo
87 87
 	|
88 88
 	*/
89 89
 
90
-	'default_namespace' 	=> '',
91
-	'default_module' 		=> '',
92
-	'default_controller' 	=> 'index',
93
-	'default_method' 		=> 'index',
90
+    'default_namespace' 	=> '',
91
+    'default_module' 		=> '',
92
+    'default_controller' 	=> 'index',
93
+    'default_method' 		=> 'index',
94 94
 
95 95
 	
96
-	/*
96
+    /*
97 97
 	|--------------------------------------------------------------------------
98 98
 	| Default settings (Task)
99 99
 	|--------------------------------------------------------------------------
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
 	|
104 104
 	*/
105 105
 
106
-	'default_task' 			=> 'main',
107
-	'default_action' 		=> 'main',
106
+    'default_task' 			=> 'main',
107
+    'default_action' 		=> 'main',
108 108
 
109
-	/*
109
+    /*
110 110
 	|--------------------------------------------------------------------------
111 111
 	| Extra/Trailing slashes
112 112
 	|--------------------------------------------------------------------------
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 	|
119 119
 	*/
120 120
 
121
-	'extra_slashes' => true,
121
+    'extra_slashes' => true,
122 122
 
123
-	/*
123
+    /*
124 124
 	|--------------------------------------------------------------------------
125 125
 	| Application Debug Mode
126 126
 	|--------------------------------------------------------------------------
@@ -131,9 +131,9 @@  discard block
 block discarded – undo
131 131
 	|
132 132
 	*/
133 133
 
134
-	'debug' => true,
134
+    'debug' => true,
135 135
 
136
-	/*
136
+    /*
137 137
 	|--------------------------------------------------------------------------
138 138
 	| Do you need HTML Minification ?
139 139
 	|--------------------------------------------------------------------------
@@ -143,9 +143,9 @@  discard block
 block discarded – undo
143 143
 	|
144 144
 	*/
145 145
 
146
-	'html_minify' => true,
146
+    'html_minify' => true,
147 147
 
148
-	/*
148
+    /*
149 149
 	|--------------------------------------------------------------------------
150 150
 	| Application URL
151 151
 	|--------------------------------------------------------------------------
@@ -156,9 +156,9 @@  discard block
 block discarded – undo
156 156
 	|
157 157
 	*/
158 158
 
159
-	'base_url' => null,
159
+    'base_url' => null,
160 160
 
161
-	/*
161
+    /*
162 162
 	|--------------------------------------------------------------------------
163 163
 	| Application Timezone
164 164
 	|--------------------------------------------------------------------------
@@ -169,9 +169,9 @@  discard block
 block discarded – undo
169 169
 	|
170 170
 	*/
171 171
 
172
-	'timezone' => 'UTC',
172
+    'timezone' => 'UTC',
173 173
 
174
-	/*
174
+    /*
175 175
 	|--------------------------------------------------------------------------
176 176
 	| Encryption of Cookies
177 177
 	|--------------------------------------------------------------------------
@@ -183,9 +183,9 @@  discard block
 block discarded – undo
183 183
 	|
184 184
 	*/
185 185
 
186
-	'cookie_encryption' => true,
186
+    'cookie_encryption' => true,
187 187
 
188
-	/*
188
+    /*
189 189
 	|--------------------------------------------------------------------------
190 190
 	| Encryption Key
191 191
 	|--------------------------------------------------------------------------
@@ -196,9 +196,9 @@  discard block
 block discarded – undo
196 196
 	|
197 197
 	*/
198 198
 
199
-	'key' => 'this-is-my-secret-key',
199
+    'key' => 'this-is-my-secret-key',
200 200
 
201
-	/*
201
+    /*
202 202
 	|--------------------------------------------------------------------------
203 203
 	| Encryption Type
204 204
 	|--------------------------------------------------------------------------
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
 	|
209 209
 	*/
210 210
 
211
-	'cipher' => MCRYPT_RIJNDAEL_256,
211
+    'cipher' => MCRYPT_RIJNDAEL_256,
212 212
 
213
-	/*
213
+    /*
214 214
 	|--------------------------------------------------------------------------
215 215
 	| Encryption Type
216 216
 	|--------------------------------------------------------------------------
@@ -219,9 +219,9 @@  discard block
 block discarded – undo
219 219
 	|
220 220
 	*/
221 221
 
222
-	'encryption_mode' => 'ecb',
222
+    'encryption_mode' => 'ecb',
223 223
 
224
-	/*
224
+    /*
225 225
 	|--------------------------------------------------------------------------
226 226
 	| Work Factor
227 227
 	|--------------------------------------------------------------------------
@@ -230,9 +230,9 @@  discard block
 block discarded – undo
230 230
 	|
231 231
 	*/
232 232
 
233
-	'work_factor' => 12,
233
+    'work_factor' => 12,
234 234
 
235
-	/*
235
+    /*
236 236
 	|--------------------------------------------------------------------------
237 237
 	| Application Path Registration
238 238
 	|--------------------------------------------------------------------------
@@ -256,13 +256,13 @@  discard block
 block discarded – undo
256 256
 	|
257 257
 	*/
258 258
 
259
-	'paths' => array(
260
-		APPLICATION_PATH . 'controllers/',
259
+    'paths' => array(
260
+        APPLICATION_PATH . 'controllers/',
261 261
         APPLICATION_PATH . 'models/',
262 262
         APPLICATION_PATH . 'tasks/'
263 263
     ),
264 264
 
265
-	/*
265
+    /*
266 266
 	|--------------------------------------------------------------------------
267 267
 	| Application Classes Registration
268 268
 	|--------------------------------------------------------------------------
@@ -284,11 +284,11 @@  discard block
 block discarded – undo
284 284
 	|
285 285
 	*/
286 286
 
287
-	'classes' => array(
288
-		"ModelTrait"         => APPLICATION_PATH . "traits/ModelTraits.php"
287
+    'classes' => array(
288
+        "ModelTrait"         => APPLICATION_PATH . "traits/ModelTraits.php"
289 289
     ),
290 290
 
291
-	/*
291
+    /*
292 292
 	|--------------------------------------------------------------------------
293 293
 	| Registering Namespaces
294 294
 	|--------------------------------------------------------------------------
@@ -309,10 +309,10 @@  discard block
 block discarded – undo
309 309
 	|
310 310
 	*/
311 311
 
312
-	'namespaces' => array(
313
-	),
312
+    'namespaces' => array(
313
+    ),
314 314
 
315
-	/*
315
+    /*
316 316
 	|--------------------------------------------------------------------------
317 317
 	| Registering Prefixes
318 318
 	|--------------------------------------------------------------------------
@@ -334,9 +334,9 @@  discard block
 block discarded – undo
334 334
 	|
335 335
 	*/
336 336
 
337
-	'prefixes' => array(),
337
+    'prefixes' => array(),
338 338
 
339
-	/*
339
+    /*
340 340
 	|--------------------------------------------------------------------------
341 341
 	| Additional File Extensions
342 342
 	|--------------------------------------------------------------------------
@@ -348,9 +348,9 @@  discard block
 block discarded – undo
348 348
 	|
349 349
 	*/
350 350
 
351
-	'extensions' => array("php"),
351
+    'extensions' => array("php"),
352 352
 
353
-	/*
353
+    /*
354 354
 	|--------------------------------------------------------------------------
355 355
 	| Module Registration : SOON
356 356
 	|--------------------------------------------------------------------------
@@ -368,9 +368,9 @@  discard block
 block discarded – undo
368 368
 	|
369 369
 	*/
370 370
 
371
-	'modules' => array(),
371
+    'modules' => array(),
372 372
 
373
-	/*
373
+    /*
374 374
 	|--------------------------------------------------------------------------
375 375
 	| Default libraries
376 376
 	|--------------------------------------------------------------------------
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 	|
379 379
 	*/
380 380
 
381
-	'libraries' => array(
382
-		'session' => '\Phalcon\Session\Adapter\Files'
383
-	)
381
+    'libraries' => array(
382
+        'session' => '\Phalcon\Session\Adapter\Files'
383
+    )
384 384
 );
385 385
\ No newline at end of file
Please login to merge, or discard this patch.
apps/default.app/configs/error.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,9 +16,9 @@
 block discarded – undo
16 16
 
17 17
 $run     = new Whoops\Run;
18 18
 if (PHP_SAPI === 'cli') 
19
-	$handler = new PlainTextHandler;
19
+    $handler = new PlainTextHandler;
20 20
 else
21
-	$handler = new PrettyPageHandler;
21
+    $handler = new PrettyPageHandler;
22 22
 	
23 23
 $run->pushHandler($handler);
24 24
 
Please login to merge, or discard this patch.
apps/default.app/configs/views.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 return array(
4
-	'view_engines' => array(
4
+    'view_engines' => array(
5 5
             '.volt' => array(
6
-                  'type' => '\Phalcon\Mvc\View\Engine\Volt',
7
-                  'options' => array(
6
+                    'type' => '\Phalcon\Mvc\View\Engine\Volt',
7
+                    'options' => array(
8 8
                         'compiledPath' => STORAGE_PATH . 'framework/views/',
9 9
                         'compiledSeparator' => '_',
10 10
                         'compiledExtension' => '.compiled',
11 11
                         'stat' => true
12
-                  )
12
+                    )
13 13
             )
14
-	)
14
+    )
15 15
 );
Please login to merge, or discard this patch.
apps/default.app/tasks/MainTask.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,6 +11,6 @@
 block discarded – undo
11 11
 {
12 12
     public function mainAction($params)
13 13
     {
14
-    	var_dump($params);
14
+        var_dump($params);
15 15
     }
16 16
 }
17 17
\ No newline at end of file
Please login to merge, or discard this patch.