tnhfw / tnh-fw

core/classes/Controller.php

Indentation +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
          *
          * @codeCoverageIgnore
          */
-         private function startAppSession() {
+            private function startAppSession() {
             //$_SESSION is not available on cli mode 
             if (!IS_CLI) {
                 //set session params
@@ -143,7 +143,7 @@ 
          * @codeCoverageIgnore
          */
         private function setAppSessionConfig() {
-             //the default is to store in the files
+                //the default is to store in the files
             $sessionHandler = $this->config->get('session_handler', 'files');
             $this->logger->info('Session handler: ' . $sessionHandler);
             if ($sessionHandler == 'files') {

core/classes/model/Model.php

Indentation +31 added lines, -31 removed lines

@@ -30,7 +30,7 @@ 
 
     class Model {
 
-       /**
+        /**
          * This model's default database table. 
          * @var string the name of table
          */
@@ -173,12 +173,12 @@ 
             if ($db !== null) {
                 $this->setDb($db);
             } else {
-                 /**
-                 * NOTE: Need use "clone" because some Model need have the personal instance of the database library
-                 * to prevent duplication
-                 */
-                 $obj = & get_instance();
-                 $this->setDb(clone $obj->database);
+                    /**
+                     * NOTE: Need use "clone" because some Model need have the personal instance of the database library
+                     * to prevent duplication
+                     */
+                    $obj = & get_instance();
+                    $this->setDb(clone $obj->database);
             }
             array_unshift($this->beforeCreateCallbacks, 'removeProtectedTableColumns');
             array_unshift($this->beforeUpdateCallbacks, 'removeProtectedTableColumns');
@@ -623,7 +623,7 @@ 
          * Only get deleted rows on the next call
          * 
          * @return object the current instance
-        */
+         */
         public function onlyRecordDeleted() {
             $this->returnOnlyRecordDeleted = true;
             return $this;
@@ -649,8 +649,8 @@ 
          * @return array the data after add field for updated time
          */
         public function updatedAt($row) {
-           $row['updated_at'] = date('Y-m-d H:i:s');
-           return $row;
+            $row['updated_at'] = date('Y-m-d H:i:s');
+            return $row;
         }
 
         /**
@@ -695,7 +695,7 @@ 
          */
         public function removeProtectedTableColumns($row) {
             foreach ($this->protectedTableColumns as $attr) {
-               if (isset($row[$attr])) {
+                if (isset($row[$attr])) {
                     unset($row[$attr]);
                 }
             }
@@ -818,23 +818,23 @@ 
             return false;
         }
 
-         /**
-         * Get the record return type array or object
-         * 
-         * @return string|boolean
-         */
+            /**
+             * Get the record return type array or object
+             * 
+             * @return string|boolean
+             */
         protected function getReturnType(){
             $type = false;
             if ($this->temporaryReturnRecordType == 'array') {
-               $type = 'array';
+                $type = 'array';
             }
             return $type;
         }
 
-         /**
-         * Check if soft delete is enable setting the condition
-         * @return object the current instance 
-         */
+            /**
+             * Check if soft delete is enable setting the condition
+             * @return object the current instance 
+             */
         protected function checkForSoftDelete(){
             if ($this->softDeleteStatus && $this->returnRecordWithDeleted !== true) {
                 $this->getQueryBuilder()->where(
@@ -845,16 +845,16 @@ 
             return $this;
         }
 
-         /**
-         * Relate for "manyToOne" and "oneToMany"
-         * 
-         * @param  string $relationship the name of relation
-         * @param  string|array $options      the model and primary key values
-         * @param  object|array $row          the row to update
-         * @param  string $type the type can be "manyToOne", "oneToMany"
-         * 
-         * @return array|object the final row values
-         */
+            /**
+             * Relate for "manyToOne" and "oneToMany"
+             * 
+             * @param  string $relationship the name of relation
+             * @param  string|array $options      the model and primary key values
+             * @param  object|array $row          the row to update
+             * @param  string $type the type can be "manyToOne", "oneToMany"
+             * 
+             * @return array|object the final row values
+             */
         protected function relateOneToManyAndManyToOne($relationship, $options, $row, $type){
             if (in_array($relationship, $this->withs)) {
                 get_instance()->loader->model($options['model'], $relationship . '_model');

core/bootstrap.php

Indentation +28 added lines, -28 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
@@ -143,7 +143,7 @@ 
     /**
      * Register controllers autoload function
      */
-     spl_autoload_register('autoload_controller');
+        spl_autoload_register('autoload_controller');
 
     /**
      * Loading Security class

core/classes/Module.php

Indentation +8 added lines, -8 removed lines

@@ -58,8 +58,8 @@ 
          */
         public function add($name) {
             if (in_array($name, $this->list)) {
-               $this->logger->info('The module [' .$name. '] already added skipping.');
-               return $this;
+                $this->logger->info('The module [' .$name. '] already added skipping.');
+                return $this;
             }
             $this->list[] = $name;
             return $this;
@@ -90,10 +90,10 @@ 
             $this->list = array();
         }
 
-         /**
-         * Get the list of module loaded
-         * @return array the module list
-         */
+            /**
+             * Get the list of module loaded
+             * @return array the module list
+             */
         public function getModuleList() {
             return $this->list;
         }
@@ -240,7 +240,7 @@ 
             $this->logger->debug('Check if the application contains the modules ...');
             $dirList = glob(MODULE_PATH . '*', GLOB_ONLYDIR);
             if ($dirList !== false) {
-               $this->list = array_map('basename', $dirList);
+                $this->list = array_map('basename', $dirList);
             }
             if (!empty($this->list)) {
                 $this->logger->info('The application contains the module below [' . implode(', ', $this->list) . ']');
@@ -263,7 +263,7 @@ 
             $filePath = MODULE_PATH . $module . DS . $type . DS . $classFile;
             if (file_exists($filePath)) {
                 $this->logger->info('Found class [' . $class . '] in module [' . $module . '] '
-                                     . 'for [' . $type . '] the file path is [' . $filePath . ']');
+                                        . 'for [' . $type . '] the file path is [' . $filePath . ']');
                 return $filePath;
             }
             $this->logger->info('Class [' . $class . '] does not exist in the module [' . $module . '] for [' . $type . ']');

core/classes/database/DatabaseConnection.php

Indentation +39 added lines, -40 removed lines

@@ -42,28 +42,28 @@ 
          */
         private $driver = null;
 
-         /**
-         * The database hostname
-         * @var string
-         */
+            /**
+             * The database hostname
+             * @var string
+             */
         private $hostname = null;
 
-          /**
-         * The database port
-         * @var integer
-         */
+            /**
+             * The database port
+             * @var integer
+             */
         private $port = null;
         
-         /**
-         * The database username
-         * @var string
-         */
+            /**
+             * The database username
+             * @var string
+             */
         private $username = null;
 
-         /**
-         * The database password
-         * @var string
-         */
+            /**
+             * The database password
+             * @var string
+             */
         private $password = null;
 
         /**
@@ -72,10 +72,10 @@ 
          */
         private $databaseName = null;
 
-         /**
-         * The database charset
-         * @var string
-         */
+            /**
+             * The database charset
+             * @var string
+             */
         private $charset = null;
 
         /**
@@ -84,10 +84,10 @@ 
          */
         private $collation = null;
 
-         /**
-         * The database tables prefix
-         * @var string
-         */
+            /**
+             * The database tables prefix
+             * @var string
+             */
         private $prefix = null;
 
         /**
@@ -114,11 +114,11 @@ 
             }
         }
 
-         /**
-         * This is method is used to connect to database
-         * 
-         * @return boolean true in case of successfully connection false if error
-         */
+            /**
+             * This is method is used to connect to database
+             * 
+             * @return boolean true in case of successfully connection false if error
+             */
         public function connect() {
             try {
                 $options = array(
@@ -414,7 +414,7 @@ 
             $this->populatePropertiesFromConfig();
 
             if (!empty($this->config)) {
-               //For logging
+                //For logging
                 $configInfo = $this->config;
                 //Hide password from log
                 $configInfo['password'] = string_hidden($this->getPassword());
@@ -423,11 +423,10 @@ 
             return $this;
         }
 
-         /**
-         * Get the database configuration using the configuration file
-         
-         * @return array the database configuration from file
-         */
+            /**
+             * Get the database configuration using the configuration file
+             * @return array the database configuration from file
+             */
         public function getDatabaseConfigFromFile() {
             $db = array();
             if (file_exists(CONFIG_PATH . 'database.php')) {
@@ -437,11 +436,11 @@ 
             return $db;
         }
 
-         /**
-         * Update the properties using the current database configuration
-         * 
-         * @return object the current instance
-         */
+            /**
+             * Update the properties using the current database configuration
+             * 
+             * @return object the current instance
+             */
         protected function populatePropertiesFromConfig() {
             foreach ($this->config as $key => $value) {
                 $setter = 'set' . ucfirst($key);

core/classes/database/Database.php

Indentation +4 added lines, -4 removed lines

@@ -111,7 +111,7 @@ 
          */
         public function __construct(DatabaseConnection $connection = null) {
             parent::__construct();
-    		if ($connection !== null) {
+            if ($connection !== null) {
                 $this->connection = $connection;
             } 
         }
@@ -385,9 +385,9 @@ 
                 $this->queryCount++;
                 
                 $queryResult = $this->queryRunner->setQuery($query)
-                                                 ->setReturnType($returnAsList)
-                                                 ->setReturnAsArray($returnAsArray)
-                                                 ->execute();
+                                                    ->setReturnType($returnAsList)
+                                                    ->setReturnAsArray($returnAsArray)
+                                                    ->execute();
 
                 if (is_object($queryResult)) {
                     $this->result  = $queryResult->getResult();

core/classes/Response.php

Indentation +26 added lines, -26 removed lines

@@ -190,7 +190,7 @@ 
                 $this->logger->info('Cannot find view [' . $view . '] in module [' . $module . '] '
                                     . 'using the default location');
             }
-			if (!$path) {
+            if (!$path) {
                 $path = $this->getDefaultFilePathForView($viewFile);
             }
             $this->logger->info('The view file path to be loaded is [' . $path . ']');
@@ -266,12 +266,12 @@ 
             return $this->finalPageContent;
         }
 
-         /**
-         * Set the final page to be rendered
-         * @param string $finalPage the content of the final page
-         * 
-         * @return object
-         */
+            /**
+             * Set the final page to be rendered
+             * @param string $finalPage the content of the final page
+             * 
+             * @return object
+             */
         public function setFinalPageContent($finalPage) {
             $this->finalPageContent = $finalPage;
             return $this;
@@ -345,11 +345,11 @@ 
         }
 
                 /**
-         * Dispatch the FINAL_VIEW_READY event
-         *             
-         * @return string|null the final view content after processing by each listener
-         * if they exists otherwise the same content will be returned
-         */
+                 * Dispatch the FINAL_VIEW_READY event
+                 *             
+                 * @return string|null the final view content after processing by each listener
+                 * if they exists otherwise the same content will be returned
+                 */
         protected function dispatchFinalViewEvent() {
             //dispatch
             $event = get_instance()->eventdispatcher->dispatch(
@@ -383,12 +383,12 @@ 
         }
 
 
-         /**
-         * Return the default full file path for view
-         * @param  string $file    the filename
-         * 
-         * @return string|null          the full file path
-         */
+            /**
+             * Return the default full file path for view
+             * @param  string $file    the filename
+             * 
+             * @return string|null          the full file path
+             */
         protected function getDefaultFilePathForView($file){
             $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH);
             $fullFilePath = null;
@@ -421,7 +421,7 @@ 
                 $headerModifiedSince = $globals->server('HTTP_IF_MODIFIED_SINCE');
                 if (!empty($headerModifiedSince) && $lastModified <= strtotime($headerModifiedSince)) {
                     $this->logger->info('The cache page content is not yet expire for the '
-                                         . 'URL [' . $this->currentUrl . '] send 304 header to browser');
+                                            . 'URL [' . $this->currentUrl . '] send 304 header to browser');
                     $this->sendHeaders(304);
                     return true;
                 }
@@ -436,8 +436,8 @@ 
          */
         protected function sendCachePageContentToBrowser(&$cache) {
             $this->logger->info('The cache page content is expired or the browser does '
-                 . 'not send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->currentUrl . '] '
-                 . 'send cache headers to tell the browser');
+                    . 'not send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->currentUrl . '] '
+                    . 'send cache headers to tell the browser');
             $this->sendHeaders(200);
             //current page cache key
             $pageCacheKey = $this->currentUrlCacheKey;
@@ -576,18 +576,18 @@ 
             }
         }
 
-         /**
-         * Set the mandory headers, like security, etc.
-         */
+            /**
+             * Set the mandory headers, like security, etc.
+             */
         protected function setRequiredHeaders() {
             $requiredHeaders = array(
                                 'X-XSS-Protection' => '1; mode=block',
                                 'X-Frame-Options'  => 'SAMEORIGIN'
                             );
             foreach ($requiredHeaders as $key => $value) {
-               if (!isset($this->headers[$key])) {
+                if (!isset($this->headers[$key])) {
                     $this->headers[$key] = $value;
-               } 
+                } 
             }
         }
     }

core/classes/Loader.php

Indentation +3 added lines, -3 removed lines

@@ -220,7 +220,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');
@@ -339,7 +339,7 @@ 
         protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){
             $searchDir = null;
             if ($type == 'function') {
-               $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
+                $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
             }
             else if ($type == 'language') {
                 $searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
@@ -507,7 +507,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');

core/classes/Url.php

Indentation +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
                     break;
                 }
             }
-			$port = get_instance()->request->server('SERVER_PORT');
+            $port = get_instance()->request->server('SERVER_PORT');
             
             if ($port && !in_array($port, array(80, 443))) {
                 $domain .= ':' . $port;