@@ -12,7 +12,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -276,8 +276,9 @@ discard block |
||
276 | 276 | { |
277 | 277 | $di->set('url', function () use ($appConfig) { |
278 | 278 | $url = new \Phalcon\Mvc\Url(); |
279 | - if (!is_null($appConfig->base_url)) |
|
280 | - $url->setBaseUri($appConfig->base_url); |
|
279 | + if (!is_null($appConfig->base_url)) { |
|
280 | + $url->setBaseUri($appConfig->base_url); |
|
281 | + } |
|
281 | 282 | return $url; |
282 | 283 | }, true); |
283 | 284 | } |
@@ -488,8 +489,7 @@ discard block |
||
488 | 489 | |
489 | 490 | // handle incoming arguments |
490 | 491 | $application->handle($arguments); |
491 | -} |
|
492 | -else |
|
492 | +} else |
|
493 | 493 | { |
494 | 494 | |
495 | 495 | //Handle the request |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | include_once _if(APPLICATION_PATH."configs/", "application.php") |
31 | 31 | ); |
32 | 32 | |
33 | -$di->set('application', function () use ($appConfig) { |
|
33 | +$di->set('application', function() use ($appConfig) { |
|
34 | 34 | return $appConfig; |
35 | 35 | }); |
36 | 36 | |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | | |
75 | 75 | */ |
76 | 76 | |
77 | -$di->set('error', function () use ($appConfig) { |
|
77 | +$di->set('error', function() use ($appConfig) { |
|
78 | 78 | return include_once _if(APPLICATION_PATH."configs/", "error.php"); |
79 | 79 | }); |
80 | 80 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | if (PHP_SAPI !== 'cli') |
93 | 93 | { |
94 | - $di->set('profiler', function () use ($profiler) { |
|
94 | + $di->set('profiler', function() use ($profiler) { |
|
95 | 95 | return $profiler; |
96 | 96 | }); |
97 | 97 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | |
110 | 110 | if (PHP_SAPI !== 'cli') |
111 | 111 | { |
112 | - $di->set('console', function () use ($di) { |
|
112 | + $di->set('console', function() use ($di) { |
|
113 | 113 | $profiler = $di->get("profiler"); |
114 | 114 | $logger = new \Fabfuel\Prophiler\Adapter\Psr\Log\Logger($profiler); |
115 | 115 | return $logger; |
@@ -153,13 +153,13 @@ discard block |
||
153 | 153 | | |
154 | 154 | */ |
155 | 155 | |
156 | -foreach ($appConfig->databases as $name => $dbConfig ) { |
|
156 | +foreach ($appConfig->databases as $name => $dbConfig) { |
|
157 | 157 | $di->set($name, function() use ($dbConfig, $di){ |
158 | 158 | $className = $dbConfig["type"]; |
159 | - $database = new $className($dbConfig["config"]->toArray()); |
|
160 | - if ( $di->has("profiler") ) { |
|
159 | + $database = new $className($dbConfig["config"]->toArray()); |
|
160 | + if ($di->has("profiler")) { |
|
161 | 161 | $eventsManager = new \Phalcon\Events\Manager(); |
162 | - $eventsManager->attach('db', \Fabfuel\Prophiler\Plugin\Phalcon\Db\AdapterPlugin::getInstance( $di->get("profiler") ) ); |
|
162 | + $eventsManager->attach('db', \Fabfuel\Prophiler\Plugin\Phalcon\Db\AdapterPlugin::getInstance($di->get("profiler"))); |
|
163 | 163 | $database->setEventsManager($eventsManager); |
164 | 164 | } |
165 | 165 | $database->connect(); |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | }); |
189 | 189 | |
190 | 190 | //Setup the cache service |
191 | -$di->set('cache', function(){ |
|
191 | +$di->set('cache', function() { |
|
192 | 192 | return include_once _if(APPLICATION_PATH."services/", "cache.php"); |
193 | 193 | }); |
194 | 194 | |
@@ -204,12 +204,12 @@ discard block |
||
204 | 204 | | |
205 | 205 | */ |
206 | 206 | |
207 | -$di->set('response', function(){ |
|
207 | +$di->set('response', function() { |
|
208 | 208 | return new \Phalcon\Http\Response(); |
209 | 209 | }); |
210 | 210 | |
211 | 211 | //Setup the email service |
212 | -$di->set('email', function(){ |
|
212 | +$di->set('email', function() { |
|
213 | 213 | return include_once _if(APPLICATION_PATH."services/", "email.php"); |
214 | 214 | }); |
215 | 215 | |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | | |
225 | 225 | */ |
226 | 226 | |
227 | -$di->set('assets', function () { |
|
227 | +$di->set('assets', function() { |
|
228 | 228 | $assetManager = new \Phalcon\Assets\Manager(); |
229 | 229 | return $assetManager; |
230 | 230 | }, true); |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | |
275 | 275 | if (PHP_SAPI !== 'cli') |
276 | 276 | { |
277 | - $di->set('url', function () use ($appConfig) { |
|
277 | + $di->set('url', function() use ($appConfig) { |
|
278 | 278 | $url = new \Phalcon\Mvc\Url(); |
279 | 279 | if (!is_null($appConfig->base_url)) |
280 | 280 | $url->setBaseUri($appConfig->base_url); |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | | |
293 | 293 | */ |
294 | 294 | |
295 | -$di->set('crypt', function () use ($appConfig) { |
|
295 | +$di->set('crypt', function() use ($appConfig) { |
|
296 | 296 | $crypt = new \Phalcon\Crypt(); |
297 | 297 | //Type of cipher algoritm |
298 | 298 | $crypt->setCipher($appConfig->cipher); |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | //TODO: there can be many file in en folder. |
325 | 325 | $di->set('language', function() use ($appConfig) { |
326 | 326 | $defaultLanguage = $appConfig->default_language; |
327 | - $fileName = APPLICATION_PATH."resources/languages/{$defaultLanguage}/{$defaultLanguage}.php";; |
|
327 | + $fileName = APPLICATION_PATH."resources/languages/{$defaultLanguage}/{$defaultLanguage}.php"; ; |
|
328 | 328 | if (file_exists($fileName)) { |
329 | 329 | $messages = include_once $fileName; |
330 | 330 | } else { |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | { |
353 | 353 | $di->set('view', function() use ($appConfig){ |
354 | 354 | $view = new \Phalcon\Mvc\View(); |
355 | - $view->setLayoutsDir( '/_shared/'); |
|
355 | + $view->setLayoutsDir('/_shared/'); |
|
356 | 356 | $view->setTemplateAfter($appConfig->view_layout_name); |
357 | 357 | $viewEngines = $appConfig->view_engines; |
358 | 358 | foreach ($viewEngines as $extension => $parameters) { |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | | |
384 | 384 | */ |
385 | 385 | |
386 | - $di->set('router', function () use ($appConfig) { |
|
386 | + $di->set('router', function() use ($appConfig) { |
|
387 | 387 | $router = new \Phalcon\Mvc\Router\Annotations(false); |
388 | 388 | $router->setUriSource(\Phalcon\Mvc\Router::URI_SOURCE_GET_URL); |
389 | 389 | $router->setUriSource(\Phalcon\Mvc\Router::URI_SOURCE_SERVER_REQUEST_URI); |
@@ -461,10 +461,10 @@ discard block |
||
461 | 461 | $arguments['task'] = $appConfig->default_task; |
462 | 462 | $arguments['action'] = $appConfig->default_action; |
463 | 463 | |
464 | - if ( isset( $_SERVER['argv'][1] ) AND strpos($argv[1], "@") !== FALSE ) { |
|
464 | + if (isset($_SERVER['argv'][1]) AND strpos($argv[1], "@") !== FALSE) { |
|
465 | 465 | $itemNumber = 0; |
466 | 466 | $allArguments = explode("@", $argv[1]); |
467 | - if ( count($allArguments) === 2 ) |
|
467 | + if (count($allArguments) === 2) |
|
468 | 468 | { |
469 | 469 | $itemNumber = 1; |
470 | 470 | } |
@@ -477,8 +477,8 @@ discard block |
||
477 | 477 | |
478 | 478 | $arguments['params'] = array(); |
479 | 479 | |
480 | - foreach($_SERVER['argv'] as $k => $arg) { |
|
481 | - if($k >= 2) { |
|
480 | + foreach ($_SERVER['argv'] as $k => $arg) { |
|
481 | + if ($k >= 2) { |
|
482 | 482 | $arguments['params'][] = $arg; |
483 | 483 | } |
484 | 484 | } |
@@ -492,7 +492,7 @@ discard block |
||
492 | 492 | //Handle the request |
493 | 493 | $output = $application->handle()->getContent(); |
494 | 494 | |
495 | - if ( $appConfig->debug ) |
|
495 | + if ($appConfig->debug) |
|
496 | 496 | { |
497 | 497 | $toolbar = new \Fabfuel\Prophiler\Toolbar($profiler); |
498 | 498 | $toolbar->addDataCollector(new \Fabfuel\Prophiler\DataCollector\Request()); |
@@ -500,10 +500,10 @@ discard block |
||
500 | 500 | } |
501 | 501 | |
502 | 502 | // HTML Minification |
503 | - if ( $appConfig->html_minify ) { |
|
504 | - ob_start( function() use ($output) { |
|
505 | - $search = array( '/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s' ); |
|
506 | - $replace = array( '>', '<', '\\1' ); |
|
503 | + if ($appConfig->html_minify) { |
|
504 | + ob_start(function() use ($output) { |
|
505 | + $search = array('/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s'); |
|
506 | + $replace = array('>', '<', '\\1'); |
|
507 | 507 | $buffer = preg_replace($search, $replace, $output); |
508 | 508 | return $buffer; |
509 | 509 | }); |
@@ -9,30 +9,30 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | /* |
@@ -8,8 +8,8 @@ discard block |
||
8 | 8 | */ |
9 | 9 | |
10 | 10 | # Global function for getting included file name |
11 | -function _if($folderName, $fileName, $enviroment = null ) { |
|
12 | - if ( is_null($enviroment) ) |
|
11 | +function _if($folderName, $fileName, $enviroment = null) { |
|
12 | + if (is_null($enviroment)) |
|
13 | 13 | $enviroment = "ENVIRONMENT"; |
14 | 14 | $file = "{$folderName}{$enviroment}/{$fileName}"; |
15 | 15 | if (!file_exists($file)) { |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | echo "<pre>"; |
26 | 26 | var_dump($object); |
27 | 27 | echo "</pre>"; |
28 | - if ( $isDie ) { |
|
28 | + if ($isDie) { |
|
29 | 29 | die(); |
30 | 30 | } |
31 | 31 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | } |
41 | 41 | |
42 | 42 | # ROOT PATH is defined. |
43 | -define("ROOT_PATH", realpath( __DIR__."/../") ); |
|
43 | +define("ROOT_PATH", realpath(__DIR__."/../")); |
|
44 | 44 | |
45 | 45 | # The FactoryDefault Dependency Injector automatically registers the right services providing a full-stack framework |
46 | 46 | if (PHP_SAPI === 'cli') { |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | include_once _if(__DIR__."/", "paths.php", "") |
54 | 54 | ); |
55 | 55 | |
56 | -$di->set('path', function () use ($pathConfigs) { |
|
56 | +$di->set('path', function() use ($pathConfigs) { |
|
57 | 57 | return $pathConfigs; |
58 | 58 | }); |
59 | 59 | |
@@ -64,18 +64,18 @@ discard block |
||
64 | 64 | |
65 | 65 | $configurationName = null; |
66 | 66 | if (PHP_SAPI === 'cli') { |
67 | - if ( isset( $_SERVER['argv'][1] ) AND strpos($argv[1], "@") !== FALSE ) { |
|
67 | + if (isset($_SERVER['argv'][1]) AND strpos($argv[1], "@") !== FALSE) { |
|
68 | 68 | $arguments = explode("@", $argv[1]); |
69 | 69 | $configurationName = $arguments[0]; |
70 | 70 | } |
71 | 71 | } else { |
72 | - if ( isset( $_SERVER['SERVER_NAME'] ) ) { |
|
72 | + if (isset($_SERVER['SERVER_NAME'])) { |
|
73 | 73 | $configurationName = $_SERVER['SERVER_NAME']; |
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
77 | -if ( !isset($applicationRouting->routing->$configurationName->name) ) { |
|
78 | - if ( isset( $applicationRouting->routing->default->name ) ) { |
|
77 | +if (!isset($applicationRouting->routing->$configurationName->name)) { |
|
78 | + if (isset($applicationRouting->routing->default->name)) { |
|
79 | 79 | $applicationName = $applicationRouting->routing->default->name; |
80 | 80 | } else { |
81 | 81 | _d("Solution routing configuration is failed. Please check your application route configurations"); |
@@ -96,11 +96,11 @@ discard block |
||
96 | 96 | | |
97 | 97 | */ |
98 | 98 | |
99 | -define("SOLUTION_PATH", $pathConfigs->solution_path ); |
|
100 | -define("STORAGE_PATH", $pathConfigs->storage_path ); |
|
101 | -define("APPLICATION_PATH", $pathConfigs->solution_path.APPLICATION_NAME."/" ); |
|
102 | -define("PUBLIC_PATH", $pathConfigs->public_path ); |
|
103 | -define("VENDOR_PATH", $pathConfigs->vendor_path ); |
|
99 | +define("SOLUTION_PATH", $pathConfigs->solution_path); |
|
100 | +define("STORAGE_PATH", $pathConfigs->storage_path); |
|
101 | +define("APPLICATION_PATH", $pathConfigs->solution_path.APPLICATION_NAME."/"); |
|
102 | +define("PUBLIC_PATH", $pathConfigs->public_path); |
|
103 | +define("VENDOR_PATH", $pathConfigs->vendor_path); |
|
104 | 104 | |
105 | 105 | /* |
106 | 106 | |-------------------------------------------------------------------------- |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | | |
112 | 112 | */ |
113 | 113 | |
114 | -if ( !is_dir( APPLICATION_PATH ) ) |
|
114 | +if (!is_dir(APPLICATION_PATH)) |
|
115 | 115 | _d("There is no application called \"".APPLICATION_NAME."\" in your apps folder."); |
116 | 116 | |
117 | 117 | /* |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | | loading of any our classes "manually". Feels great to relax. |
126 | 126 | */ |
127 | 127 | |
128 | -if ( !is_file( VENDOR_PATH.'autoload.php' ) ) { |
|
128 | +if (!is_file(VENDOR_PATH.'autoload.php')) { |
|
129 | 129 | _d("There is no autoload.php in your \"".VENDOR_PATH."\". Please update your vendor folder."); |
130 | 130 | } else { |
131 | 131 | require VENDOR_PATH.'autoload.php'; |
@@ -144,7 +144,7 @@ discard block |
||
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 | 149 | $profiler->addAggregator(new \Fabfuel\Prophiler\Aggregator\Database\QueryAggregator()); |
150 | 150 | $profiler->addAggregator(new \Fabfuel\Prophiler\Aggregator\Cache\CacheAggregator()); |
@@ -9,13 +9,15 @@ discard block |
||
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"; |
|
12 | + if ( is_null($enviroment) ) { |
|
13 | + $enviroment = "ENVIRONMENT"; |
|
14 | + } |
|
14 | 15 | $file = "{$folderName}{$enviroment}/{$fileName}"; |
15 | 16 | if (!file_exists($file)) { |
16 | 17 | $file = "{$folderName}{$fileName}"; |
17 | - if (!file_exists($file)) |
|
18 | - return false; |
|
18 | + if (!file_exists($file)) { |
|
19 | + return false; |
|
20 | + } |
|
19 | 21 | } |
20 | 22 | return $file; |
21 | 23 | } |
@@ -111,8 +113,9 @@ discard block |
||
111 | 113 | | |
112 | 114 | */ |
113 | 115 | |
114 | -if ( !is_dir( APPLICATION_PATH ) ) |
|
116 | +if ( !is_dir( APPLICATION_PATH ) ) { |
|
115 | 117 | _d("There is no application called \"".APPLICATION_NAME."\" in your apps folder."); |
118 | +} |
|
116 | 119 | |
117 | 120 | /* |
118 | 121 | |-------------------------------------------------------------------------- |
@@ -16,9 +16,9 @@ |
||
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 |
@@ -14,7 +14,7 @@ |
||
14 | 14 | use Whoops\Handler\PrettyPageHandler; |
15 | 15 | use Whoops\Handler\PlainTextHandler; |
16 | 16 | |
17 | -$run = new Whoops\Run; |
|
17 | +$run = new Whoops\Run; |
|
18 | 18 | if (PHP_SAPI === 'cli') |
19 | 19 | $handler = new PlainTextHandler; |
20 | 20 | else |
@@ -15,10 +15,11 @@ |
||
15 | 15 | use Whoops\Handler\PlainTextHandler; |
16 | 16 | |
17 | 17 | $run = new Whoops\Run; |
18 | -if (PHP_SAPI === 'cli') |
|
18 | +if (PHP_SAPI === 'cli') { |
|
19 | 19 | $handler = new PlainTextHandler; |
20 | -else |
|
20 | +} else { |
|
21 | 21 | $handler = new PrettyPageHandler; |
22 | +} |
|
22 | 23 | |
23 | 24 | $run->pushHandler($handler); |
24 | 25 |
@@ -11,9 +11,9 @@ |
||
11 | 11 | "/:module/:controller/:action/:params", |
12 | 12 | array( |
13 | 13 | "module" => 1, |
14 | - 'controller' => 2, |
|
15 | - 'action' => 3, |
|
16 | - 'params' => 4, |
|
14 | + 'controller' => 2, |
|
15 | + 'action' => 3, |
|
16 | + 'params' => 4, |
|
17 | 17 | ) |
18 | 18 | ); |
19 | 19 |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | |
27 | 27 | $loader->registerNamespaces( |
28 | 28 | array( |
29 | - 'Modules\Common\Controllers' => __DIR__ . '/controllers/', |
|
30 | - 'Modules\Common\Models' => __DIR__ . '/models/', |
|
29 | + 'Modules\Common\Controllers' => __DIR__.'/controllers/', |
|
30 | + 'Modules\Common\Models' => __DIR__.'/models/', |
|
31 | 31 | ) |
32 | 32 | ); |
33 | 33 | |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | public function registerServices(DiInterface $di) |
41 | 41 | { |
42 | 42 | // Registering a dispatcher |
43 | - $di->set('dispatcher', function () { |
|
43 | + $di->set('dispatcher', function() { |
|
44 | 44 | $dispatcher = new Dispatcher(); |
45 | 45 | $dispatcher->setDefaultNamespace("Modules\Common\Controllers"); |
46 | 46 | return $dispatcher; |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | // Setting up the view component |
50 | 50 | $view = $di->get('view'); |
51 | - $view->setViewsDir( __DIR__ . '/views/'); |
|
51 | + $view->setViewsDir(__DIR__.'/views/'); |
|
52 | 52 | $di->set('view', $view); |
53 | 53 | } |
54 | 54 | } |
55 | 55 | \ No newline at end of file |
@@ -11,6 +11,6 @@ |
||
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 |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return array( |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Database Connections |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -25,22 +25,22 @@ discard block |
||
25 | 25 | | |
26 | 26 | */ |
27 | 27 | |
28 | - 'databases' => array ( |
|
29 | - 'db' => 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 | + 'db' => 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 | | View Engines |
46 | 46 | |-------------------------------------------------------------------------- |
@@ -52,19 +52,19 @@ discard block |
||
52 | 52 | | |
53 | 53 | */ |
54 | 54 | |
55 | - 'view_engines' => array( |
|
56 | - '.volt' => array( |
|
57 | - 'type' => '\Phalcon\Mvc\View\Engine\Volt', |
|
58 | - 'options' => array( |
|
59 | - 'compiledPath' => STORAGE_PATH . 'framework/views/', |
|
60 | - 'compiledSeparator' => '_', |
|
61 | - 'compiledExtension' => '.compiled', |
|
62 | - 'stat' => true |
|
63 | - ) |
|
64 | - ) |
|
65 | - ), |
|
55 | + 'view_engines' => array( |
|
56 | + '.volt' => array( |
|
57 | + 'type' => '\Phalcon\Mvc\View\Engine\Volt', |
|
58 | + 'options' => array( |
|
59 | + 'compiledPath' => STORAGE_PATH . 'framework/views/', |
|
60 | + 'compiledSeparator' => '_', |
|
61 | + 'compiledExtension' => '.compiled', |
|
62 | + 'stat' => true |
|
63 | + ) |
|
64 | + ) |
|
65 | + ), |
|
66 | 66 | |
67 | - /* |
|
67 | + /* |
|
68 | 68 | |-------------------------------------------------------------------------- |
69 | 69 | | View Layout Name |
70 | 70 | |-------------------------------------------------------------------------- |
@@ -74,9 +74,9 @@ discard block |
||
74 | 74 | | |
75 | 75 | */ |
76 | 76 | |
77 | - 'view_layout_name' => 'main', |
|
77 | + 'view_layout_name' => 'main', |
|
78 | 78 | |
79 | - /* |
|
79 | + /* |
|
80 | 80 | |-------------------------------------------------------------------------- |
81 | 81 | | Application Name |
82 | 82 | |-------------------------------------------------------------------------- |
@@ -86,9 +86,9 @@ discard block |
||
86 | 86 | | |
87 | 87 | */ |
88 | 88 | |
89 | - 'name' => "default.app", |
|
89 | + 'name' => "default.app", |
|
90 | 90 | |
91 | - /* |
|
91 | + /* |
|
92 | 92 | |-------------------------------------------------------------------------- |
93 | 93 | | Theme Layout Name |
94 | 94 | |-------------------------------------------------------------------------- |
@@ -99,9 +99,9 @@ discard block |
||
99 | 99 | | |
100 | 100 | */ |
101 | 101 | |
102 | - 'theme_layout_name' => "default", |
|
102 | + 'theme_layout_name' => "default", |
|
103 | 103 | |
104 | - /* |
|
104 | + /* |
|
105 | 105 | |-------------------------------------------------------------------------- |
106 | 106 | | * Default Language |
107 | 107 | |-------------------------------------------------------------------------- |
@@ -111,9 +111,9 @@ discard block |
||
111 | 111 | | |
112 | 112 | */ |
113 | 113 | |
114 | - 'default_language' => 'en', |
|
114 | + 'default_language' => 'en', |
|
115 | 115 | |
116 | - /* |
|
116 | + /* |
|
117 | 117 | |-------------------------------------------------------------------------- |
118 | 118 | | Registering Namespaces |
119 | 119 | |-------------------------------------------------------------------------- |
@@ -134,11 +134,11 @@ discard block |
||
134 | 134 | | |
135 | 135 | */ |
136 | 136 | |
137 | - 'namespaces' => array( |
|
138 | - 'Modules\Common' => APPLICATION_PATH . 'modules/common/', |
|
139 | - ), |
|
137 | + 'namespaces' => array( |
|
138 | + 'Modules\Common' => APPLICATION_PATH . 'modules/common/', |
|
139 | + ), |
|
140 | 140 | |
141 | - /* |
|
141 | + /* |
|
142 | 142 | |-------------------------------------------------------------------------- |
143 | 143 | | Module Registration |
144 | 144 | |-------------------------------------------------------------------------- |
@@ -156,14 +156,14 @@ discard block |
||
156 | 156 | | |
157 | 157 | */ |
158 | 158 | |
159 | - 'modules' => array( |
|
160 | - 'common' => array( |
|
161 | - 'className' => 'Modules\Common\Module', |
|
162 | - 'path' => APPLICATION_PATH . 'modules/common/module.php' |
|
163 | - ) |
|
164 | - ), |
|
159 | + 'modules' => array( |
|
160 | + 'common' => array( |
|
161 | + 'className' => 'Modules\Common\Module', |
|
162 | + 'path' => APPLICATION_PATH . 'modules/common/module.php' |
|
163 | + ) |
|
164 | + ), |
|
165 | 165 | |
166 | - /* |
|
166 | + /* |
|
167 | 167 | |-------------------------------------------------------------------------- |
168 | 168 | | Default settings (MVC) |
169 | 169 | |-------------------------------------------------------------------------- |
@@ -173,13 +173,13 @@ discard block |
||
173 | 173 | | |
174 | 174 | */ |
175 | 175 | |
176 | - 'default_namespace' => 'Modules\Common\Controllers', |
|
177 | - 'default_module' => 'common', |
|
178 | - 'default_controller' => 'index', |
|
179 | - 'default_method' => 'index', |
|
176 | + 'default_namespace' => 'Modules\Common\Controllers', |
|
177 | + 'default_module' => 'common', |
|
178 | + 'default_controller' => 'index', |
|
179 | + 'default_method' => 'index', |
|
180 | 180 | |
181 | 181 | |
182 | - /* |
|
182 | + /* |
|
183 | 183 | |-------------------------------------------------------------------------- |
184 | 184 | | Default settings (Task) |
185 | 185 | |-------------------------------------------------------------------------- |
@@ -189,10 +189,10 @@ discard block |
||
189 | 189 | | |
190 | 190 | */ |
191 | 191 | |
192 | - 'default_task' => 'main', |
|
193 | - 'default_action' => 'main', |
|
192 | + 'default_task' => 'main', |
|
193 | + 'default_action' => 'main', |
|
194 | 194 | |
195 | - /* |
|
195 | + /* |
|
196 | 196 | |-------------------------------------------------------------------------- |
197 | 197 | | Extra/Trailing slashes |
198 | 198 | |-------------------------------------------------------------------------- |
@@ -204,9 +204,9 @@ discard block |
||
204 | 204 | | |
205 | 205 | */ |
206 | 206 | |
207 | - 'extra_slashes' => true, |
|
207 | + 'extra_slashes' => true, |
|
208 | 208 | |
209 | - /* |
|
209 | + /* |
|
210 | 210 | |-------------------------------------------------------------------------- |
211 | 211 | | Application Debug Mode |
212 | 212 | |-------------------------------------------------------------------------- |
@@ -217,9 +217,9 @@ discard block |
||
217 | 217 | | |
218 | 218 | */ |
219 | 219 | |
220 | - 'debug' => FALSE, |
|
220 | + 'debug' => FALSE, |
|
221 | 221 | |
222 | - /* |
|
222 | + /* |
|
223 | 223 | |-------------------------------------------------------------------------- |
224 | 224 | | Do you need HTML Minification ? |
225 | 225 | |-------------------------------------------------------------------------- |
@@ -229,9 +229,9 @@ discard block |
||
229 | 229 | | |
230 | 230 | */ |
231 | 231 | |
232 | - 'html_minify' => true, |
|
232 | + 'html_minify' => true, |
|
233 | 233 | |
234 | - /* |
|
234 | + /* |
|
235 | 235 | |-------------------------------------------------------------------------- |
236 | 236 | | Application URL |
237 | 237 | |-------------------------------------------------------------------------- |
@@ -242,9 +242,9 @@ discard block |
||
242 | 242 | | |
243 | 243 | */ |
244 | 244 | |
245 | - 'base_url' => null, |
|
245 | + 'base_url' => null, |
|
246 | 246 | |
247 | - /* |
|
247 | + /* |
|
248 | 248 | |-------------------------------------------------------------------------- |
249 | 249 | | Application Timezone |
250 | 250 | |-------------------------------------------------------------------------- |
@@ -255,9 +255,9 @@ discard block |
||
255 | 255 | | |
256 | 256 | */ |
257 | 257 | |
258 | - 'timezone' => 'UTC', |
|
258 | + 'timezone' => 'UTC', |
|
259 | 259 | |
260 | - /* |
|
260 | + /* |
|
261 | 261 | |-------------------------------------------------------------------------- |
262 | 262 | | Encryption of Cookies |
263 | 263 | |-------------------------------------------------------------------------- |
@@ -269,9 +269,9 @@ discard block |
||
269 | 269 | | |
270 | 270 | */ |
271 | 271 | |
272 | - 'cookie_encryption' => true, |
|
272 | + 'cookie_encryption' => true, |
|
273 | 273 | |
274 | - /* |
|
274 | + /* |
|
275 | 275 | |-------------------------------------------------------------------------- |
276 | 276 | | Encryption Key |
277 | 277 | |-------------------------------------------------------------------------- |
@@ -282,9 +282,9 @@ discard block |
||
282 | 282 | | |
283 | 283 | */ |
284 | 284 | |
285 | - 'key' => 'this-is-my-secret-key', |
|
285 | + 'key' => 'this-is-my-secret-key', |
|
286 | 286 | |
287 | - /* |
|
287 | + /* |
|
288 | 288 | |-------------------------------------------------------------------------- |
289 | 289 | | Encryption Type |
290 | 290 | |-------------------------------------------------------------------------- |
@@ -294,9 +294,9 @@ discard block |
||
294 | 294 | | |
295 | 295 | */ |
296 | 296 | |
297 | - 'cipher' => MCRYPT_RIJNDAEL_256, |
|
297 | + 'cipher' => MCRYPT_RIJNDAEL_256, |
|
298 | 298 | |
299 | - /* |
|
299 | + /* |
|
300 | 300 | |-------------------------------------------------------------------------- |
301 | 301 | | Encryption Type |
302 | 302 | |-------------------------------------------------------------------------- |
@@ -305,9 +305,9 @@ discard block |
||
305 | 305 | | |
306 | 306 | */ |
307 | 307 | |
308 | - 'encryption_mode' => 'ecb', |
|
308 | + 'encryption_mode' => 'ecb', |
|
309 | 309 | |
310 | - /* |
|
310 | + /* |
|
311 | 311 | |-------------------------------------------------------------------------- |
312 | 312 | | Work Factor |
313 | 313 | |-------------------------------------------------------------------------- |
@@ -316,9 +316,9 @@ discard block |
||
316 | 316 | | |
317 | 317 | */ |
318 | 318 | |
319 | - 'work_factor' => 12, |
|
319 | + 'work_factor' => 12, |
|
320 | 320 | |
321 | - /* |
|
321 | + /* |
|
322 | 322 | |-------------------------------------------------------------------------- |
323 | 323 | | Application Path Registration |
324 | 324 | |-------------------------------------------------------------------------- |
@@ -342,13 +342,13 @@ discard block |
||
342 | 342 | | |
343 | 343 | */ |
344 | 344 | |
345 | - 'paths' => array( |
|
346 | - APPLICATION_PATH . 'controllers/', |
|
347 | - APPLICATION_PATH . 'models/', |
|
348 | - APPLICATION_PATH . 'tasks/' |
|
349 | - ), |
|
345 | + 'paths' => array( |
|
346 | + APPLICATION_PATH . 'controllers/', |
|
347 | + APPLICATION_PATH . 'models/', |
|
348 | + APPLICATION_PATH . 'tasks/' |
|
349 | + ), |
|
350 | 350 | |
351 | - /* |
|
351 | + /* |
|
352 | 352 | |-------------------------------------------------------------------------- |
353 | 353 | | Application Classes Registration |
354 | 354 | |-------------------------------------------------------------------------- |
@@ -370,9 +370,9 @@ discard block |
||
370 | 370 | | |
371 | 371 | */ |
372 | 372 | |
373 | - 'classes' => array(), |
|
373 | + 'classes' => array(), |
|
374 | 374 | |
375 | - /* |
|
375 | + /* |
|
376 | 376 | |-------------------------------------------------------------------------- |
377 | 377 | | Registering Prefixes |
378 | 378 | |-------------------------------------------------------------------------- |
@@ -394,9 +394,9 @@ discard block |
||
394 | 394 | | |
395 | 395 | */ |
396 | 396 | |
397 | - 'prefixes' => array(), |
|
397 | + 'prefixes' => array(), |
|
398 | 398 | |
399 | - /* |
|
399 | + /* |
|
400 | 400 | |-------------------------------------------------------------------------- |
401 | 401 | | Additional File Extensions |
402 | 402 | |-------------------------------------------------------------------------- |
@@ -408,9 +408,9 @@ discard block |
||
408 | 408 | | |
409 | 409 | */ |
410 | 410 | |
411 | - 'extensions' => array("php"), |
|
411 | + 'extensions' => array("php"), |
|
412 | 412 | |
413 | - /* |
|
413 | + /* |
|
414 | 414 | |-------------------------------------------------------------------------- |
415 | 415 | | Default libraries |
416 | 416 | |-------------------------------------------------------------------------- |
@@ -418,7 +418,7 @@ discard block |
||
418 | 418 | | |
419 | 419 | */ |
420 | 420 | |
421 | - 'libraries' => array( |
|
422 | - 'session' => '\Phalcon\Session\Adapter\Files' |
|
423 | - ) |
|
421 | + 'libraries' => array( |
|
422 | + 'session' => '\Phalcon\Session\Adapter\Files' |
|
423 | + ) |
|
424 | 424 | ); |
425 | 425 | \ No newline at end of file |
@@ -25,10 +25,10 @@ discard block |
||
25 | 25 | | |
26 | 26 | */ |
27 | 27 | |
28 | - 'databases' => array ( |
|
29 | - 'db' => array ( |
|
28 | + 'databases' => array( |
|
29 | + 'db' => array( |
|
30 | 30 | 'type' => '\Phalcon\Db\Adapter\Pdo\Mysql', |
31 | - 'config' => array ( |
|
31 | + 'config' => array( |
|
32 | 32 | 'host' => '127.0.0.1', |
33 | 33 | 'port' => 3306, |
34 | 34 | 'username' => 'root', |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | '.volt' => array( |
57 | 57 | 'type' => '\Phalcon\Mvc\View\Engine\Volt', |
58 | 58 | 'options' => array( |
59 | - 'compiledPath' => STORAGE_PATH . 'framework/views/', |
|
59 | + 'compiledPath' => STORAGE_PATH.'framework/views/', |
|
60 | 60 | 'compiledSeparator' => '_', |
61 | 61 | 'compiledExtension' => '.compiled', |
62 | 62 | 'stat' => true |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | */ |
136 | 136 | |
137 | 137 | 'namespaces' => array( |
138 | - 'Modules\Common' => APPLICATION_PATH . 'modules/common/', |
|
138 | + 'Modules\Common' => APPLICATION_PATH.'modules/common/', |
|
139 | 139 | ), |
140 | 140 | |
141 | 141 | /* |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | 'modules' => array( |
160 | 160 | 'common' => array( |
161 | 161 | 'className' => 'Modules\Common\Module', |
162 | - 'path' => APPLICATION_PATH . 'modules/common/module.php' |
|
162 | + 'path' => APPLICATION_PATH.'modules/common/module.php' |
|
163 | 163 | ) |
164 | 164 | ), |
165 | 165 | |
@@ -343,9 +343,9 @@ discard block |
||
343 | 343 | */ |
344 | 344 | |
345 | 345 | 'paths' => array( |
346 | - APPLICATION_PATH . 'controllers/', |
|
347 | - APPLICATION_PATH . 'models/', |
|
348 | - APPLICATION_PATH . 'tasks/' |
|
346 | + APPLICATION_PATH.'controllers/', |
|
347 | + APPLICATION_PATH.'models/', |
|
348 | + APPLICATION_PATH.'tasks/' |
|
349 | 349 | ), |
350 | 350 | |
351 | 351 | /* |