@@ -46,9 +46,9 @@ discard block |
||
| 46 | 46 | if ($init) { |
| 47 | 47 | $this->init(); |
| 48 | 48 | //@codeCoverageIgnoreStart |
| 49 | - if (ENVIRONMENT == 'production' && in_array(strtolower($this->config['log_level']), array('debug', 'info', 'all'))) { |
|
| 49 | + if (ENVIRONMENT == 'production' && in_array(strtolower($this->config['log_level']), array('debug', 'info', 'all'))) { |
|
| 50 | 50 | $this->logger->warning('You are in production environment, please set ' |
| 51 | - . 'log level to WARNING, ERROR, FATAL to increase the application performance'); |
|
| 51 | + . 'log level to WARNING, ERROR, FATAL to increase the application performance'); |
|
| 52 | 52 | } |
| 53 | 53 | //@codeCoverageIgnoreEnd |
| 54 | 54 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | if (empty($this->config['base_url'])) { |
| 147 | 147 | if (ENVIRONMENT == 'production') { |
| 148 | 148 | $this->logger->warning('Application base URL is not set or invalid, please' |
| 149 | - . ' set application base URL to increase the application loading time'); |
|
| 149 | + . ' set application base URL to increase the application loading time'); |
|
| 150 | 150 | } |
| 151 | 151 | $baseUrl = null; |
| 152 | 152 | $protocol = 'http'; |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | ); |
| 174 | 174 | } else { |
| 175 | 175 | $this->logger->warning('Can not determine the application ' |
| 176 | - . 'base URL automatically, use http://localhost as default'); |
|
| 176 | + . 'base URL automatically, use http://localhost as default'); |
|
| 177 | 177 | $baseUrl = 'http://localhost/'; |
| 178 | 178 | } |
| 179 | 179 | $this->config['base_url'] = $baseUrl; |
@@ -182,11 +182,11 @@ discard block |
||
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | /** |
| 185 | - * Return the server port using variable |
|
| 186 | - * |
|
| 187 | - * @codeCoverageIgnore |
|
| 188 | - * @return string |
|
| 189 | - */ |
|
| 185 | + * Return the server port using variable |
|
| 186 | + * |
|
| 187 | + * @codeCoverageIgnore |
|
| 188 | + * @return string |
|
| 189 | + */ |
|
| 190 | 190 | protected function getServerPort() { |
| 191 | 191 | $globals = & class_loader('GlobalVar', 'classes'); |
| 192 | 192 | $serverPort = $globals->server('SERVER_PORT'); |
@@ -133,11 +133,11 @@ discard block |
||
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - /** |
|
| 137 | - * Reset the form validation instance |
|
| 138 | - * |
|
| 139 | - * @return object the current instance |
|
| 140 | - */ |
|
| 136 | + /** |
|
| 137 | + * Reset the form validation instance |
|
| 138 | + * |
|
| 139 | + * @return object the current instance |
|
| 140 | + */ |
|
| 141 | 141 | public function reset() { |
| 142 | 142 | $this->rules = array(); |
| 143 | 143 | $this->labels = array(); |
@@ -161,11 +161,11 @@ discard block |
||
| 161 | 161 | return $this; |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - /** |
|
| 165 | - * Return the validation data |
|
| 166 | - * |
|
| 167 | - * @return array the validation data |
|
| 168 | - */ |
|
| 164 | + /** |
|
| 165 | + * Return the validation data |
|
| 166 | + * |
|
| 167 | + * @return array the validation data |
|
| 168 | + */ |
|
| 169 | 169 | public function getData() { |
| 170 | 170 | return $this->data; |
| 171 | 171 | } |
@@ -214,11 +214,11 @@ discard block |
||
| 214 | 214 | return $this->rules; |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | - /** |
|
| 218 | - * Return the list of the validations rules for the given field |
|
| 219 | - * |
|
| 220 | - * @return array |
|
| 221 | - */ |
|
| 217 | + /** |
|
| 218 | + * Return the list of the validations rules for the given field |
|
| 219 | + * |
|
| 220 | + * @return array |
|
| 221 | + */ |
|
| 222 | 222 | public function getFieldRules($field) { |
| 223 | 223 | $rules = array(); |
| 224 | 224 | if (array_key_exists($field, $this->rules)) { |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | * @return string|null |
| 235 | 235 | */ |
| 236 | 236 | public function getFieldValue($field) { |
| 237 | - $value = null; |
|
| 237 | + $value = null; |
|
| 238 | 238 | if (array_key_exists($field, $this->data)) { |
| 239 | 239 | $value = $this->data[$field]; |
| 240 | 240 | } |
@@ -256,15 +256,15 @@ discard block |
||
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | |
| 259 | - /** |
|
| 260 | - * Return the list of validation errors |
|
| 261 | - * |
|
| 262 | - * @return array the errors list. |
|
| 263 | - * Format: |
|
| 264 | - * [field1] => 'error message 1', |
|
| 265 | - * [field2] => 'error message 2' |
|
| 266 | - */ |
|
| 267 | - public function getErrors() { |
|
| 259 | + /** |
|
| 260 | + * Return the list of validation errors |
|
| 261 | + * |
|
| 262 | + * @return array the errors list. |
|
| 263 | + * Format: |
|
| 264 | + * [field1] => 'error message 1', |
|
| 265 | + * [field2] => 'error message 2' |
|
| 266 | + */ |
|
| 267 | + public function getErrors() { |
|
| 268 | 268 | return $this->errors; |
| 269 | 269 | } |
| 270 | 270 | |
@@ -347,11 +347,11 @@ discard block |
||
| 347 | 347 | return $this; |
| 348 | 348 | } |
| 349 | 349 | |
| 350 | - /** |
|
| 351 | - * Set the database instance using get_instance() if is null |
|
| 352 | - * |
|
| 353 | - * @return object the current instance |
|
| 354 | - */ |
|
| 350 | + /** |
|
| 351 | + * Set the database instance using get_instance() if is null |
|
| 352 | + * |
|
| 353 | + * @return object the current instance |
|
| 354 | + */ |
|
| 355 | 355 | protected function setDatabaseFromSuperInstanceIfNotSet() { |
| 356 | 356 | if (!is_object($this->database)) { |
| 357 | 357 | $this->database = get_instance()->database; |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | * @param string|null $field2 the second field used in some validation rule like "matches", "not_equal" |
| 389 | 389 | * |
| 390 | 390 | */ |
| 391 | - protected function setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue = null, $field2 = null) { |
|
| 391 | + protected function setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue = null, $field2 = null) { |
|
| 392 | 392 | //if the field is not required and his value is not set don't set error |
| 393 | 393 | //but in case the field have value validate it |
| 394 | 394 | if (!$this->fieldIsRequired($field) && strlen($value) <= 0) { |
@@ -414,9 +414,9 @@ discard block |
||
| 414 | 414 | * @return string the name of the validation method |
| 415 | 415 | */ |
| 416 | 416 | protected function getRuleValidationMethod($rule) { |
| 417 | - $parts = explode('_', $rule); |
|
| 418 | - $parts = array_map('ucfirst', $parts); |
|
| 419 | - return 'checkRule' . implode('', $parts); |
|
| 417 | + $parts = explode('_', $rule); |
|
| 418 | + $parts = array_map('ucfirst', $parts); |
|
| 419 | + return 'checkRule' . implode('', $parts); |
|
| 420 | 420 | } |
| 421 | 421 | |
| 422 | 422 | /** |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | protected function filterValidationData() { |
| 428 | 428 | foreach ($this->data as $key => $value ) { |
| 429 | 429 | if (is_string($value)) { |
| 430 | - $this->data[$key] = trim($value); |
|
| 430 | + $this->data[$key] = trim($value); |
|
| 431 | 431 | } else if(is_array($value)) { |
| 432 | 432 | $this->data[$key] = array_map('trim', $value); |
| 433 | 433 | } |
@@ -474,7 +474,7 @@ discard block |
||
| 474 | 474 | $template['field2}'] = $field2; |
| 475 | 475 | $template['{value2}'] = $this->getFieldValue($field2); |
| 476 | 476 | $template['{label2}'] = $this->getFieldLabel($field2); |
| 477 | - } |
|
| 477 | + } |
|
| 478 | 478 | $message = $this->messages[$rule]; |
| 479 | 479 | //Check for custom message |
| 480 | 480 | if (isset($this->customErrors[$field][$rule])) { |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | //Get the name of the method to validate this rule |
| 506 | 506 | $method = $this->getRuleValidationMethod($realRuleName); |
| 507 | 507 | if (method_exists($this, $method)) { |
| 508 | - call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue)); |
|
| 508 | + call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue)); |
|
| 509 | 509 | } else { |
| 510 | 510 | $this->forceError = true; |
| 511 | 511 | show_error('Invalid validaton rule "' . $realRuleName . '"'); |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | * @param string|null $paramValue the rule parameter |
| 598 | 598 | */ |
| 599 | 599 | protected function checkRuleMinLength($field, $rule, $paramValue) { |
| 600 | - $value = $this->getFieldValue($field); |
|
| 600 | + $value = $this->getFieldValue($field); |
|
| 601 | 601 | if (strlen($value) < $paramValue) { |
| 602 | 602 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
| 603 | 603 | } |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | * @param string|null $paramValue the rule parameter |
| 612 | 612 | */ |
| 613 | 613 | protected function checkRuleMaxLength($field, $rule, $paramValue) { |
| 614 | - $value = $this->getFieldValue($field); |
|
| 614 | + $value = $this->getFieldValue($field); |
|
| 615 | 615 | if (strlen($value) > $paramValue) { |
| 616 | 616 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
| 617 | 617 | } |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | * @param string|null $paramValue the rule parameter |
| 626 | 626 | */ |
| 627 | 627 | protected function checkRuleExactLength($field, $rule, $paramValue) { |
| 628 | - $value = $this->getFieldValue($field); |
|
| 628 | + $value = $this->getFieldValue($field); |
|
| 629 | 629 | if (strlen($value) != $paramValue) { |
| 630 | 630 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
| 631 | 631 | } |
@@ -732,7 +732,7 @@ discard block |
||
| 732 | 732 | protected function checkRuleNumeric($field, $rule, $paramValue) { |
| 733 | 733 | $value = $this->getFieldValue($field); |
| 734 | 734 | if (!is_numeric($value)) { |
| 735 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 735 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 736 | 736 | } |
| 737 | 737 | } |
| 738 | 738 | |
@@ -746,7 +746,7 @@ discard block |
||
| 746 | 746 | protected function checkRuleInteger($field, $rule, $paramValue) { |
| 747 | 747 | $value = $this->getFieldValue($field); |
| 748 | 748 | if (filter_var($value, FILTER_VALIDATE_INT) === false) { |
| 749 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 749 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 750 | 750 | } |
| 751 | 751 | } |
| 752 | 752 | |
@@ -760,7 +760,7 @@ discard block |
||
| 760 | 760 | protected function checkRuleIntegerNatural($field, $rule, $paramValue) { |
| 761 | 761 | $value = $this->getFieldValue($field); |
| 762 | 762 | if (filter_var($value, FILTER_VALIDATE_INT) === false || $value < 0) { |
| 763 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 763 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 764 | 764 | } |
| 765 | 765 | } |
| 766 | 766 | |
@@ -847,7 +847,7 @@ discard block |
||
| 847 | 847 | $format = $paramValue; |
| 848 | 848 | $dateValue = date_create_from_format($format, $value); |
| 849 | 849 | if ($dateValue === false || $dateValue->format($format) !== $value) { |
| 850 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 850 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 851 | 851 | } |
| 852 | 852 | } |
| 853 | 853 | |
@@ -891,7 +891,7 @@ discard block |
||
| 891 | 891 | protected function checkRuleUrl($field, $rule, $paramValue) { |
| 892 | 892 | $value = $this->getFieldValue($field); |
| 893 | 893 | if (filter_var($value, FILTER_VALIDATE_URL) === false) { |
| 894 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 894 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 895 | 895 | } |
| 896 | 896 | } |
| 897 | 897 | |
@@ -906,7 +906,7 @@ discard block |
||
| 906 | 906 | protected function checkRuleIp($field, $rule, $paramValue) { |
| 907 | 907 | $value = $this->getFieldValue($field); |
| 908 | 908 | if (filter_var($value, FILTER_VALIDATE_IP) === false) { |
| 909 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 909 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 910 | 910 | } |
| 911 | 911 | } |
| 912 | 912 | |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | $value = $this->getFieldValue($field); |
| 952 | 952 | list($table, $column) = explode('.', $paramValue); |
| 953 | 953 | $this->database->getQueryBuilder()->from($table) |
| 954 | - ->where($column, $value); |
|
| 954 | + ->where($column, $value); |
|
| 955 | 955 | $this->database->get(); |
| 956 | 956 | if ($this->database->numRows() > 0) { |
| 957 | 957 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
@@ -973,8 +973,8 @@ discard block |
||
| 973 | 973 | list($table, $column) = explode('.', $data[0]); |
| 974 | 974 | list($columnKey, $valueKey) = explode('=', $data[1]); |
| 975 | 975 | $this->database->getQueryBuilder()->from($table) |
| 976 | - ->where($column, $value) |
|
| 977 | - ->where($columnKey, '!=', trim($valueKey)); |
|
| 976 | + ->where($column, $value) |
|
| 977 | + ->where($columnKey, '!=', trim($valueKey)); |
|
| 978 | 978 | $this->database->get(); |
| 979 | 979 | if ($this->database->numRows() > 0) { |
| 980 | 980 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
@@ -994,7 +994,7 @@ discard block |
||
| 994 | 994 | $value = $this->getFieldValue($field); |
| 995 | 995 | list($table, $column) = explode('.', $paramValue); |
| 996 | 996 | $this->database->getQueryBuilder()->from($table) |
| 997 | - ->where($column, $value); |
|
| 997 | + ->where($column, $value); |
|
| 998 | 998 | $this->database->get(); |
| 999 | 999 | if ($this->database->numRows() <= 0) { |
| 1000 | 1000 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
@@ -425,10 +425,10 @@ discard block |
||
| 425 | 425 | * @return object the current instance |
| 426 | 426 | */ |
| 427 | 427 | protected function filterValidationData() { |
| 428 | - foreach ($this->data as $key => $value ) { |
|
| 428 | + foreach ($this->data as $key => $value) { |
|
| 429 | 429 | if (is_string($value)) { |
| 430 | 430 | $this->data[$key] = trim($value); |
| 431 | - } else if(is_array($value)) { |
|
| 431 | + } else if (is_array($value)) { |
|
| 432 | 432 | $this->data[$key] = array_map('trim', $value); |
| 433 | 433 | } |
| 434 | 434 | } |
@@ -1037,7 +1037,7 @@ discard block |
||
| 1037 | 1037 | if (call_user_func_array($paramValue, array($value)) === false) { |
| 1038 | 1038 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
| 1039 | 1039 | } |
| 1040 | - } else{ |
|
| 1040 | + } else { |
|
| 1041 | 1041 | $this->forceError = true; |
| 1042 | 1042 | show_error('The callback validation function/method "' . $paramValue . '" does not exist'); |
| 1043 | 1043 | } |
@@ -108,13 +108,13 @@ |
||
| 108 | 108 | public function set($key, $data, $ttl = 0) { |
| 109 | 109 | $expire = time() + $ttl; |
| 110 | 110 | $this->logger->debug('Setting cache data for key [' . $key . '], ' |
| 111 | - . 'time to live [' . $ttl . '], ' |
|
| 112 | - . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']'); |
|
| 111 | + . 'time to live [' . $ttl . '], ' |
|
| 112 | + . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']'); |
|
| 113 | 113 | $filePath = $this->getFilePath($key); |
| 114 | 114 | $handle = fopen($filePath, 'w'); |
| 115 | 115 | if (!is_resource($handle)) { |
| 116 | 116 | $this->logger->error('Can not open the file cache ' |
| 117 | - . '[' . $filePath . '] for the key [' . $key . '], return false'); |
|
| 117 | + . '[' . $filePath . '] for the key [' . $key . '], return false'); |
|
| 118 | 118 | return false; |
| 119 | 119 | } |
| 120 | 120 | flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed |