Passed
Push — 1.0.0-dev ( bb6d0b...e3bc99 )
by nguereza
03:11
created
core/common.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
         static $cfg;
149 149
         if (empty($cfg)) {
150 150
             $cfg[0] = & load_configurations();
151
-            if(! is_array($cfg[0])){
151
+            if (!is_array($cfg[0])) {
152 152
                 $cfg[0] = array();
153 153
             }
154 154
         }
Please login to merge, or discard this patch.
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -200,17 +200,17 @@
 block discarded – undo
200 200
         die();
201 201
     }
202 202
 
203
-     /**
204
-     *  Function defined for PHP error message handling
205
-     *              
206
-     *  @param int $errno the type of error for example: E_USER_ERROR, E_USER_WARNING, etc.
207
-     *  @param string $errstr the error message
208
-     *  @param string $errfile the file where the error occurred
209
-     *  @param int $errline the line number where the error occurred
210
-     *  @codeCoverageIgnore
211
-     *  
212
-     *  @return boolean 
213
-     */
203
+        /**
204
+         *  Function defined for PHP error message handling
205
+         *              
206
+         *  @param int $errno the type of error for example: E_USER_ERROR, E_USER_WARNING, etc.
207
+         *  @param string $errstr the error message
208
+         *  @param string $errfile the file where the error occurred
209
+         *  @param int $errline the line number where the error occurred
210
+         *  @codeCoverageIgnore
211
+         *  
212
+         *  @return boolean 
213
+         */
214 214
     function fw_error_handler($errno, $errstr, $errfile, $errline) {
215 215
         $isError = (((E_ERROR | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR) & $errno) === $errno);
216 216
         if ($isError) {
Please login to merge, or discard this patch.
core/classes/Loader.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -316,8 +316,7 @@
 block discarded – undo
316 316
             $searchDir = null;
317 317
             if ($type == 'function') {
318 318
                $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
319
-            }
320
-            else if ($type == 'language') {
319
+            } else if ($type == 'language') {
321 320
                 $searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
322 321
                 $file = $appLang . DS . $file;
323 322
             }
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -311,7 +311,7 @@
 block discarded – undo
311 311
         protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){
312 312
             $searchDir = null;
313 313
             if ($type == 'function') {
314
-               $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
314
+                $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
315 315
             }
316 316
             else if ($type == 'language') {
317 317
                 $searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
          * @param  string $appLang the application language, only if type = "language"
309 309
          * @return string|null          the full file path
310 310
          */
311
-        protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){
311
+        protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null) {
312 312
             $searchDir = null;
313 313
             if ($type == 'function') {
314 314
                $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
          * @param  string|null $module the module if is not null will return it
335 335
          * @return string|null
336 336
          */
337
-        protected function getModuleFromSuperController($module){
337
+        protected function getModuleFromSuperController($module) {
338 338
             $obj = & get_instance();
339 339
             if (!$module && !empty($obj->moduleName)) {
340 340
                 $module = $obj->moduleName;
Please login to merge, or discard this patch.
index.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -189,11 +189,11 @@
 block discarded – undo
189 189
      */
190 190
     define('VAR_PATH', ROOT_PATH . 'var' . DS);
191 191
     
192
-     /**
193
-     * The path to the directory of your cache files.
194
-     *
195
-     * This feature is available currently for database and views.
196
-     */
192
+        /**
193
+         * The path to the directory of your cache files.
194
+         *
195
+         * This feature is available currently for database and views.
196
+         */
197 197
     define('CACHE_PATH', VAR_PATH . 'cache' . DS);
198 198
     
199 199
     /**
Please login to merge, or discard this patch.
app/config/autoload.php 1 patch
Indentation   +85 added lines, -85 removed lines patch added patch discarded remove patch
@@ -25,103 +25,103 @@
 block discarded – undo
25 25
      */
26 26
 
27 27
     /**
28
-	* This file contains the configuration of resources that you want to load automatically: 
29
-	* personals or systems libraries, configuration files, models, languages
30
-	* personals functions or systems that are used often in your application 
31
-	* instead of loading them every time you want to use it.
32
-	* Note: loading a lot of resources can decrease the performance of your application.
33
-	*/
28
+     * This file contains the configuration of resources that you want to load automatically: 
29
+     * personals or systems libraries, configuration files, models, languages
30
+     * personals functions or systems that are used often in your application 
31
+     * instead of loading them every time you want to use it.
32
+     * Note: loading a lot of resources can decrease the performance of your application.
33
+     */
34 34
 
35 35
 
36
-	/**
37
-	* If you have personals libraries or systems to load automatically, then list them in the following array.
38
-	* For example :
39
-	*
40
-	*	$autoload['libraries'] = array('library1', 'library2');
41
-	*
42
-	* Using module:
43
-	* 
44
-	*   $autoload['libraries'] = array('module1/library1', 'module2/library1');
45
-	*
46
-	* Note: Systems libraries have priority over personals libraries, 
47
-	* ie the loading order is as follows: it looks in the folder of the systems libraries, 
48
-	* if it is found, it is loaded, if not, it search in the module directories, if it is found, 
49
-	* it is loaded, if not will search in personals libraries folder, 
50
-	* before returning an error in case it does not find it.
51
-	*/
36
+    /**
37
+     * If you have personals libraries or systems to load automatically, then list them in the following array.
38
+     * For example :
39
+     *
40
+     *	$autoload['libraries'] = array('library1', 'library2');
41
+     *
42
+     * Using module:
43
+     * 
44
+     *   $autoload['libraries'] = array('module1/library1', 'module2/library1');
45
+     *
46
+     * Note: Systems libraries have priority over personals libraries, 
47
+     * ie the loading order is as follows: it looks in the folder of the systems libraries, 
48
+     * if it is found, it is loaded, if not, it search in the module directories, if it is found, 
49
+     * it is loaded, if not will search in personals libraries folder, 
50
+     * before returning an error in case it does not find it.
51
+     */
52 52
     $autoload['libraries'] = array();
53 53
 
54 54
     /**
55
-	* If you have configuration files to load automatically, then list them in the following array.
56
-	* For example :
57
-	*
58
-	*	$autoload['config'] = array('config1', 'config2');
59
-	*
60
-	* Using module:
61
-	* 
62
-	*   $autoload['config'] = array('module1/config1', 'module2/config2');
63
-	*
64
-	* Note 1: the file name must have as prefix "config_" for config file inside CONFIG_PATH folder
65
-	* for example "config_name_of_the_file_config.php" and contains as configuration variable the array $config,
66
-	* otherwise the system can not find this configuration file.
67
-	* For example :
68
-	*
69
-	*	$config['key1'] = value1;
70
-	* 	$config['key2'] = value2;
71
-	*
72
-	* Note 2: the files to be loaded must be in the folder defined by the constant "CONFIG_PATH" in "index.php".
73
-	* or inside the "config" of your application modules
74
-	*/
55
+     * If you have configuration files to load automatically, then list them in the following array.
56
+     * For example :
57
+     *
58
+     *	$autoload['config'] = array('config1', 'config2');
59
+     *
60
+     * Using module:
61
+     * 
62
+     *   $autoload['config'] = array('module1/config1', 'module2/config2');
63
+     *
64
+     * Note 1: the file name must have as prefix "config_" for config file inside CONFIG_PATH folder
65
+     * for example "config_name_of_the_file_config.php" and contains as configuration variable the array $config,
66
+     * otherwise the system can not find this configuration file.
67
+     * For example :
68
+     *
69
+     *	$config['key1'] = value1;
70
+     * 	$config['key2'] = value2;
71
+     *
72
+     * Note 2: the files to be loaded must be in the folder defined by the constant "CONFIG_PATH" in "index.php".
73
+     * or inside the "config" of your application modules
74
+     */
75 75
     $autoload['config'] = array();
76 76
 
77 77
     /**
78
-	* If you have models to load automatically, then list them in the following array.
79
-	* For example :
80
-	*
81
-	*	$autoload['models'] = array('model1', 'model2');
82
-	*
83
-	* Using module:
84
-	* 
85
-	*   $autoload['models'] = array('module1/model1', 'module2/model2');
86
-	*/
78
+     * If you have models to load automatically, then list them in the following array.
79
+     * For example :
80
+     *
81
+     *	$autoload['models'] = array('model1', 'model2');
82
+     *
83
+     * Using module:
84
+     * 
85
+     *   $autoload['models'] = array('module1/model1', 'module2/model2');
86
+     */
87 87
     $autoload['models'] = array();
88 88
 
89 89
     /**
90
-	* If you have systems or personals functions to load automatically, specify them in the following array.
91
-	* For example :
92
-	*
93
-	* 	$autoload['functions'] = array('function1', 'function2');
94
-	*
95
-	* Using module:
96
-	* 
97
-	*   $autoload['functions'] = array('module1/function1', 'module2/function2');
98
-	*
99
-	* Note 1: Personal functions have priority over system functions,
100
-	* that is to say that the order of loading is the following : it looks in the directory of the modules functions, 
101
-	* if it is found, it is loaded, otherwise, it looks in the directory of the personal functions,
102
-	* if it is found, it is loaded, otherwise, it looks in the directory of the system functions,
103
-	* before returning an error in case he does not find it.
104
-	*
105
-	* Note 2: the file name must have as prefix "function_" for example "function_foo.php" then
106
-	* will use:
107
-	* 
108
-	*  $autoload['functions'] = array('foo');
109
-	*/
90
+     * If you have systems or personals functions to load automatically, specify them in the following array.
91
+     * For example :
92
+     *
93
+     * 	$autoload['functions'] = array('function1', 'function2');
94
+     *
95
+     * Using module:
96
+     * 
97
+     *   $autoload['functions'] = array('module1/function1', 'module2/function2');
98
+     *
99
+     * Note 1: Personal functions have priority over system functions,
100
+     * that is to say that the order of loading is the following : it looks in the directory of the modules functions, 
101
+     * if it is found, it is loaded, otherwise, it looks in the directory of the personal functions,
102
+     * if it is found, it is loaded, otherwise, it looks in the directory of the system functions,
103
+     * before returning an error in case he does not find it.
104
+     *
105
+     * Note 2: the file name must have as prefix "function_" for example "function_foo.php" then
106
+     * will use:
107
+     * 
108
+     *  $autoload['functions'] = array('foo');
109
+     */
110 110
     $autoload['functions'] = array();
111 111
 	
112 112
     /**
113
-	* If you have systems or personals languages to load automatically, specify them in the following array.
114
-	* For example :
115
-	*
116
-	* 	$autoload['languages'] = array('lang1', 'lang2');
117
-	*
118
-	* Using module:
119
-	* 
120
-	*   $autoload['languages'] = array('module1/lang1', 'module2/lang2');
121
-	*
122
-	* Note: the file name must have as prefix "lang_" for example "lang_foo.php" then
123
-	* will use:
124
-	* 
125
-	*  $autoload['languages'] = array('foo');
126
-	*/
113
+     * If you have systems or personals languages to load automatically, specify them in the following array.
114
+     * For example :
115
+     *
116
+     * 	$autoload['languages'] = array('lang1', 'lang2');
117
+     *
118
+     * Using module:
119
+     * 
120
+     *   $autoload['languages'] = array('module1/lang1', 'module2/lang2');
121
+     *
122
+     * Note: the file name must have as prefix "lang_" for example "lang_foo.php" then
123
+     * will use:
124
+     * 
125
+     *  $autoload['languages'] = array('foo');
126
+     */
127 127
     $autoload['languages'] = array();
Please login to merge, or discard this patch.
core/classes/Router.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -241,12 +241,12 @@  discard block
 block discarded – undo
241 241
         }
242 242
 
243 243
         /**
244
-        * Setting the route configuration using the configuration file and additional configuration from param
245
-        * @param array $overwriteConfig the additional configuration to overwrite with the existing one
246
-        * @param boolean $useConfigFile whether to use route configuration file
247
-        * 
248
-        * @return object
249
-        */
244
+         * Setting the route configuration using the configuration file and additional configuration from param
245
+         * @param array $overwriteConfig the additional configuration to overwrite with the existing one
246
+         * @param boolean $useConfigFile whether to use route configuration file
247
+         * 
248
+         * @return object
249
+         */
250 250
         public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) {
251 251
             $route = array();
252 252
             if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) {
@@ -423,11 +423,11 @@  discard block
 block discarded – undo
423 423
             }
424 424
         }
425 425
 
426
-         /**
427
-         * Remove the URL suffix and query string values if exists
428
-         * @param  string $uri the route URI to process
429
-         * @return string      the final route uri after processed
430
-         */
426
+            /**
427
+             * Remove the URL suffix and query string values if exists
428
+             * @param  string $uri the route URI to process
429
+             * @return string      the final route uri after processed
430
+             */
431 431
         protected function removeSuffixAndQueryStringFromUri($uri) {
432 432
             $this->logger->debug('Check if URL suffix is enabled in the configuration');
433 433
             //remove url suffix from the request URI
@@ -540,7 +540,7 @@  discard block
 block discarded – undo
540 540
                 $this->logger->info(
541 541
                                     'After loop in predefined routes configuration,'
542 542
                                     . 'the module name is set but the controller is not set,' 
543
-									. 'so we will use module as the controller'
543
+                                    . 'so we will use module as the controller'
544 544
                                 );
545 545
                 $this->controller = $this->module;
546 546
             }
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
          * Remove the DOCUMENT_ROOT and front controller from segments if exists
444 444
          * @return void
445 445
          */
446
-        protected function removeDocumentRootFrontControllerFromSegments(){
446
+        protected function removeDocumentRootFrontControllerFromSegments() {
447 447
             $segment = $this->segments;
448 448
             $baseUrl = get_config('base_url');
449 449
             //check if the app is not in DOCUMENT_ROOT
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
                     break;
562 562
                 }
563 563
             }
564
-            if($findIndex !== -1){
564
+            if ($findIndex !== -1) {
565 565
                 //$args[0] => full string captured by preg_match
566 566
                 //$args[1], $args[2], $args[n] => contains the value of 
567 567
                 //(:num), (:alpha), (:alnum), (:any)
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
586 586
          * Find file path of the current controller using the current module
587 587
          * @return boolean true if the file path is found otherwise false.
588 588
          */
589
-        protected function findControllerFullPathUsingCurrentModule(){
589
+        protected function findControllerFullPathUsingCurrentModule() {
590 590
             $path = $this->moduleInstance->findControllerFullPath(ucfirst($this->controller), $this->module);
591 591
             if (!$path) {
592 592
                 $this->logger->info('The controller [' . $this->controller . '] not found in the module, may be will use the module [' . $this->module . '] as controller');
@@ -602,7 +602,7 @@  discard block
 block discarded – undo
602 602
          * or the current request does not use module
603 603
          * @return void
604 604
          */
605
-        protected function setRouteParamsIfNoModuleOrNotFound(){
605
+        protected function setRouteParamsIfNoModuleOrNotFound() {
606 606
             $segment = $this->segments;
607 607
             //controller
608 608
             if (isset($segment[0])) {
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
          * or the current request use module
624 624
          * @return void
625 625
          */
626
-        protected function setRouteParamsIfAppHasModuleOrFound(){
626
+        protected function setRouteParamsIfAppHasModuleOrFound() {
627 627
             //get the module list
628 628
             $modules = $this->moduleInstance->getModuleList();
629 629
             $segment = $this->segments;
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
                     $this->controller = $segment[0];
637 637
 
638 638
                     //check if the request use the same module name and controller
639
-                    if($this->findControllerFullPathUsingCurrentModule()){
639
+                    if ($this->findControllerFullPathUsingCurrentModule()) {
640 640
                         array_shift($segment);
641 641
                     }
642 642
                 }
Please login to merge, or discard this patch.
core/libraries/Form.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
                 $attributes['accept-charset'] = get_config('charset', 'UTF-8');
46 46
             }
47 47
             if (!empty($enctype)) {
48
-                 $attributes['enctype'] = $enctype;
48
+                    $attributes['enctype'] = $enctype;
49 49
             }
50 50
             $str .= attributes_to_string($attributes);
51 51
             $str .= '>';
Please login to merge, or discard this patch.
core/classes/model/DBSessionHandlerModel.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@
 block discarded – undo
29 29
      */
30 30
 	
31 31
     /**
32
-    * DB session handler model class
33
-    */
32
+     * DB session handler model class
33
+     */
34 34
     abstract class DBSessionHandlerModel extends Model {
35 35
 		
36 36
         /**
Please login to merge, or discard this patch.
core/classes/database/Database.php 2 patches
Indentation   +8 added lines, -9 removed lines patch added patch discarded remove patch
@@ -387,9 +387,9 @@  discard block
 block discarded – undo
387 387
                 $this->queryCount++;
388 388
                 
389 389
                 $queryResult = $this->queryRunner->setQuery($query)
390
-                                                 ->setReturnType($returnAsList)
391
-                                                 ->setReturnAsArray($returnAsArray)
392
-                                                 ->execute();
390
+                                                    ->setReturnType($returnAsList)
391
+                                                    ->setReturnAsArray($returnAsArray)
392
+                                                    ->execute();
393 393
 
394 394
                 if (is_object($queryResult)) {
395 395
                     $this->result  = $queryResult->getResult();
@@ -405,11 +405,11 @@  discard block
 block discarded – undo
405 405
             return $this->result;
406 406
         }
407 407
 
408
-         /**
409
-         * Set the connection instance using database configuration file
410
-         *
411
-         * @return object|void
412
-         */
408
+            /**
409
+             * Set the connection instance using database configuration file
410
+             *
411
+             * @return object|void
412
+             */
413 413
         protected function setConnectionUsingConfigFile(){
414 414
             $dbConfigFromFile = $this->getDatabaseConfigFromFile();
415 415
             $connection = &class_loader('DatabaseConnection', 'classes/database');
@@ -422,7 +422,6 @@  discard block
 block discarded – undo
422 422
 
423 423
         /**
424 424
          * Get the database configuration using the configuration file
425
-         
426 425
          * @return array the database configuration from file
427 426
          */
428 427
         protected function getDatabaseConfigFromFile() {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -410,7 +410,7 @@
 block discarded – undo
410 410
          *
411 411
          * @return object|void
412 412
          */
413
-        protected function setConnectionUsingConfigFile(){
413
+        protected function setConnectionUsingConfigFile() {
414 414
             $dbConfigFromFile = $this->getDatabaseConfigFromFile();
415 415
             $connection = &class_loader('DatabaseConnection', 'classes/database');
416 416
             $connection->setConfig($dbConfigFromFile);
Please login to merge, or discard this patch.
core/classes/database/DatabaseConnection.php 1 patch
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -42,28 +42,28 @@  discard block
 block discarded – undo
42 42
          */
43 43
         private $driver = null;
44 44
 
45
-         /**
46
-         * The database hostname
47
-         * @var string
48
-         */
45
+            /**
46
+             * The database hostname
47
+             * @var string
48
+             */
49 49
         private $hostname = null;
50 50
 
51
-          /**
52
-         * The database port
53
-         * @var integer
54
-         */
51
+            /**
52
+             * The database port
53
+             * @var integer
54
+             */
55 55
         private $port = null;
56 56
         
57
-         /**
58
-         * The database username
59
-         * @var string
60
-         */
57
+            /**
58
+             * The database username
59
+             * @var string
60
+             */
61 61
         private $username = null;
62 62
 
63
-         /**
64
-         * The database password
65
-         * @var string
66
-         */
63
+            /**
64
+             * The database password
65
+             * @var string
66
+             */
67 67
         private $password = null;
68 68
 
69 69
         /**
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
          */
73 73
         private $databaseName = null;
74 74
 
75
-         /**
76
-         * The database charset
77
-         * @var string
78
-         */
75
+            /**
76
+             * The database charset
77
+             * @var string
78
+             */
79 79
         private $charset = null;
80 80
 
81 81
         /**
@@ -84,10 +84,10 @@  discard block
 block discarded – undo
84 84
          */
85 85
         private $collation = null;
86 86
 
87
-         /**
88
-         * The database tables prefix
89
-         * @var string
90
-         */
87
+            /**
88
+             * The database tables prefix
89
+             * @var string
90
+             */
91 91
         private $prefix = null;
92 92
 
93 93
         /**
@@ -114,11 +114,11 @@  discard block
 block discarded – undo
114 114
             }
115 115
         }
116 116
 
117
-         /**
118
-         * This is method is used to connect to database
119
-         * 
120
-         * @return boolean true in case of successfully connection false if error
121
-         */
117
+            /**
118
+             * This is method is used to connect to database
119
+             * 
120
+             * @return boolean true in case of successfully connection false if error
121
+             */
122 122
         public function connect() {
123 123
             try {
124 124
                 $this->pdo = new PDO($this->getDsnValue(), $this->getUsername(), $this->getPassword());
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
             $this->populatePropertiesFromConfig();
410 410
 
411 411
             if (!empty($this->config)) {
412
-               //For logging
412
+                //For logging
413 413
                 $configInfo = $this->config;
414 414
                 //Hide password from log
415 415
                 $configInfo['password'] = string_hidden($this->getPassword());
@@ -418,11 +418,11 @@  discard block
 block discarded – undo
418 418
             return $this;
419 419
         }
420 420
 
421
-         /**
422
-         * Update the properties using the current database configuration
423
-         * 
424
-         * @return object the current instance
425
-         */
421
+            /**
422
+             * Update the properties using the current database configuration
423
+             * 
424
+             * @return object the current instance
425
+             */
426 426
         protected function populatePropertiesFromConfig() {
427 427
             foreach ($this->config as $key => $value) {
428 428
                 $setter = 'set' . ucfirst($key);
Please login to merge, or discard this patch.