tnhfw / tnh-fw

core/bootstrap.php

Indentation +27 added lines, -27 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

core/classes/model/DBSessionHandlerModel.php

Indentation +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
      */
 	
     /**
-    * DB session handler model class
-    */
+     * DB session handler model class
+     */
     abstract class DBSessionHandlerModel extends Model {
 		
         /**

core/classes/database/DatabaseQueryRunner.php

Indentation +5 added lines, -5 removed lines

@@ -30,10 +30,10 @@ 
     
     class DatabaseQueryRunner extends BaseClass {
 
-         /**
-         * The DatabaseConnection instance
-         * @var object
-         */
+            /**
+             * The DatabaseConnection instance
+             * @var object
+             */
         private $connection = null;
 
         /**
@@ -186,7 +186,7 @@ 
                 //by default count() return 1 if the parameter is not an array
                 //object or object implements Countable.
                 if (is_array($result) || is_object($result) || $result instanceof Countable) {
-                     $numRows = count($result);  
+                        $numRows = count($result);  
                 }
             } else {
                 $numRows = $this->pdoStatment->rowCount(); 

core/classes/database/Database.php

Indentation +8 added lines, -9 removed lines

@@ -387,9 +387,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();
@@ -405,11 +405,11 @@ 
             return $this->result;
         }
 
-         /**
-         * Set the connection instance using database configuration file
-         *
-         * @return object|void
-         */
+            /**
+             * Set the connection instance using database configuration file
+             *
+             * @return object|void
+             */
         protected function setConnectionUsingConfigFile(){
             $dbConfigFromFile = $this->getDatabaseConfigFromFile();
             $connection = &class_loader('DatabaseConnection', 'classes/database');
@@ -422,7 +422,6 @@ 
 
         /**
          * Get the database configuration using the configuration file
-         
          * @return array the database configuration from file
          */
         protected function getDatabaseConfigFromFile() {

Spacing +1 added lines, -1 removed lines

@@ -410,7 +410,7 @@
          *
          * @return object|void
          */
-        protected function setConnectionUsingConfigFile(){
+        protected function setConnectionUsingConfigFile() {
             $dbConfigFromFile = $this->getDatabaseConfigFromFile();
             $connection = &class_loader('DatabaseConnection', 'classes/database');
             $connection->setConfig($dbConfigFromFile);

core/classes/database/DatabaseConnection.php

Indentation +35 added lines, -35 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 {
                 $this->pdo = new PDO($this->getDsnValue(), $this->getUsername(), $this->getPassword());
@@ -409,7 +409,7 @@ 
             $this->populatePropertiesFromConfig();
 
             if (!empty($this->config)) {
-               //For logging
+                //For logging
                 $configInfo = $this->config;
                 //Hide password from log
                 $configInfo['password'] = string_hidden($this->getPassword());
@@ -418,11 +418,11 @@ 
             return $this;
         }
 
-         /**
-         * 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/DatabaseQueryBuilder.php

Indentation +6 added lines, -6 removed lines

@@ -30,10 +30,10 @@ 
     
     class DatabaseQueryBuilder {
 
-         /**
-         * The DatabaseConnection instance
-         * @var object
-         */
+            /**
+             * The DatabaseConnection instance
+             * @var object
+             */
         private $connection = null;
 
         /**
@@ -727,12 +727,12 @@ 
          * 
          * @return string|null
          */
-         protected function buildQueryPart($property, $command = ''){
+            protected function buildQueryPart($property, $command = ''){
             if (!empty($this->{$property})) {
                 return $command . $this->{$property};
             }
             return null;
-         }
+            }
 
 
         /**

Spacing +6 added lines, -6 removed lines

@@ -414,7 +414,7 @@ 
             $_keys = array();
             foreach ($keys as $k => $v) {
                 $v = $this->checkForNullValue($v);
-                if (! is_numeric($v)) {
+                if (!is_numeric($v)) {
                     $v = $this->connection->escape($v, $escape);
                 }
                 $_keys[] = $v;
@@ -727,7 +727,7 @@ 
          * 
          * @return string|null
          */
-         protected function buildQueryPart($property, $command = ''){
+         protected function buildQueryPart($property, $command = '') {
             if (!empty($this->{$property})) {
                 return $command . $this->{$property};
             }
@@ -742,7 +742,7 @@ 
          * @param string $clause the clause type "IS NULL", "IS NOT NULLs"
          * @return object        the current DatabaseQueryBuilder instance
          */
-        protected function whereIsNullAndNotNull($field, $andOr = 'AND', $clause = 'IS NULL'){
+        protected function whereIsNullAndNotNull($field, $andOr = 'AND', $clause = 'IS NULL') {
             if (is_array($field)) {
                 foreach ($field as $f) {
                     $this->whereIsNullAndNotNull($f, $andOr, $clause);
@@ -760,7 +760,7 @@ 
          *
          * @return object the current instance
          */
-        protected function setSelectStr($newSelect){
+        protected function setSelectStr($newSelect) {
             $this->select = (($this->select == '*' || empty($this->select)) 
                                     ? $newSelect 
                                     : $this->select . ', ' . $newSelect);
@@ -774,8 +774,8 @@ 
          * @return string        the empty string if the value is null
          * otherwise the same value will be returned
          */
-        protected function checkForNullValue($value){
-            if(is_null($value)){
+        protected function checkForNullValue($value) {
+            if (is_null($value)) {
                 return '';
             }
             return $value;

core/classes/database/DatabaseCache.php

Indentation +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
             //If is the SELECT query
             $this->isSelectQuery = stristr($this->query, 'SELECT') !== false;
 
-             //if can use cache feature for this query
+                //if can use cache feature for this query
             $this->dbCacheStatus = get_config('cache_enable', false) && $this->cacheTtl > 0;
         }
         

Spacing +2 added lines, -2 removed lines

@@ -158,7 +158,7 @@ 
         public function getCacheContent() {
             //set some attributes values
             $this->setPropertiesValues();
-            if(! $this->isSelectQuery || ! $this->dbCacheStatus){
+            if (!$this->isSelectQuery || !$this->dbCacheStatus) {
                 $this->logger->info('The cache is not enabled for this query or is not a SELECT query'); 
                 return null;
             }
@@ -185,7 +185,7 @@ 
         public function saveCacheContent($result) {
             //set some attributes values
             $this->setPropertiesValues();
-            if(! $this->isSelectQuery || ! $this->dbCacheStatus){
+            if (!$this->isSelectQuery || !$this->dbCacheStatus) {
                 //just return true
                 return true;
             }