tnhfw / tnh-fw

core/classes/Loader.php

Indentation +2 added lines, -2 removed lines

@@ -219,7 +219,7 @@ 
             $moduleConfigPath = get_instance()->module->findConfigFullPath($filename, $module);
             if ($moduleConfigPath) {
                 $this->logger->info('Found config [' . $filename . '] from module [' . $module . '], '
-                                  . 'the file path is [' . $moduleConfigPath . '] we will used it');
+                                    . 'the file path is [' . $moduleConfigPath . '] we will used it');
                 $configFilePath = $moduleConfigPath;
             } else {
                 $this->logger->info('Cannot find config [' . $filename . '] from modules using the default location');
@@ -479,7 +479,7 @@ 
             $moduleLibraryPath = get_instance()->module->findLibraryFullPath($class, $module);
             if ($moduleLibraryPath) {
                 $this->logger->info('Found library [' . $class . '] from module [' . $module . '], the '
-                                   . 'file path is [' . $moduleLibraryPath . '] we will used it');
+                                    . 'file path is [' . $moduleLibraryPath . '] we will used it');
                 $libraryFilePath = $moduleLibraryPath;
             } else {
                 $this->logger->info('Cannot find library [' . $class . '] from modules using the default location');

Spacing +2 added lines, -2 removed lines

@@ -335,7 +335,7 @@ 
          * @param  string $appLang the application language, only if type = "language"
          * @return string|null          the full file path
          */
-        protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){
+        protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null) {
             //Default to "function"
             $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
             if ($type == 'language') {
@@ -359,7 +359,7 @@ 
          * @param  string|null $module the module if is not null will return it
          * @return string|null
          */
-        protected function getModuleFromSuperController($module){
+        protected function getModuleFromSuperController($module) {
             $obj = & get_instance();
             if (!$module && !empty($obj->moduleName)) {
                 $module = $obj->moduleName;

core/classes/model/DBSessionHandlerModel.php

Indentation +10 added lines, -10 removed lines

@@ -29,8 +29,8 @@ 
      */
 	
     /**
-    * DB session handler model class
-    */
+     * DB session handler model class
+     */
     abstract class DBSessionHandlerModel extends Model {
 		
         /**
@@ -40,14 +40,14 @@ 
          *
          * @example
          * 	array(
-	 *	      'sid' => '', //VARCHAR(100) Note: this a primary key
-	 *	      'sdata' => '', //TEXT
-	 *	      'stime' => '', //unix timestamp (INT|BIGINT)
-	 *	      'shost' => '', //VARCHAR(255)
-	 *	      'sip' => '', //VARCHAR(128) 
-	 *	      'sbrowser' => '', //VARCHAR(255) 
-	 *	      'skey' => '' //VARCHAR(255) 
-	 *	);
+         *	      'sid' => '', //VARCHAR(100) Note: this a primary key
+         *	      'sdata' => '', //TEXT
+         *	      'stime' => '', //unix timestamp (INT|BIGINT)
+         *	      'shost' => '', //VARCHAR(255)
+         *	      'sip' => '', //VARCHAR(128) 
+         *	      'sbrowser' => '', //VARCHAR(255) 
+         *	      'skey' => '' //VARCHAR(255) 
+         *	);
          */
         protected $sessionTableColumns = array();
 

core/classes/Config.php

Indentation +9 added lines, -9 removed lines

@@ -46,9 +46,9 @@ 
             if ($init) {
                 $this->init();
                 //@codeCoverageIgnoreStart
-                 if (ENVIRONMENT == 'production' && in_array(strtolower($this->config['log_level']), array('debug', 'info', 'notice'))) {
+                    if (ENVIRONMENT == 'production' && in_array(strtolower($this->config['log_level']), array('debug', 'info', 'notice'))) {
                     $this->logger->warning('You are in production environment, please set '
-                                           . 'log level to WARNING, ERROR, CRITICAL, ALERT, EMERGENCY to increase the application performance');
+                                            . 'log level to WARNING, ERROR, CRITICAL, ALERT, EMERGENCY to increase the application performance');
                 }
                 //@codeCoverageIgnoreEnd
             }
@@ -146,7 +146,7 @@ 
             if (empty($this->config['base_url'])) {
                 if (ENVIRONMENT == 'production') {
                     $this->logger->warning('Application base URL is not set or invalid, please'
-                                           . ' set application base URL to increase the application loading time');
+                                            . ' set application base URL to increase the application loading time');
                 }
                 $baseUrl = null;
                 $protocol = 'http';
@@ -173,7 +173,7 @@ 
                                                                     );
                 } else {
                     $this->logger->warning('Can not determine the application '
-                                           . 'base URL automatically, use http://localhost as default');
+                                            . 'base URL automatically, use http://localhost as default');
                     $baseUrl = 'http://localhost/';
                 }
                 $this->config['base_url'] = $baseUrl;
@@ -182,11 +182,11 @@ 
         }
          
         /**
-        * Return the server port using variable
-        *
-        * @codeCoverageIgnore
-        * @return string
-        */
+         * Return the server port using variable
+         *
+         * @codeCoverageIgnore
+         * @return string
+         */
         protected function getServerPort() {
             $globals = & class_loader('GlobalVar', 'classes');
             $serverPort = $globals->server('SERVER_PORT');

core/classes/DBSessionHandler.php

Spacing +1 added lines, -1 removed lines

@@ -318,7 +318,7 @@
          * Get some parameters need like ip address, hostname, browser info, etc.
          * @return array
          */
-        protected function getSessionDataParams(){
+        protected function getSessionDataParams() {
             $this->OBJ->loader->functions('user_agent'); 
             $this->OBJ->loader->library('Browser'); 
             

core/classes/Router.php

Indentation +15 added lines, -15 removed lines

@@ -276,14 +276,14 @@ 
         }
 
         /**
-        * Setting the route configuration using the configuration file 
-        * and additional configuration from param
-        * @param array $overwriteConfig the additional configuration 
-        * to overwrite with the existing one
-        * @param boolean $useConfigFile whether to use route configuration file
-        * 
-        * @return object
-        */
+         * Setting the route configuration using the configuration file 
+         * and additional configuration from param
+         * @param array $overwriteConfig the additional configuration 
+         * to overwrite with the existing one
+         * @param boolean $useConfigFile whether to use route configuration file
+         * 
+         * @return object
+         */
         public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) {
             $route = array();
             if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) {
@@ -364,7 +364,7 @@ 
             //the URL like http://domain.com/module/controller/method/arg1/arg2/argn 
             if (!$this->controller) {
                 $this->logger->info('Cannot determine the routing information ' 
-                       . 'using the predefined routes configuration, will use the request URI parameters');
+                        . 'using the predefined routes configuration, will use the request URI parameters');
                 //determine route parameters using the route URI param
                 $this->determineRouteParamsFromRequestUri();
             }
@@ -478,11 +478,11 @@ 
             }
         }
 
-         /**
-         * Remove the URL suffix and query string values if exists
-         * @param  string $uri the route URI to process
-         * @return string      the final route uri after processed
-         */
+            /**
+             * Remove the URL suffix and query string values if exists
+             * @param  string $uri the route URI to process
+             * @return string      the final route uri after processed
+             */
         protected function removeSuffixAndQueryStringFromUri($uri) {
             $this->logger->debug('Check if URL suffix is enabled in the configuration');
             //remove url suffix from the request URI
@@ -598,7 +598,7 @@ 
                 $this->logger->info(
                                     'After loop in predefined routes configuration,'
                                     . 'the module name is set but the controller is not set,' 
-									. 'so we will use module as the controller'
+                                    . 'so we will use module as the controller'
                                 );
                 $this->controller = $this->module;
             }

Spacing +6 added lines, -6 removed lines

@@ -450,7 +450,7 @@ 
          * Remove the DOCUMENT_ROOT and front controller from segments if exists
          * @return void
          */
-        protected function removeDocumentRootFrontControllerFromSegments(){
+        protected function removeDocumentRootFrontControllerFromSegments() {
             $segment = $this->segments;
             $globals = & class_loader('GlobalVar', 'classes');
             $rootFolder = substr($globals->server('SCRIPT_NAME'), 0, strpos(
@@ -581,7 +581,7 @@ 
                     break;
                 }
             }
-            if($findIndex !== -1){
+            if ($findIndex !== -1) {
                 /*
                 * $args[0] => full string captured by preg_match
                 * $args[1], $args[2], $args[n] => contains the value of 
@@ -608,7 +608,7 @@ 
          * Find file path of the current controller using the current module
          * @return boolean true if the file path is found otherwise false.
          */
-        protected function findControllerFullPathUsingCurrentModule(){
+        protected function findControllerFullPathUsingCurrentModule() {
             $path = $this->moduleInstance->findControllerFullPath(ucfirst($this->controller), $this->module);
             if (!$path) {
                 $this->logger->info('The controller [' . $this->controller . '] not ' 
@@ -625,7 +625,7 @@ 
          * or the current request does not use module
          * @return void
          */
-        protected function setRouteParamsIfNoModuleOrNotFound(){
+        protected function setRouteParamsIfNoModuleOrNotFound() {
             $segment = $this->segments;
             //controller
             if (isset($segment[0])) {
@@ -646,7 +646,7 @@ 
          * or the current request use module
          * @return void
          */
-        protected function setRouteParamsIfAppHasModuleOrFound(){
+        protected function setRouteParamsIfAppHasModuleOrFound() {
             //get the module list
             $modules = $this->moduleInstance->getModuleList();
             $segment = $this->segments;
@@ -658,7 +658,7 @@ 
                 if (isset($segment[0])) {
                     $this->controller = $segment[0];
                     //check if the request use the same module name and controller
-                    if($this->findControllerFullPathUsingCurrentModule()){
+                    if ($this->findControllerFullPathUsingCurrentModule()) {
                         array_shift($segment);
                     }
                 }

core/bootstrap.php

Indentation +29 added lines, -29 removed lines

@@ -1,32 +1,32 @@ 
 <?php
     defined('ROOT_PATH') || exit('Access denied');
-     /**
-     * TNH Framework
-     *
-     * A simple PHP framework using HMVC architecture
-     *
-     * This content is released under the MIT License (MIT)
-     *
-     * Copyright (c) 2017 TNH Framework
-     *
-     * Permission is hereby granted, free of charge, to any person obtaining a copy
-     * of this software and associated documentation files (the "Software"), to deal
-     * in the Software without restriction, including without limitation the rights
-     * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-     * copies of the Software, and to permit persons to whom the Software is
-     * furnished to do so, subject to the following conditions:
-     *
-     * The above copyright notice and this permission notice shall be included in all
-     * copies or substantial portions of the Software.
-     *
-     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-     * SOFTWARE.
-     */
+        /**
+         * TNH Framework
+         *
+         * A simple PHP framework using HMVC architecture
+         *
+         * This content is released under the MIT License (MIT)
+         *
+         * Copyright (c) 2017 TNH Framework
+         *
+         * Permission is hereby granted, free of charge, to any person obtaining a copy
+         * of this software and associated documentation files (the "Software"), to deal
+         * in the Software without restriction, including without limitation the rights
+         * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+         * copies of the Software, and to permit persons to whom the Software is
+         * furnished to do so, subject to the following conditions:
+         *
+         * The above copyright notice and this permission notice shall be included in all
+         * copies or substantial portions of the Software.
+         *
+         * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+         * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+         * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+         * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+         * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+         * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+         * SOFTWARE.
+         */
 
     /**
      *  @file bootstrap.php
@@ -93,7 +93,7 @@ 
                     . '] please install a PHP version that is compatible.', 'PHP Error environment');	
     }
     $LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_MIN_PHP_VERSION 
-                   . 'REQUIRED MAXIMUM: ' . TNH_MAX_PHP_VERSION . '], application can work without any issue');
+                    . 'REQUIRED MAXIMUM: ' . TNH_MAX_PHP_VERSION . '], application can work without any issue');
 
     /**
      * Setting of the PHP error message handling function
@@ -155,7 +155,7 @@ 
     /**
      * Register controllers autoload function
      */
-     spl_autoload_register('autoload_controller');
+        spl_autoload_register('autoload_controller');
 
     /**
      * Loading Security class

Spacing +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
      */
     $TIMEZONE = get_config('server_timezone', 'UTC');
     if (!date_default_timezone_set($TIMEZONE)) {
-        show_error('Invalid server timezone configuration "' .$TIMEZONE. '"');
+        show_error('Invalid server timezone configuration "' . $TIMEZONE . '"');
     }
 
     /**