@@ -163,17 +163,17 @@ |
||
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | /** |
| 166 | - * Return the server port using variable |
|
| 167 | - * |
|
| 168 | - * @codeCoverageIgnore |
|
| 169 | - * @return string |
|
| 170 | - */ |
|
| 166 | + * Return the server port using variable |
|
| 167 | + * |
|
| 168 | + * @codeCoverageIgnore |
|
| 169 | + * @return string |
|
| 170 | + */ |
|
| 171 | 171 | protected function getServerPort() { |
| 172 | 172 | $globals = & class_loader('GlobalVar', 'classes'); |
| 173 | 173 | $serverPortValue = $globals->server('SERVER_PORT'); |
| 174 | 174 | $serverPort = 80; |
| 175 | 175 | if ($serverPortValue) { |
| 176 | - $serverPort = $serverPortValue; |
|
| 176 | + $serverPort = $serverPortValue; |
|
| 177 | 177 | } |
| 178 | 178 | $port = ''; |
| 179 | 179 | if ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80)) { |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | $this->logger->debug('Check if the application contains the modules ...'); |
| 47 | 47 | $dirList = glob(MODULE_PATH . '*', GLOB_ONLYDIR); |
| 48 | 48 | if ($dirList !== false) { |
| 49 | - $this->list = array_map('basename', $dirList); |
|
| 49 | + $this->list = array_map('basename', $dirList); |
|
| 50 | 50 | } |
| 51 | 51 | if (!empty($this->list)) { |
| 52 | 52 | $this->logger->info('The application contains the module below [' . implode(', ', $this->list) . ']'); |
@@ -61,8 +61,8 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | public function add($name) { |
| 63 | 63 | if (in_array($name, $this->list)) { |
| 64 | - $this->logger->info('The module [' .$name. '] already added skipping.'); |
|
| 65 | - return $this; |
|
| 64 | + $this->logger->info('The module [' .$name. '] already added skipping.'); |
|
| 65 | + return $this; |
|
| 66 | 66 | } |
| 67 | 67 | $this->list[] = $name; |
| 68 | 68 | return $this; |
@@ -93,10 +93,10 @@ discard block |
||
| 93 | 93 | $this->list = array(); |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - /** |
|
| 97 | - * Get the list of module loaded |
|
| 98 | - * @return array the module list |
|
| 99 | - */ |
|
| 96 | + /** |
|
| 97 | + * Get the list of module loaded |
|
| 98 | + * @return array the module list |
|
| 99 | + */ |
|
| 100 | 100 | public function getModuleList() { |
| 101 | 101 | return $this->list; |
| 102 | 102 | } |
@@ -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') { |