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

Spacing +5 added lines, -5 removed lines

@@ -823,7 +823,7 @@ 
          * 
          * @return string|boolean
          */
-        protected function getReturnType(){
+        protected function getReturnType() {
             $type = false;
             if ($this->temporaryReturnRecordType == 'array') {
                $type = 'array';
@@ -835,7 +835,7 @@ 
          * Check if soft delete is enable setting the condition
          * @return object the current instance 
          */
-        protected function checkForSoftDelete(){
+        protected function checkForSoftDelete() {
             if ($this->softDeleteStatus && $this->returnRecordWithDeleted !== true) {
                 $this->getQueryBuilder()->where(
                                                 $this->softDeleteTableColumn, 
@@ -855,11 +855,11 @@ 
          * 
          * @return array|object the final row values
          */
-        protected function relateOneToManyAndManyToOne($relationship, $options, $row, $type){
+        protected function relateOneToManyAndManyToOne($relationship, $options, $row, $type) {
             if (in_array($relationship, $this->withs)) {
                 get_instance()->loader->model($options['model'], $relationship . '_model');
                 $model = get_instance()->{$relationship . '_model'};
-                if($type == 'manyToOne'){
+                if ($type == 'manyToOne') {
                     if (is_object($row)) {
                         $row->{$relationship} = $model->getSingleRecord($row->{$options['primary_key']});
                     } else {
@@ -969,7 +969,7 @@ 
                 } else {
                     if (is_int($field)) {
                         //Condition like xxxx->getListRecordCond(array('id'));
-                        $this->getQueryBuilder()->where($value);  // WHERE id = ''
+                        $this->getQueryBuilder()->where($value); // WHERE id = ''
                     } else {
                         //Condition like xxxx->getListRecordCond(array('status' => 0));
                         $this->getQueryBuilder()->where($field, $value); // WHERE status = 0

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');
@@ -592,7 +592,7 @@ 
          * Only get deleted rows on the next call
          * 
          * @return object the current instance
-        */
+         */
         public function onlyRecordDeleted() {
             $this->returnOnlyRecordDeleted = true;
             return $this;
@@ -686,8 +686,8 @@ 
          * @return array the data after add field for updated time
          */
         protected 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;
         }
 
         /**
@@ -732,7 +732,7 @@ 
          */
         protected function removeProtectedTableColumns($row) {
             foreach ($this->protectedTableColumns as $attr) {
-               if (isset($row[$attr])) {
+                if (isset($row[$attr])) {
                     unset($row[$attr]);
                 }
             }
@@ -787,23 +787,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(
@@ -814,16 +814,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/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

Spacing +4 added lines, -4 removed lines

@@ -249,7 +249,7 @@ 
             $cacheInfo = $cache->getInfo($pageCacheKey);
             if ($cacheInfo) {
                 $status = $this->sendCacheNotYetExpireInfoToBrowser($cacheInfo);
-                if($status === false) {
+                if ($status === false) {
                     return $this->sendCachePageContentToBrowser($cache);
                 }
                 return true;
@@ -323,7 +323,7 @@ 
          */
         public function sendError(array $data = array()) {
             $path = CORE_VIEWS_PATH . 'errors.php';
-            if(file_exists($path)){
+            if (file_exists($path)) {
                 //compress the output if is available
                 $compressOutputHandler = $this->getCompressOutputHandler();
                 ob_start($compressOutputHandler);
@@ -335,7 +335,7 @@ 
                 echo $content;
             }
             //@codeCoverageIgnoreStart
-            else{
+            else {
                 //can't use show_error() at this time because 
                 //some dependencies not yet loaded
                 set_http_status_header(503);
@@ -389,7 +389,7 @@ 
          * 
          * @return string|null          the full file path
          */
-        protected function getDefaultFilePathForView($file){
+        protected function getDefaultFilePathForView($file) {
             $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH);
             $fullFilePath = null;
             foreach ($searchDir as $dir) {

Indentation +27 added lines, -27 removed lines

@@ -210,7 +210,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 . ']');
@@ -286,12 +286,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;
@@ -366,12 +366,12 @@ 
             //@codeCoverageIgnoreEnd
         }
 
-         /**
-         * 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(
@@ -415,12 +415,12 @@ 
                                           && (bool) ini_get('zlib.output_compression') === false;
         }
 
-         /**
-         * 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;
@@ -453,7 +453,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->setStatus(304);
                     $this->sendHeaders();
                     return true;
@@ -469,8 +469,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();
             //current page cache key
             $pageCacheKey = $this->currentUrlCacheKey;
@@ -609,18 +609,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;
-               } 
+                } 
             }
         }
     }

app/config/config.php

Indentation +34 added lines, -34 removed lines

@@ -134,26 +134,26 @@ 
 	*/
 	
     /** 
-    * The log level
-    *
-    * The valid log level are: OFF, NONE, DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY
-    *
-    * 'OFF' or 'NONE' = do not save log
-    * 'EMERGENCY' = enable log for emergency level and above (EMERGENCY)
-    * 'ALERT' = enable log for alert level and above (ALERT, EMERGENCY)
-    * 'CRITICAL' = enable log for critical level and above (CRITICAL, ALERT, EMERGENCY)
-    * 'ERROR' = enable log for error level and above (ERROR, CRITICAL, ALERT, EMERGENCY)
-    * 'WARNING' = enable log for warning level and above (WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
-    * 'NOTICE' = enable log for notice level and above (NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
-    * 'INFO' = enable log for info level and above (INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
-    * 'DEBUG' = enable log for debug level and above (DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
-    *
-    * The default value is NONE if the config value is: null, '', 0, false
-    * 
-    * Note: in production environment it's recommand to set the log level to 'WARNING' or 'ERROR' if not, in small
-    * time the log file size will increase very fast and will cost the application performance
-    * and also the filesystem usage of your server.
-    */
+     * The log level
+     *
+     * The valid log level are: OFF, NONE, DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY
+     *
+     * 'OFF' or 'NONE' = do not save log
+     * 'EMERGENCY' = enable log for emergency level and above (EMERGENCY)
+     * 'ALERT' = enable log for alert level and above (ALERT, EMERGENCY)
+     * 'CRITICAL' = enable log for critical level and above (CRITICAL, ALERT, EMERGENCY)
+     * 'ERROR' = enable log for error level and above (ERROR, CRITICAL, ALERT, EMERGENCY)
+     * 'WARNING' = enable log for warning level and above (WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
+     * 'NOTICE' = enable log for notice level and above (NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
+     * 'INFO' = enable log for info level and above (INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
+     * 'DEBUG' = enable log for debug level and above (DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
+     *
+     * The default value is NONE if the config value is: null, '', 0, false
+     * 
+     * Note: in production environment it's recommand to set the log level to 'WARNING' or 'ERROR' if not, in small
+     * time the log file size will increase very fast and will cost the application performance
+     * and also the filesystem usage of your server.
+     */
     $config['log_level'] = 'NONE';
 
 
@@ -180,20 +180,20 @@ 
     $config['log_logger_name'] = array();
 
     /**
-    * The logger name custom level to use for the log
-    * 
-    * If this config is set so means the logger level will be used to overwrite 
-    * the default log level configuration above. 
-    *
-    * Example:
-    * $config['log_logger_name_level'] = array('MY_LOGGER1' => 'WARNING'); 
-    * So if $config['log_level'] = 'ERROR' but all log messages with "MY_LOGGER1" as logger name
-    *  will be saved for WARNING message and above
-    *  Note: You can also use an regular expression for the logger name.
-    *  Example:
-    *  $config['log_logger_name_level'] = array('^Class::Con(.*)' => 'info');
-    *  So all logger name like "Class::Config", "Class::Cookie", etc. will be match
-    */  
+     * The logger name custom level to use for the log
+     * 
+     * If this config is set so means the logger level will be used to overwrite 
+     * the default log level configuration above. 
+     *
+     * Example:
+     * $config['log_logger_name_level'] = array('MY_LOGGER1' => 'WARNING'); 
+     * So if $config['log_level'] = 'ERROR' but all log messages with "MY_LOGGER1" as logger name
+     *  will be saved for WARNING message and above
+     *  Note: You can also use an regular expression for the logger name.
+     *  Example:
+     *  $config['log_logger_name_level'] = array('^Class::Con(.*)' => 'info');
+     *  So all logger name like "Class::Config", "Class::Cookie", etc. will be match
+     */  
     $config['log_logger_name_level'] = array();
 	
 	

core/common.php

Spacing +2 added lines, -2 removed lines

@@ -147,7 +147,7 @@ 
         static $cfg;
         if (empty($cfg)) {
             $cfg[0] = & load_configurations();
-            if(! is_array($cfg[0])){
+            if (!is_array($cfg[0])) {
                 $cfg[0] = array();
             }
         }
@@ -197,7 +197,7 @@ 
             set_http_status_header(500);
         }
         $errorType = 'Error';
-        $errorsType = array (
+        $errorsType = array(
                 E_ERROR              => 'Error',
                 E_WARNING            => 'Warning',
                 E_PARSE              => 'Parsing Error',

Indentation +13 added lines, -13 removed lines

@@ -91,7 +91,7 @@ 
 		
         //record the class instance
         $classes[$class] = isset($params) ? new $class($params) : new $class();
-		return $classes[$class];
+        return $classes[$class];
     }
 
     /**
@@ -179,17 +179,17 @@ 
         die();
     }
 
-     /**
-     *  Function defined for PHP error message handling
-     *              
-     *  @param int $errno the type of error for example: E_USER_ERROR, E_USER_WARNING, etc.
-     *  @param string $errstr the error message
-     *  @param string $errfile the file where the error occurred
-     *  @param int $errline the line number where the error occurred
-     *  @codeCoverageIgnore
-     *  
-     *  @return boolean 
-     */
+        /**
+         *  Function defined for PHP error message handling
+         *              
+         *  @param int $errno the type of error for example: E_USER_ERROR, E_USER_WARNING, etc.
+         *  @param string $errstr the error message
+         *  @param string $errfile the file where the error occurred
+         *  @param int $errline the line number where the error occurred
+         *  @codeCoverageIgnore
+         *  
+         *  @return boolean 
+         */
     function fw_error_handler($errno, $errstr, $errfile, $errline) {
         $isError = (((E_ERROR | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR) & $errno) === $errno);
         if ($isError) {
@@ -212,7 +212,7 @@ 
                 E_RECOVERABLE_ERROR  => 'Catchable Fatal Error'
         );
         if (isset($errorsType[$errno])) {
-           $errorType = $errorsType[$errno];
+            $errorType = $errorsType[$errno];
         }
         $errorText = 'An error is occurred in the file ' . substr($errfile, strlen(ROOT_PATH)) . ' at line ' . $errline . ' raison : ' . $errstr;
         if ((error_reporting() & $errno) !== $errno) {

core/classes/cache/ApcCache.php

Indentation +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
         /**
          * Construct new ApcCache instance
          */
-	public function __construct() {
+    public function __construct() {
             parent::__construct();
             if (!$this->isSupported()) {
                 show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
@@ -79,7 +79,7 @@ 
         public function set($key, $data, $ttl = 0) {
             $expire = time() + $ttl;
             $this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], '
-                                 . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+                                    . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']');
             $result = apc_store($key, $data, $ttl);
             if ($result === false) {
                 $this->logger->error('Can not save cache data for the key [' . $key . '], return false');
@@ -127,7 +127,7 @@ 
                             'mtime'  => $cacheInfos['creation_time'],
                             'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
                             'ttl'    => $cacheInfos['ttl']
-                           );
+                            );
             } 
             $this->logger->info('This cache does not exists skipping');
             return false;

core/classes/cache/FileCache.php

Indentation +7 added lines, -7 removed lines

@@ -108,13 +108,13 @@ 
         public function set($key, $data, $ttl = 0) {
             $expire = time() + $ttl;
             $this->logger->debug('Setting cache data for key [' . $key . '], '
-                           . 'time to live [' . $ttl . '], '
-                           . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+                            . 'time to live [' . $ttl . '], '
+                            . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']');
             $filePath = $this->getFilePath($key);
             $handle = fopen($filePath, 'w');
             if (!is_resource($handle)) {
                 $this->logger->error('Can not open the file cache '
-                                     . '[' . $filePath . '] for the key [' . $key . '], return false');
+                                        . '[' . $filePath . '] for the key [' . $key . '], return false');
                 return false;
             }
             flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed
@@ -191,10 +191,10 @@ 
             if ($data['expire'] > time()) {
                 $this->logger->info('This cache not yet expired return cache informations');
                 return array(
-                           'mtime' => $data['mtime'],
-                           'expire' => $data['expire'],
-                           'ttl' => $data['ttl']
-                         );
+                            'mtime' => $data['mtime'],
+                            'expire' => $data['expire'],
+                            'ttl' => $data['ttl']
+                            );
             }
             $this->logger->info('This cache already expired return false');
             return false;

core/libraries/Assets.php

Indentation +4 added lines, -4 removed lines

@@ -44,9 +44,9 @@ 
      */
     class Assets extends BaseClass {
 
-         /**
-         * Construct new instance
-         */
+            /**
+             * Construct new instance
+             */
         public function __construct() {
             parent::__construct();
         }
@@ -95,7 +95,7 @@ 
          * @see Assets:link
          */
         public function css($path) {
-           return $this->link($path, 'css');
+            return $this->link($path, 'css');
         }
 
         /**