@@ -680,22 +680,22 @@ discard block |
||
| 680 | 680 | return $data; |
| 681 | 681 | } |
| 682 | 682 | |
| 683 | - /** |
|
| 684 | - * Get the return type array or object |
|
| 685 | - * @return string|boolean |
|
| 686 | - */ |
|
| 683 | + /** |
|
| 684 | + * Get the return type array or object |
|
| 685 | + * @return string|boolean |
|
| 686 | + */ |
|
| 687 | 687 | protected function getReturnType(){ |
| 688 | 688 | $type = false; |
| 689 | 689 | if ($this->_temporary_return_type == 'array') { |
| 690 | - $type = 'array'; |
|
| 690 | + $type = 'array'; |
|
| 691 | 691 | } |
| 692 | 692 | return $type; |
| 693 | 693 | } |
| 694 | 694 | |
| 695 | - /** |
|
| 696 | - * Check if soft delete is enable setting the condition |
|
| 697 | - * @return object the current instance |
|
| 698 | - */ |
|
| 695 | + /** |
|
| 696 | + * Check if soft delete is enable setting the condition |
|
| 697 | + * @return object the current instance |
|
| 698 | + */ |
|
| 699 | 699 | protected function checkForSoftDelete(){ |
| 700 | 700 | if ($this->soft_delete && $this->_temporary_with_deleted !== true) { |
| 701 | 701 | $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted); |
@@ -703,14 +703,14 @@ discard block |
||
| 703 | 703 | return $this; |
| 704 | 704 | } |
| 705 | 705 | |
| 706 | - /** |
|
| 707 | - * Relate for "belongs_to" and "has_many" |
|
| 708 | - * @param string $relationship the name of relation |
|
| 709 | - * @param string|array $options the model and primary key values |
|
| 710 | - * @param object|array $row the row to update |
|
| 711 | - * @param string $type the type can be "belongs_to", "has_many" |
|
| 712 | - * @return mixed the final row values |
|
| 713 | - */ |
|
| 706 | + /** |
|
| 707 | + * Relate for "belongs_to" and "has_many" |
|
| 708 | + * @param string $relationship the name of relation |
|
| 709 | + * @param string|array $options the model and primary key values |
|
| 710 | + * @param object|array $row the row to update |
|
| 711 | + * @param string $type the type can be "belongs_to", "has_many" |
|
| 712 | + * @return mixed the final row values |
|
| 713 | + */ |
|
| 714 | 714 | protected function relateBelongsToAndHasMany($relationship, $options, $row, $type){ |
| 715 | 715 | if (in_array($relationship, $this->_with)) { |
| 716 | 716 | get_instance()->loader->model($options['model'], $relationship . '_model'); |
@@ -30,10 +30,10 @@ |
||
| 30 | 30 | |
| 31 | 31 | class DatabaseQueryRunner extends BaseClass { |
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * The DatabaseConnection instance |
|
| 35 | - * @var object |
|
| 36 | - */ |
|
| 33 | + /** |
|
| 34 | + * The DatabaseConnection instance |
|
| 35 | + * @var object |
|
| 36 | + */ |
|
| 37 | 37 | private $connection = null; |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | * |
| 94 | 94 | * @codeCoverageIgnore |
| 95 | 95 | */ |
| 96 | - protected function startAppSession() { |
|
| 96 | + protected function startAppSession() { |
|
| 97 | 97 | //$_SESSION is not available on cli mode |
| 98 | 98 | if (!IS_CLI) { |
| 99 | 99 | //set session params |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | * @codeCoverageIgnore |
| 144 | 144 | */ |
| 145 | 145 | protected function setAppSessionConfig() { |
| 146 | - //the default is to store in the files |
|
| 146 | + //the default is to store in the files |
|
| 147 | 147 | $sessionHandler = $this->config->get('session_handler', 'files'); |
| 148 | 148 | $this->logger->info('Session handler: ' . $sessionHandler); |
| 149 | 149 | if ($sessionHandler == 'files') { |
@@ -98,10 +98,10 @@ |
||
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /** |
| 101 | - * This method is used to check the whitelist IP address access |
|
| 102 | - * |
|
| 103 | - * @return boolean |
|
| 104 | - */ |
|
| 101 | + * This method is used to check the whitelist IP address access |
|
| 102 | + * |
|
| 103 | + * @return boolean |
|
| 104 | + */ |
|
| 105 | 105 | public function checkWhiteListIpAccess() { |
| 106 | 106 | $this->logger->debug('Validation of the IP address access ...'); |
| 107 | 107 | $this->logger->debug('Check if whitelist IP access is enabled in the configuration ...'); |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | } else { |
| 188 | 188 | $this->logger->info('Cannot find view [' . $view . '] in module [' . $module . '] using the default location'); |
| 189 | 189 | } |
| 190 | - if (!$path) { |
|
| 190 | + if (!$path) { |
|
| 191 | 191 | $path = $this->getDefaultFilePathForView($viewFile); |
| 192 | 192 | } |
| 193 | 193 | $this->logger->info('The view file path to be loaded is [' . $path . ']'); |
@@ -290,12 +290,12 @@ discard block |
||
| 290 | 290 | return $this->_pageRender; |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | - /** |
|
| 294 | - * Set the final page to be rendered |
|
| 295 | - * @param string $finalPage the content of the final page |
|
| 296 | - * |
|
| 297 | - * @return object |
|
| 298 | - */ |
|
| 293 | + /** |
|
| 294 | + * Set the final page to be rendered |
|
| 295 | + * @param string $finalPage the content of the final page |
|
| 296 | + * |
|
| 297 | + * @return object |
|
| 298 | + */ |
|
| 299 | 299 | public function setFinalPageContent($finalPage) { |
| 300 | 300 | $this->_pageRender = $finalPage; |
| 301 | 301 | return $this; |
@@ -363,12 +363,12 @@ discard block |
||
| 363 | 363 | ob_end_flush(); |
| 364 | 364 | } |
| 365 | 365 | |
| 366 | - /** |
|
| 367 | - * Return the default full file path for view |
|
| 368 | - * @param string $file the filename |
|
| 369 | - * |
|
| 370 | - * @return string|null the full file path |
|
| 371 | - */ |
|
| 366 | + /** |
|
| 367 | + * Return the default full file path for view |
|
| 368 | + * @param string $file the filename |
|
| 369 | + * |
|
| 370 | + * @return string|null the full file path |
|
| 371 | + */ |
|
| 372 | 372 | protected function getDefaultFilePathForView($file){ |
| 373 | 373 | $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH); |
| 374 | 374 | $fullFilePath = null; |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | $headerModifiedSince = $globals->server('HTTP_IF_MODIFIED_SINCE'); |
| 402 | 402 | if (!empty($headerModifiedSince) && $lastModified <= strtotime($headerModifiedSince)) { |
| 403 | 403 | $this->logger->info('The cache page content is not yet expire for the ' |
| 404 | - . 'URL [' . $this->_currentUrl . '] send 304 header to browser'); |
|
| 404 | + . 'URL [' . $this->_currentUrl . '] send 304 header to browser'); |
|
| 405 | 405 | $this->sendHeaders(304); |
| 406 | 406 | return true; |
| 407 | 407 | } |
@@ -416,8 +416,8 @@ discard block |
||
| 416 | 416 | */ |
| 417 | 417 | protected function sendCachePageContentToBrowser(&$cache) { |
| 418 | 418 | $this->logger->info('The cache page content is expired or the browser does ' |
| 419 | - . 'not send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->_currentUrl . '] ' |
|
| 420 | - . 'send cache headers to tell the browser'); |
|
| 419 | + . 'not send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->_currentUrl . '] ' |
|
| 420 | + . 'send cache headers to tell the browser'); |
|
| 421 | 421 | |
| 422 | 422 | $this->sendHeaders(200); |
| 423 | 423 | //current page cache key |
@@ -559,18 +559,18 @@ discard block |
||
| 559 | 559 | } |
| 560 | 560 | } |
| 561 | 561 | |
| 562 | - /** |
|
| 563 | - * Set the mandory headers, like security, etc. |
|
| 564 | - */ |
|
| 562 | + /** |
|
| 563 | + * Set the mandory headers, like security, etc. |
|
| 564 | + */ |
|
| 565 | 565 | protected function setRequiredHeaders() { |
| 566 | 566 | $requiredHeaders = array( |
| 567 | 567 | 'X-XSS-Protection' => '1; mode=block', |
| 568 | 568 | 'X-Frame-Options' => 'SAMEORIGIN' |
| 569 | 569 | ); |
| 570 | 570 | foreach ($requiredHeaders as $key => $value) { |
| 571 | - if (!isset($this->headers[$key])) { |
|
| 571 | + if (!isset($this->headers[$key])) { |
|
| 572 | 572 | $this->headers[$key] = $value; |
| 573 | - } |
|
| 573 | + } |
|
| 574 | 574 | } |
| 575 | 575 | } |
| 576 | 576 | } |