@@ -74,6 +74,9 @@ discard block |
||
74 | 74 | return $this->enabled; |
75 | 75 | } |
76 | 76 | |
77 | + /** |
|
78 | + * @param boolean $name |
|
79 | + */ |
|
77 | 80 | public function newProfileID($name) |
78 | 81 | { |
79 | 82 | if ($name) { |
@@ -128,6 +131,9 @@ discard block |
||
128 | 131 | return; |
129 | 132 | } |
130 | 133 | |
134 | + /** |
|
135 | + * @param boolean $profileID |
|
136 | + */ |
|
131 | 137 | protected function endPreckeck($profileID) |
132 | 138 | { |
133 | 139 | if (!$this->checkEnabled()) { |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function setEnabled($enabled = false) |
43 | 43 | { |
44 | - $this->enabled = (boolean)$enabled; |
|
44 | + $this->enabled = (boolean) $enabled; |
|
45 | 45 | return $this; |
46 | 46 | } |
47 | 47 | |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | if (null === $minimumSeconds) { |
216 | 216 | $this->filterElapsedSecs = null; |
217 | 217 | } else { |
218 | - $this->filterElapsedSecs = (integer)$minimumSeconds; |
|
218 | + $this->filterElapsedSecs = (integer) $minimumSeconds; |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | return $this; |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | /** |
126 | - * @return null |
|
126 | + * @return string |
|
127 | 127 | */ |
128 | 128 | public function getManagerName() |
129 | 129 | { |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | |
158 | 158 | /** |
159 | 159 | * @param string $class |
160 | - * @return mixed |
|
160 | + * @return RecordManager |
|
161 | 161 | * @throws Exception |
162 | 162 | */ |
163 | 163 | protected function getManagerInstance($class) |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | } |
182 | 182 | |
183 | 183 | /** |
184 | - * @param $name |
|
184 | + * @param string $name |
|
185 | 185 | * @return \Nip\Helpers\AbstractHelper |
186 | 186 | */ |
187 | 187 | public function getHelper($name) |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | } |
228 | 228 | |
229 | 229 | /** |
230 | - * @return mixed |
|
230 | + * @return string |
|
231 | 231 | */ |
232 | 232 | public function getPrimaryKey() |
233 | 233 | { |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | } |
197 | 197 | |
198 | 198 | /** |
199 | - * @param $name |
|
199 | + * @param string $name |
|
200 | 200 | * @param $arguments |
201 | 201 | * @return RecordCollection|null |
202 | 202 | */ |
@@ -358,7 +358,7 @@ discard block |
||
358 | 358 | } |
359 | 359 | |
360 | 360 | /** |
361 | - * @param null $table |
|
361 | + * @param null|string $table |
|
362 | 362 | */ |
363 | 363 | public function setTable($table) |
364 | 364 | { |
@@ -562,7 +562,7 @@ discard block |
||
562 | 562 | } |
563 | 563 | |
564 | 564 | /** |
565 | - * @param $query |
|
565 | + * @param Query $query |
|
566 | 566 | * @param array $params |
567 | 567 | * @return RecordCollection |
568 | 568 | */ |
@@ -669,7 +669,7 @@ discard block |
||
669 | 669 | } |
670 | 670 | |
671 | 671 | /** |
672 | - * @param null $class |
|
672 | + * @param string $class |
|
673 | 673 | * @return string |
674 | 674 | */ |
675 | 675 | public function generateModelClass($class = null) |
@@ -693,7 +693,7 @@ discard block |
||
693 | 693 | } |
694 | 694 | |
695 | 695 | /** |
696 | - * @param $name |
|
696 | + * @param string $name |
|
697 | 697 | * @param $arguments |
698 | 698 | * @return bool |
699 | 699 | */ |
@@ -711,10 +711,10 @@ discard block |
||
711 | 711 | } |
712 | 712 | |
713 | 713 | /** |
714 | - * @param $action |
|
714 | + * @param string $action |
|
715 | 715 | * @param array $params |
716 | 716 | * @param null $module |
717 | - * @return mixed |
|
717 | + * @return string|null |
|
718 | 718 | */ |
719 | 719 | public function compileURL($action, $params = [], $module = null) |
720 | 720 | { |
@@ -750,8 +750,8 @@ discard block |
||
750 | 750 | } |
751 | 751 | |
752 | 752 | /** |
753 | - * @param $name |
|
754 | - * @return mixed |
|
753 | + * @param string $name |
|
754 | + * @return \Nip\Helpers\AbstractHelper |
|
755 | 755 | */ |
756 | 756 | public function getHelper($name) |
757 | 757 | { |
@@ -853,7 +853,7 @@ discard block |
||
853 | 853 | |
854 | 854 | /** |
855 | 855 | * @param $query |
856 | - * @return mixed |
|
856 | + * @return SelectQuery |
|
857 | 857 | * @internal param array $filters |
858 | 858 | */ |
859 | 859 | public function filter($query) |
@@ -957,7 +957,7 @@ discard block |
||
957 | 957 | * Finds Records using params array |
958 | 958 | * |
959 | 959 | * @param array $params |
960 | - * @return mixed |
|
960 | + * @return RecordCollection |
|
961 | 961 | */ |
962 | 962 | public function findByParams($params = []) |
963 | 963 | { |
@@ -988,7 +988,7 @@ discard block |
||
988 | 988 | |
989 | 989 | /** |
990 | 990 | * @param int $count |
991 | - * @return mixed |
|
991 | + * @return RecordCollection |
|
992 | 992 | */ |
993 | 993 | public function findLast($count = 9) |
994 | 994 | { |
@@ -1001,7 +1001,7 @@ discard block |
||
1001 | 1001 | * Inserts a Record into the database |
1002 | 1002 | * @param Record $model |
1003 | 1003 | * @param array|bool $onDuplicate |
1004 | - * @return mixed |
|
1004 | + * @return integer |
|
1005 | 1005 | */ |
1006 | 1006 | public function insert($model, $onDuplicate = false) |
1007 | 1007 | { |
@@ -1012,7 +1012,7 @@ discard block |
||
1012 | 1012 | } |
1013 | 1013 | |
1014 | 1014 | /** |
1015 | - * @param $model |
|
1015 | + * @param Record $model |
|
1016 | 1016 | * @param $onDuplicate |
1017 | 1017 | * @return InsertQuery |
1018 | 1018 | */ |
@@ -1164,7 +1164,7 @@ discard block |
||
1164 | 1164 | /** |
1165 | 1165 | * Delete a Record's database entry |
1166 | 1166 | * |
1167 | - * @param mixed|Record $input |
|
1167 | + * @param Record $input |
|
1168 | 1168 | */ |
1169 | 1169 | public function delete($input) |
1170 | 1170 | { |
@@ -1230,7 +1230,7 @@ discard block |
||
1230 | 1230 | * Returns paginated results |
1231 | 1231 | * @param Paginator $paginator |
1232 | 1232 | * @param array $params |
1233 | - * @return mixed |
|
1233 | + * @return RecordCollection |
|
1234 | 1234 | */ |
1235 | 1235 | public function paginate(Paginator $paginator, $params = []) |
1236 | 1236 | { |
@@ -1363,7 +1363,7 @@ discard block |
||
1363 | 1363 | } |
1364 | 1364 | |
1365 | 1365 | /** |
1366 | - * @param null $foreignKey |
|
1366 | + * @param string $foreignKey |
|
1367 | 1367 | */ |
1368 | 1368 | public function setForeignKey($foreignKey) |
1369 | 1369 | { |
@@ -1474,7 +1474,7 @@ discard block |
||
1474 | 1474 | } |
1475 | 1475 | |
1476 | 1476 | /** |
1477 | - * @param $type |
|
1477 | + * @param string $type |
|
1478 | 1478 | * @param $array |
1479 | 1479 | */ |
1480 | 1480 | public function initRelationsFromArray($type, $array) |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | */ |
102 | 102 | public function getModelNamespace() |
103 | 103 | { |
104 | - return $this->getRootNamespace().$this->getModelNamespacePath(); |
|
104 | + return $this->getRootNamespace() . $this->getModelNamespacePath(); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
@@ -127,10 +127,10 @@ discard block |
||
127 | 127 | public function initModelNamespacePath() |
128 | 128 | { |
129 | 129 | if ($this->isNamespaced()) { |
130 | - $path = $this->generateModelNamespacePathFromClassName().'\\'; |
|
130 | + $path = $this->generateModelNamespacePathFromClassName() . '\\'; |
|
131 | 131 | } else { |
132 | 132 | $controller = $this->generateControllerGeneric(); |
133 | - $path = inflector()->classify($controller).'\\'; |
|
133 | + $path = inflector()->classify($controller) . '\\'; |
|
134 | 134 | } |
135 | 135 | $this->modelNamespacePath = $path; |
136 | 136 | } |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | public function checkDB() |
334 | 334 | { |
335 | 335 | if (!$this->hasDB()) { |
336 | - trigger_error("Database connection missing for [".get_class($this)."]", E_USER_ERROR); |
|
336 | + trigger_error("Database connection missing for [" . get_class($this) . "]", E_USER_ERROR); |
|
337 | 337 | } |
338 | 338 | } |
339 | 339 | |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | public function newQuery($type = 'select') |
545 | 545 | { |
546 | 546 | $query = $this->getDB()->newQuery($type); |
547 | - $query->cols("`".$this->getTable()."`.*"); |
|
547 | + $query->cols("`" . $this->getTable() . "`.*"); |
|
548 | 548 | $query->from($this->getFullNameTable()); |
549 | 549 | $query->table($this->getTable()); |
550 | 550 | |
@@ -558,7 +558,7 @@ discard block |
||
558 | 558 | { |
559 | 559 | $database = $this->getDB()->getDatabase(); |
560 | 560 | |
561 | - return $database ? $database.'.'.$this->getTable() : $this->getTable(); |
|
561 | + return $database ? $database . '.' . $this->getTable() : $this->getTable(); |
|
562 | 562 | } |
563 | 563 | |
564 | 564 | /** |
@@ -686,7 +686,7 @@ discard block |
||
686 | 686 | $class = ucfirst(inflector()->singularize($class)); |
687 | 687 | } |
688 | 688 | |
689 | - return implode($nsParts, '\\').'\\'.$class; |
|
689 | + return implode($nsParts, '\\') . '\\' . $class; |
|
690 | 690 | } |
691 | 691 | |
692 | 692 | return ucfirst(inflector()->singularize($class)); |
@@ -893,7 +893,7 @@ discard block |
||
893 | 893 | } |
894 | 894 | |
895 | 895 | foreach ($fields as $field) { |
896 | - $params['where'][$field.'-UNQ'] = ["$field = ?", $item->{$field}]; |
|
896 | + $params['where'][$field . '-UNQ'] = ["$field = ?", $item->{$field}]; |
|
897 | 897 | } |
898 | 898 | |
899 | 899 | $pk = $this->getPrimaryKey(); |
@@ -1205,7 +1205,7 @@ discard block |
||
1205 | 1205 | if (isset($where)) { |
1206 | 1206 | if (is_array($where)) { |
1207 | 1207 | foreach ($where as $condition) { |
1208 | - $condition = (array)$condition; |
|
1208 | + $condition = (array) $condition; |
|
1209 | 1209 | $query->where($condition[0], $condition[1]); |
1210 | 1210 | } |
1211 | 1211 | } else { |
@@ -1329,7 +1329,7 @@ discard block |
||
1329 | 1329 | if ($result->numRows()) { |
1330 | 1330 | $row = $result->fetchResult(); |
1331 | 1331 | |
1332 | - return (int)$row['count']; |
|
1332 | + return (int) $row['count']; |
|
1333 | 1333 | } |
1334 | 1334 | |
1335 | 1335 | return false; |
@@ -1377,7 +1377,7 @@ discard block |
||
1377 | 1377 | { |
1378 | 1378 | $singularize = inflector()->singularize($this->getController()); |
1379 | 1379 | |
1380 | - return $this->getPrimaryKey()."_".inflector()->underscore($singularize); |
|
1380 | + return $this->getPrimaryKey() . "_" . inflector()->underscore($singularize); |
|
1381 | 1381 | } |
1382 | 1382 | |
1383 | 1383 | /** |
@@ -1519,7 +1519,7 @@ discard block |
||
1519 | 1519 | */ |
1520 | 1520 | public function getRelationClass($type) |
1521 | 1521 | { |
1522 | - $class = 'Nip\Records\Relations\\'.ucfirst($type); |
|
1522 | + $class = 'Nip\Records\Relations\\' . ucfirst($type); |
|
1523 | 1523 | |
1524 | 1524 | return $class; |
1525 | 1525 | } |
@@ -1589,7 +1589,7 @@ discard block |
||
1589 | 1589 | /** @var \Nip\Records\Relations\HasMany $relation */ |
1590 | 1590 | if ($relation->getType() != 'belongsTo') { |
1591 | 1591 | /** @var Record[] $associatedOld */ |
1592 | - $associatedOld = $from->{'get'.$name}(); |
|
1592 | + $associatedOld = $from->{'get' . $name}(); |
|
1593 | 1593 | if (count($associatedOld)) { |
1594 | 1594 | $associatedNew = $to->getRelation($name)->newCollection(); |
1595 | 1595 | foreach ($associatedOld as $associated) { |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
72 | - * @param null $value |
|
72 | + * @param string|false $value |
|
73 | 73 | */ |
74 | 74 | public function setValue($value) |
75 | 75 | { |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | } |
84 | 84 | |
85 | 85 | /** |
86 | - * @return bool|string |
|
86 | + * @return string|false |
|
87 | 87 | */ |
88 | 88 | public function getProcessedRequestValue() |
89 | 89 | { |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
99 | - * @return bool|string |
|
99 | + * @return string|false |
|
100 | 100 | */ |
101 | 101 | public function getValueFromRequest() |
102 | 102 | { |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | } |
139 | 139 | |
140 | 140 | /** |
141 | - * @return null |
|
141 | + * @return null|string |
|
142 | 142 | */ |
143 | 143 | public function getName() |
144 | 144 | { |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | } |
163 | 163 | |
164 | 164 | /** |
165 | - * @param $value |
|
165 | + * @param string|false $value |
|
166 | 166 | * @return bool |
167 | 167 | */ |
168 | 168 | public function isValidRequestValue($value) |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | } |
172 | 172 | |
173 | 173 | /** |
174 | - * @param $value |
|
174 | + * @param string|false $value |
|
175 | 175 | * @return string |
176 | 176 | */ |
177 | 177 | public function cleanRequestValue($value) |
@@ -91,7 +91,7 @@ |
||
91 | 91 | |
92 | 92 | /** |
93 | 93 | * @param RecordCollection $collection |
94 | - * @param $items |
|
94 | + * @param Collection $items |
|
95 | 95 | */ |
96 | 96 | public function populateCollection(RecordCollection $collection, $items) |
97 | 97 | { |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | } |
146 | 146 | |
147 | 147 | /** |
148 | - * @return mixed |
|
148 | + * @return string |
|
149 | 149 | */ |
150 | 150 | public function getWithClass() |
151 | 151 | { |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | } |
162 | 162 | |
163 | 163 | /** |
164 | - * @param mixed $name |
|
164 | + * @param string $name |
|
165 | 165 | */ |
166 | 166 | public function setName($name) |
167 | 167 | { |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | } |
254 | 254 | |
255 | 255 | /** |
256 | - * @param $key |
|
256 | + * @param string $key |
|
257 | 257 | * @return mixed |
258 | 258 | */ |
259 | 259 | public function getParam($key) |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | |
264 | 264 | /** |
265 | 265 | * @param $key |
266 | - * @return mixed |
|
266 | + * @return boolean |
|
267 | 267 | */ |
268 | 268 | public function hasParam($key) |
269 | 269 | { |
@@ -512,8 +512,8 @@ discard block |
||
512 | 512 | |
513 | 513 | /** |
514 | 514 | * @param $dictionary |
515 | - * @param $collection |
|
516 | - * @param $record |
|
515 | + * @param Collection $collection |
|
516 | + * @param Record $record |
|
517 | 517 | * @return mixed |
518 | 518 | */ |
519 | 519 | abstract public function getResultsFromCollectionDictionary($dictionary, $collection, $record); |
@@ -57,7 +57,7 @@ |
||
57 | 57 | /** |
58 | 58 | * Singleton |
59 | 59 | * |
60 | - * @param null $newInstance |
|
60 | + * @param Request $newInstance |
|
61 | 61 | * @return static |
62 | 62 | */ |
63 | 63 | public static function instance($newInstance = null) |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | */ |
119 | 119 | public function setActionKey($key) |
120 | 120 | { |
121 | - $this->actionKey = (string)$key; |
|
121 | + $this->actionKey = (string) $key; |
|
122 | 122 | |
123 | 123 | return $this; |
124 | 124 | } |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | */ |
171 | 171 | public function setModuleKey($key) |
172 | 172 | { |
173 | - $this->moduleKey = (string)$key; |
|
173 | + $this->moduleKey = (string) $key; |
|
174 | 174 | |
175 | 175 | return $this; |
176 | 176 | } |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | */ |
212 | 212 | public function setControllerKey($key) |
213 | 213 | { |
214 | - $this->controllerKey = (string)$key; |
|
214 | + $this->controllerKey = (string) $key; |
|
215 | 215 | |
216 | 216 | return $this; |
217 | 217 | } |
@@ -443,7 +443,7 @@ discard block |
||
443 | 443 | */ |
444 | 444 | protected function prepareRequestUri() |
445 | 445 | { |
446 | - if ((int)$this->server->get('REDIRECT_STATUS', '200') >= 400 && $this->server->has('REDIRECT_URL')) { |
|
446 | + if ((int) $this->server->get('REDIRECT_STATUS', '200') >= 400 && $this->server->has('REDIRECT_URL')) { |
|
447 | 447 | $requestUri = $this->server->get('REDIRECT_URL'); |
448 | 448 | $schemeAndHttpHost = $this->getSchemeAndHttpHost(); |
449 | 449 | if (strpos($requestUri, $schemeAndHttpHost) === 0) { |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | |
94 | 94 | /** |
95 | 95 | * @param array $params |
96 | - * @return mixed|string |
|
96 | + * @return string |
|
97 | 97 | */ |
98 | 98 | public function assemble($params = []) |
99 | 99 | { |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
138 | - * @param $map |
|
138 | + * @param boolean $map |
|
139 | 139 | */ |
140 | 140 | public function setMap($map) |
141 | 141 | { |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | } |
217 | 217 | |
218 | 218 | /** |
219 | - * @param $key |
|
219 | + * @param string $key |
|
220 | 220 | * @return mixed|null |
221 | 221 | */ |
222 | 222 | public function getParam($key) |
@@ -101,8 +101,8 @@ discard block |
||
101 | 101 | |
102 | 102 | if ($params) { |
103 | 103 | foreach ($params as $key => $value) { |
104 | - if (stristr($return, ":".$key) !== false) { |
|
105 | - $return = str_replace(":".$key, $value, $return); |
|
104 | + if (stristr($return, ":" . $key) !== false) { |
|
105 | + $return = str_replace(":" . $key, $value, $return); |
|
106 | 106 | unset($params[$key]); |
107 | 107 | } |
108 | 108 | if (array_key_exists($key, $this->params)) { |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | } |
111 | 111 | } |
112 | 112 | if ($params) { |
113 | - $return .= "?".http_build_query($params); |
|
113 | + $return .= "?" . http_build_query($params); |
|
114 | 114 | } |
115 | 115 | } |
116 | 116 | |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | if ($this->params) { |
119 | 119 | foreach ($this->params as $key => $value) { |
120 | 120 | if (is_string($value)) { |
121 | - $return = str_replace(":".$key, $value, $return); |
|
121 | + $return = str_replace(":" . $key, $value, $return); |
|
122 | 122 | } |
123 | 123 | } |
124 | 124 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
105 | - * @param $type |
|
105 | + * @param string $type |
|
106 | 106 | * @return $this |
107 | 107 | */ |
108 | 108 | public function setType($type) |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | |
161 | 161 | /** |
162 | 162 | * @param array $params |
163 | - * @return mixed |
|
163 | + * @return string |
|
164 | 164 | */ |
165 | 165 | public function getBase($params = []) |
166 | 166 | { |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | } |
176 | 176 | |
177 | 177 | /** |
178 | - * @param $base |
|
178 | + * @param string $base |
|
179 | 179 | */ |
180 | 180 | public function setBase($base) |
181 | 181 | { |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | |
222 | 222 | /** |
223 | 223 | * @param array $params |
224 | - * @return mixed|string |
|
224 | + * @return string |
|
225 | 225 | */ |
226 | 226 | public function assemble($params = []) |
227 | 227 | { |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | } |
299 | 299 | |
300 | 300 | /** |
301 | - * @param mixed $request |
|
301 | + * @param \Nip\Request $request |
|
302 | 302 | */ |
303 | 303 | public function setRequest($request) |
304 | 304 | { |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | */ |
87 | 87 | public function getParserClass() |
88 | 88 | { |
89 | - return 'Nip\Router\Parsers\\'.inflector()->camelize($this->getType()); |
|
89 | + return 'Nip\Router\Parsers\\' . inflector()->camelize($this->getType()); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | $base = $this->getBase($params); |
156 | 156 | $base = rtrim($base, "/"); |
157 | 157 | |
158 | - return $base.$this->assemble($params); |
|
158 | + return $base . $this->assemble($params); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | /** |