@@ -180,13 +180,13 @@ discard block |
||
180 | 180 | $this->log(self::DEBUG, $message); |
181 | 181 | } |
182 | 182 | |
183 | - /** |
|
184 | - * Logs with an arbitrary level. |
|
185 | - * |
|
186 | - * @param integer|string $level the log level in integer or string format, |
|
187 | - * if is string will convert into integer. |
|
188 | - * @param string $message the log message to be saved |
|
189 | - */ |
|
183 | + /** |
|
184 | + * Logs with an arbitrary level. |
|
185 | + * |
|
186 | + * @param integer|string $level the log level in integer or string format, |
|
187 | + * if is string will convert into integer. |
|
188 | + * @param string $message the log message to be saved |
|
189 | + */ |
|
190 | 190 | public function log($level, $message) { |
191 | 191 | $configLogLevel = get_config('log_level'); |
192 | 192 | if (!$configLogLevel) { |
@@ -198,11 +198,11 @@ discard block |
||
198 | 198 | //NOTE: here need put the show_error() "logging" to false |
199 | 199 | //to prevent self function loop call |
200 | 200 | show_error('Invalid config log level [' . $configLogLevel . '], ' |
201 | - . 'the value must be one of the following: ' |
|
202 | - . implode(', ', array_map('strtoupper', self::$validConfigLevel)) |
|
203 | - , 'Log Config Error', |
|
204 | - $logging = false |
|
205 | - ); |
|
201 | + . 'the value must be one of the following: ' |
|
202 | + . implode(', ', array_map('strtoupper', self::$validConfigLevel)) |
|
203 | + , 'Log Config Error', |
|
204 | + $logging = false |
|
205 | + ); |
|
206 | 206 | return; |
207 | 207 | } |
208 | 208 | |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | protected function levelCanSaveLog($level) { |
272 | 272 | $result = true; |
273 | 273 | $configLogLevel = get_config('log_level'); |
274 | - //check if can save log regarding the log level configuration |
|
274 | + //check if can save log regarding the log level configuration |
|
275 | 275 | $configLevel = self::getLevelValue($configLogLevel); |
276 | 276 | if ($configLevel > $level) { |
277 | 277 | //can't log |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | //NOTE: here need put the show_error() "logging" to false |
352 | 352 | //to prevent self function loop call |
353 | 353 | show_error('Error : the log dir does not exist or is not writable', |
354 | - 'Log directory error', $logging = false); |
|
354 | + 'Log directory error', $logging = false); |
|
355 | 355 | } |
356 | 356 | return $logSavePath . 'logs-' . date('Y-m-d') . '.log'; |
357 | 357 | } |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function add($name) { |
60 | 60 | if (in_array($name, $this->list)) { |
61 | - $this->logger->warning('The module [' .$name. '] already added skipping.'); |
|
62 | - return $this; |
|
61 | + $this->logger->warning('The module [' .$name. '] already added skipping.'); |
|
62 | + return $this; |
|
63 | 63 | } |
64 | 64 | $this->list[] = $name; |
65 | 65 | return $this; |
@@ -91,10 +91,10 @@ discard block |
||
91 | 91 | $this->list = array(); |
92 | 92 | } |
93 | 93 | |
94 | - /** |
|
95 | - * Get the list of module loaded |
|
96 | - * @return array the module list |
|
97 | - */ |
|
94 | + /** |
|
95 | + * Get the list of module loaded |
|
96 | + * @return array the module list |
|
97 | + */ |
|
98 | 98 | public function getModuleList() { |
99 | 99 | return $this->list; |
100 | 100 | } |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | $this->logger->debug('Check if the application contains the modules ...'); |
242 | 242 | $dirList = glob(MODULE_PATH . '*', GLOB_ONLYDIR); |
243 | 243 | if ($dirList !== false) { |
244 | - $this->list = array_map('basename', $dirList); |
|
244 | + $this->list = array_map('basename', $dirList); |
|
245 | 245 | } |
246 | 246 | if (!empty($this->list)) { |
247 | 247 | $this->logger->info('The application contains the module below [' . implode(', ', $this->list) . ']'); |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | $filePath = MODULE_PATH . $module . DS . $type . DS . $classFile; |
265 | 265 | if (file_exists($filePath)) { |
266 | 266 | $this->logger->info('Found class [' . $class . '] in module [' . $module . '] ' |
267 | - . 'for [' . $type . '] the file path is [' . $filePath . ']'); |
|
267 | + . 'for [' . $type . '] the file path is [' . $filePath . ']'); |
|
268 | 268 | return $filePath; |
269 | 269 | } |
270 | 270 | $this->logger->info('Class [' . $class . '] does not exist in the module [' . $module . '] for [' . $type . ']'); |
@@ -42,28 +42,28 @@ discard block |
||
42 | 42 | */ |
43 | 43 | private $driver = null; |
44 | 44 | |
45 | - /** |
|
46 | - * The database hostname |
|
47 | - * @var string |
|
48 | - */ |
|
45 | + /** |
|
46 | + * The database hostname |
|
47 | + * @var string |
|
48 | + */ |
|
49 | 49 | private $hostname = null; |
50 | 50 | |
51 | - /** |
|
52 | - * The database port |
|
53 | - * @var integer |
|
54 | - */ |
|
51 | + /** |
|
52 | + * The database port |
|
53 | + * @var integer |
|
54 | + */ |
|
55 | 55 | private $port = null; |
56 | 56 | |
57 | - /** |
|
58 | - * The database username |
|
59 | - * @var string |
|
60 | - */ |
|
57 | + /** |
|
58 | + * The database username |
|
59 | + * @var string |
|
60 | + */ |
|
61 | 61 | private $username = null; |
62 | 62 | |
63 | - /** |
|
64 | - * The database password |
|
65 | - * @var string |
|
66 | - */ |
|
63 | + /** |
|
64 | + * The database password |
|
65 | + * @var string |
|
66 | + */ |
|
67 | 67 | private $password = null; |
68 | 68 | |
69 | 69 | /** |
@@ -72,10 +72,10 @@ discard block |
||
72 | 72 | */ |
73 | 73 | private $databaseName = null; |
74 | 74 | |
75 | - /** |
|
76 | - * The database charset |
|
77 | - * @var string |
|
78 | - */ |
|
75 | + /** |
|
76 | + * The database charset |
|
77 | + * @var string |
|
78 | + */ |
|
79 | 79 | private $charset = null; |
80 | 80 | |
81 | 81 | /** |
@@ -84,10 +84,10 @@ discard block |
||
84 | 84 | */ |
85 | 85 | private $collation = null; |
86 | 86 | |
87 | - /** |
|
88 | - * The database tables prefix |
|
89 | - * @var string |
|
90 | - */ |
|
87 | + /** |
|
88 | + * The database tables prefix |
|
89 | + * @var string |
|
90 | + */ |
|
91 | 91 | private $prefix = null; |
92 | 92 | |
93 | 93 | /** |
@@ -113,11 +113,11 @@ discard block |
||
113 | 113 | } |
114 | 114 | } |
115 | 115 | |
116 | - /** |
|
117 | - * This is method is used to connect to database |
|
118 | - * |
|
119 | - * @return boolean true in case of successfully connection false if error |
|
120 | - */ |
|
116 | + /** |
|
117 | + * This is method is used to connect to database |
|
118 | + * |
|
119 | + * @return boolean true in case of successfully connection false if error |
|
120 | + */ |
|
121 | 121 | public function connect() { |
122 | 122 | try { |
123 | 123 | if(empty($this->config) && file_exists(CONFIG_PATH . 'database.php')) { |
@@ -182,9 +182,9 @@ discard block |
||
182 | 182 | ); |
183 | 183 | if ($port) { |
184 | 184 | $driversPort = array( |
185 | - 'mysql' => 'port=' . $port . ';', |
|
186 | - 'pgsql' => 'port=' . $port . ';', |
|
187 | - 'oracle' => ':' . $port |
|
185 | + 'mysql' => 'port=' . $port . ';', |
|
186 | + 'pgsql' => 'port=' . $port . ';', |
|
187 | + 'oracle' => ':' . $port |
|
188 | 188 | ); |
189 | 189 | if (isset($driversPort[$driver])) { |
190 | 190 | $port = $driversPort[$driver]; |
@@ -422,7 +422,7 @@ discard block |
||
422 | 422 | $this->populatePropertiesFromConfig(); |
423 | 423 | |
424 | 424 | if (!empty($this->config)) { |
425 | - //For logging |
|
425 | + //For logging |
|
426 | 426 | $configInfo = $this->config; |
427 | 427 | //Hide password from log |
428 | 428 | $configInfo['password'] = string_hidden($this->getPassword()); |
@@ -431,11 +431,11 @@ discard block |
||
431 | 431 | return $this; |
432 | 432 | } |
433 | 433 | |
434 | - /** |
|
435 | - * Update the properties using the current database configuration |
|
436 | - * |
|
437 | - * @return object the current instance |
|
438 | - */ |
|
434 | + /** |
|
435 | + * Update the properties using the current database configuration |
|
436 | + * |
|
437 | + * @return object the current instance |
|
438 | + */ |
|
439 | 439 | protected function populatePropertiesFromConfig() { |
440 | 440 | foreach ($this->config as $key => $value) { |
441 | 441 | $setter = 'set' . ucfirst($key); |
@@ -225,15 +225,15 @@ |
||
225 | 225 | } |
226 | 226 | } |
227 | 227 | $navbar .= $this->config['next_open'] . '<a href="' . $query . ($currentPageNumber + 1) . '">' |
228 | - . $this->config['next_text'] . '</a>' . $this->config['next_close']; |
|
228 | + . $this->config['next_text'] . '</a>' . $this->config['next_close']; |
|
229 | 229 | return $navbar; |
230 | 230 | } |
231 | 231 | |
232 | 232 | |
233 | - /** |
|
234 | - * Build the pagination link for the first page |
|
235 | - * @see Pagination::buildPaginationLinkForFirstAndLastPage |
|
236 | - */ |
|
233 | + /** |
|
234 | + * Build the pagination link for the first page |
|
235 | + * @see Pagination::buildPaginationLinkForFirstAndLastPage |
|
236 | + */ |
|
237 | 237 | protected function buildPaginationLinkForFirstPage($begin, $end, $currentPageNumber) { |
238 | 238 | return $this->buildPaginationLinkForFirstAndLastPage($begin, $end, $currentPageNumber, 'first'); |
239 | 239 | } |
@@ -316,15 +316,15 @@ discard block |
||
316 | 316 | return $this; |
317 | 317 | } |
318 | 318 | |
319 | - /** |
|
320 | - * Append a mime type to allowed mime types |
|
321 | - * |
|
322 | - * @since 1.0 |
|
323 | - * @version 1.0.1 |
|
324 | - * @param string $mime |
|
325 | - * @return object |
|
326 | - * @method boolean setAllowMimeType |
|
327 | - */ |
|
319 | + /** |
|
320 | + * Append a mime type to allowed mime types |
|
321 | + * |
|
322 | + * @since 1.0 |
|
323 | + * @version 1.0.1 |
|
324 | + * @param string $mime |
|
325 | + * @return object |
|
326 | + * @method boolean setAllowMimeType |
|
327 | + */ |
|
328 | 328 | public function setAllowMimeType($mime) { |
329 | 329 | $this->allowedMimeTypes[] = strtolower($mime); |
330 | 330 | $this->file['allowed_mime_types'][] = strtolower($mime); |
@@ -438,10 +438,10 @@ discard block |
||
438 | 438 | return $this; |
439 | 439 | } |
440 | 440 | |
441 | - /** |
|
442 | - * Get the allow overwriting |
|
443 | - * @return boolean |
|
444 | - */ |
|
441 | + /** |
|
442 | + * Get the allow overwriting |
|
443 | + * @return boolean |
|
444 | + */ |
|
445 | 445 | public function isAllowOverwriting() { |
446 | 446 | return $this->overwriteFile ; |
447 | 447 | } |
@@ -532,14 +532,14 @@ discard block |
||
532 | 532 | return $this->error; |
533 | 533 | } |
534 | 534 | |
535 | - /** |
|
536 | - * Retrive status of upload |
|
537 | - * |
|
538 | - * @since 1.0 |
|
539 | - * @version 1.0 |
|
540 | - * @return boolean |
|
541 | - * @method boolean getStatus |
|
542 | - */ |
|
535 | + /** |
|
536 | + * Retrive status of upload |
|
537 | + * |
|
538 | + * @since 1.0 |
|
539 | + * @version 1.0 |
|
540 | + * @return boolean |
|
541 | + * @method boolean getStatus |
|
542 | + */ |
|
543 | 543 | public function getStatus() { |
544 | 544 | return $this->file['status']; |
545 | 545 | } |
@@ -572,11 +572,11 @@ discard block |
||
572 | 572 | && is_file($file); |
573 | 573 | } |
574 | 574 | |
575 | - /** |
|
576 | - * Set the filename if is empty using the uploaded data information |
|
577 | - * |
|
578 | - * @return object the current instance |
|
579 | - */ |
|
575 | + /** |
|
576 | + * Set the filename if is empty using the uploaded data information |
|
577 | + * |
|
578 | + * @return object the current instance |
|
579 | + */ |
|
580 | 580 | protected function setFilenameUsingUploadedData() { |
581 | 581 | // set original filename if not have a new name |
582 | 582 | if (empty($this->filename)) { |
@@ -660,12 +660,12 @@ discard block |
||
660 | 660 | return $this->maxFileSize >= $size; |
661 | 661 | } |
662 | 662 | |
663 | - /** |
|
664 | - * Check the file overwritting |
|
665 | - * @since 1.0 |
|
666 | - * @version 1.0 |
|
667 | - * @return boolean |
|
668 | - */ |
|
663 | + /** |
|
664 | + * Check the file overwritting |
|
665 | + * @since 1.0 |
|
666 | + * @version 1.0 |
|
667 | + * @return boolean |
|
668 | + */ |
|
669 | 669 | protected function checkFileOverwritting() { |
670 | 670 | if ($this->fileExists($this->destinationDirectory . $this->filename)) { |
671 | 671 | return $this->overwriteFile; |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | $addresses = array(); |
348 | 348 | foreach ($pairs as $name => $email) { |
349 | 349 | if (is_numeric($name)) { |
350 | - $name = null; |
|
350 | + $name = null; |
|
351 | 351 | } |
352 | 352 | $addresses[] = $this->formatHeader($email, $name); |
353 | 353 | } |
@@ -738,10 +738,10 @@ discard block |
||
738 | 738 | return $headers; |
739 | 739 | } |
740 | 740 | |
741 | - /** |
|
742 | - * Get the attachment message for send or the simple message |
|
743 | - * @return string |
|
744 | - */ |
|
741 | + /** |
|
742 | + * Get the attachment message for send or the simple message |
|
743 | + * @return string |
|
744 | + */ |
|
745 | 745 | protected function getMessageWithAttachmentForSend() { |
746 | 746 | $message = wordwrap($this->message, $this->wrap); |
747 | 747 | if ($this->hasAttachments()) { |
@@ -771,7 +771,7 @@ discard block |
||
771 | 771 | */ |
772 | 772 | protected function sendHelloCommand() { |
773 | 773 | $responseCode = $this->sendCommand('EHLO ' . $this->getSmtpClientHostname()) |
774 | - ->getSmtpResponseCode(); |
|
774 | + ->getSmtpResponseCode(); |
|
775 | 775 | if ($responseCode !== 250) { |
776 | 776 | $this->error = $this->smtpResponse; |
777 | 777 | return false; |
@@ -918,7 +918,7 @@ discard block |
||
918 | 918 | $message = $this->getMessageWithAttachmentForSend(); |
919 | 919 | $headers = $this->getHeadersForSend(); |
920 | 920 | $this->logger->info('Sending new mail using mail protocol, the information are listed below: ' |
921 | - . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message); |
|
921 | + . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message); |
|
922 | 922 | $result = mail($to, $this->subject, $message, $headers, $this->params); |
923 | 923 | if (!$result) { |
924 | 924 | $this->error = 'Error when sending mail using mail protocol'; |
@@ -926,10 +926,10 @@ discard block |
||
926 | 926 | return $result; |
927 | 927 | } |
928 | 928 | |
929 | - /** |
|
930 | - * Send mail using "smtp" protocol |
|
931 | - * @return boolean |
|
932 | - */ |
|
929 | + /** |
|
930 | + * Send mail using "smtp" protocol |
|
931 | + * @return boolean |
|
932 | + */ |
|
933 | 933 | protected function sendSmtp() { |
934 | 934 | if (!$this->smtpConnection()) { |
935 | 935 | return false; |
@@ -939,7 +939,7 @@ discard block |
||
939 | 939 | $message = $this->getMessageWithAttachmentForSend(); |
940 | 940 | $headers = $this->getHeadersForSend(); |
941 | 941 | $this->logger->info('Sending new mail using SMTP protocol, the information are listed below: ' |
942 | - . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message); |
|
942 | + . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message); |
|
943 | 943 | $recipients = array_merge($this->to, $this->cc, $this->bcc); |
944 | 944 | $commands = array( |
945 | 945 | 'mail_from' => array('MAIL FROM: <' . $this->from . '>', 'MAIL_FROM', 250), |
@@ -990,17 +990,17 @@ discard block |
||
990 | 990 | } |
991 | 991 | |
992 | 992 | |
993 | - /** |
|
994 | - * Return the client hostname for SMTP |
|
995 | - * |
|
996 | - * There are only two legal types of hostname - either a fully |
|
997 | - * qualified domain name (eg: "mail.example.com") or an IP literal |
|
998 | - * (eg: "[1.2.3.4]"). |
|
999 | - * |
|
1000 | - * @link https://tools.ietf.org/html/rfc5321#section-2.3.5 |
|
1001 | - * @link http://cbl.abuseat.org/namingproblems.html |
|
1002 | - * @return string |
|
1003 | - */ |
|
993 | + /** |
|
994 | + * Return the client hostname for SMTP |
|
995 | + * |
|
996 | + * There are only two legal types of hostname - either a fully |
|
997 | + * qualified domain name (eg: "mail.example.com") or an IP literal |
|
998 | + * (eg: "[1.2.3.4]"). |
|
999 | + * |
|
1000 | + * @link https://tools.ietf.org/html/rfc5321#section-2.3.5 |
|
1001 | + * @link http://cbl.abuseat.org/namingproblems.html |
|
1002 | + * @return string |
|
1003 | + */ |
|
1004 | 1004 | protected function getSmtpClientHostname() { |
1005 | 1005 | $globals = &class_loader('GlobalVar', 'classes'); |
1006 | 1006 | if ($globals->server('SERVER_NAME')) { |
@@ -104,11 +104,11 @@ |
||
104 | 104 | * @return object the current instance |
105 | 105 | */ |
106 | 106 | public function render() { |
107 | - $this->dompdf->loadHtml($this->html); |
|
108 | - $this->dompdf->setPaper($this->paper, $this->orientation); |
|
109 | - $this->dompdf->render(); |
|
110 | - $this->rendered = true; |
|
111 | - return $this; |
|
107 | + $this->dompdf->loadHtml($this->html); |
|
108 | + $this->dompdf->setPaper($this->paper, $this->orientation); |
|
109 | + $this->dompdf->render(); |
|
110 | + $this->rendered = true; |
|
111 | + return $this; |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | class Model { |
32 | 32 | |
33 | - /** |
|
33 | + /** |
|
34 | 34 | * This model's default database table. |
35 | 35 | * @var string the name of table |
36 | 36 | */ |
@@ -173,12 +173,12 @@ discard block |
||
173 | 173 | if ($db !== null) { |
174 | 174 | $this->setDb($db); |
175 | 175 | } else { |
176 | - /** |
|
177 | - * NOTE: Need use "clone" because some Model need have the personal instance of the database library |
|
178 | - * to prevent duplication |
|
179 | - */ |
|
180 | - $obj = & get_instance(); |
|
181 | - $this->setDb(clone $obj->database); |
|
176 | + /** |
|
177 | + * NOTE: Need use "clone" because some Model need have the personal instance of the database library |
|
178 | + * to prevent duplication |
|
179 | + */ |
|
180 | + $obj = & get_instance(); |
|
181 | + $this->setDb(clone $obj->database); |
|
182 | 182 | } |
183 | 183 | array_unshift($this->beforeCreateCallbacks, 'removeProtectedTableColumns'); |
184 | 184 | array_unshift($this->beforeUpdateCallbacks, 'removeProtectedTableColumns'); |
@@ -592,7 +592,7 @@ discard block |
||
592 | 592 | * Only get deleted rows on the next call |
593 | 593 | * |
594 | 594 | * @return object the current instance |
595 | - */ |
|
595 | + */ |
|
596 | 596 | public function onlyRecordDeleted() { |
597 | 597 | $this->returnOnlyRecordDeleted = true; |
598 | 598 | return $this; |
@@ -686,8 +686,8 @@ discard block |
||
686 | 686 | * @return array the data after add field for updated time |
687 | 687 | */ |
688 | 688 | protected function updatedAt($row) { |
689 | - $row['updated_at'] = date('Y-m-d H:i:s'); |
|
690 | - return $row; |
|
689 | + $row['updated_at'] = date('Y-m-d H:i:s'); |
|
690 | + return $row; |
|
691 | 691 | } |
692 | 692 | |
693 | 693 | /** |
@@ -732,7 +732,7 @@ discard block |
||
732 | 732 | */ |
733 | 733 | protected function removeProtectedTableColumns($row) { |
734 | 734 | foreach ($this->protectedTableColumns as $attr) { |
735 | - if (isset($row[$attr])) { |
|
735 | + if (isset($row[$attr])) { |
|
736 | 736 | unset($row[$attr]); |
737 | 737 | } |
738 | 738 | } |
@@ -787,23 +787,23 @@ discard block |
||
787 | 787 | return false; |
788 | 788 | } |
789 | 789 | |
790 | - /** |
|
791 | - * Get the record return type array or object |
|
792 | - * |
|
793 | - * @return string|boolean |
|
794 | - */ |
|
790 | + /** |
|
791 | + * Get the record return type array or object |
|
792 | + * |
|
793 | + * @return string|boolean |
|
794 | + */ |
|
795 | 795 | protected function getReturnType(){ |
796 | 796 | $type = false; |
797 | 797 | if ($this->temporaryReturnRecordType == 'array') { |
798 | - $type = 'array'; |
|
798 | + $type = 'array'; |
|
799 | 799 | } |
800 | 800 | return $type; |
801 | 801 | } |
802 | 802 | |
803 | - /** |
|
804 | - * Check if soft delete is enable setting the condition |
|
805 | - * @return object the current instance |
|
806 | - */ |
|
803 | + /** |
|
804 | + * Check if soft delete is enable setting the condition |
|
805 | + * @return object the current instance |
|
806 | + */ |
|
807 | 807 | protected function checkForSoftDelete(){ |
808 | 808 | if ($this->softDeleteStatus && $this->returnRecordWithDeleted !== true) { |
809 | 809 | $this->getQueryBuilder()->where( |
@@ -814,16 +814,16 @@ discard block |
||
814 | 814 | return $this; |
815 | 815 | } |
816 | 816 | |
817 | - /** |
|
818 | - * Relate for "manyToOne" and "oneToMany" |
|
819 | - * |
|
820 | - * @param string $relationship the name of relation |
|
821 | - * @param string|array $options the model and primary key values |
|
822 | - * @param object|array $row the row to update |
|
823 | - * @param string $type the type can be "manyToOne", "oneToMany" |
|
824 | - * |
|
825 | - * @return array|object the final row values |
|
826 | - */ |
|
817 | + /** |
|
818 | + * Relate for "manyToOne" and "oneToMany" |
|
819 | + * |
|
820 | + * @param string $relationship the name of relation |
|
821 | + * @param string|array $options the model and primary key values |
|
822 | + * @param object|array $row the row to update |
|
823 | + * @param string $type the type can be "manyToOne", "oneToMany" |
|
824 | + * |
|
825 | + * @return array|object the final row values |
|
826 | + */ |
|
827 | 827 | protected function relateOneToManyAndManyToOne($relationship, $options, $row, $type){ |
828 | 828 | if (in_array($relationship, $this->withs)) { |
829 | 829 | get_instance()->loader->model($options['model'], $relationship . '_model'); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | //record the class instance |
93 | 93 | $classes[$class] = isset($params) ? new $class($params) : new $class(); |
94 | - return $classes[$class]; |
|
94 | + return $classes[$class]; |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | /** |
@@ -179,17 +179,17 @@ discard block |
||
179 | 179 | die(); |
180 | 180 | } |
181 | 181 | |
182 | - /** |
|
183 | - * Function defined for PHP error message handling |
|
184 | - * |
|
185 | - * @param int $errno the type of error for example: E_USER_ERROR, E_USER_WARNING, etc. |
|
186 | - * @param string $errstr the error message |
|
187 | - * @param string $errfile the file where the error occurred |
|
188 | - * @param int $errline the line number where the error occurred |
|
189 | - * @codeCoverageIgnore |
|
190 | - * |
|
191 | - * @return boolean |
|
192 | - */ |
|
182 | + /** |
|
183 | + * Function defined for PHP error message handling |
|
184 | + * |
|
185 | + * @param int $errno the type of error for example: E_USER_ERROR, E_USER_WARNING, etc. |
|
186 | + * @param string $errstr the error message |
|
187 | + * @param string $errfile the file where the error occurred |
|
188 | + * @param int $errline the line number where the error occurred |
|
189 | + * @codeCoverageIgnore |
|
190 | + * |
|
191 | + * @return boolean |
|
192 | + */ |
|
193 | 193 | function fw_error_handler($errno, $errstr, $errfile, $errline) { |
194 | 194 | $isError = (((E_ERROR | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR) & $errno) === $errno); |
195 | 195 | if ($isError) { |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | E_RECOVERABLE_ERROR => 'Catchable Fatal Error' |
213 | 213 | ); |
214 | 214 | if (isset($errorsType[$errno])) { |
215 | - $errorType = $errorsType[$errno]; |
|
215 | + $errorType = $errorsType[$errno]; |
|
216 | 216 | } |
217 | 217 | $errorText = 'An error is occurred in the file ' . substr($errfile, strlen(ROOT_PATH)) . ' at line ' . $errline . ' raison : ' . $errstr; |
218 | 218 | if ((error_reporting() & $errno) !== $errno) { |