@@ -256,11 +256,11 @@ discard block |
||
| 256 | 256 | * ]; |
| 257 | 257 | * ``` |
| 258 | 258 | * |
| 259 | - * @param $sqlLogical |
|
| 259 | + * @param string $sqlLogical |
|
| 260 | 260 | * @param $fieldNameValues |
| 261 | 261 | * @param $sqlComparison |
| 262 | 262 | * @param array|string $modelTableData Key -> modelClass, value -> tableAlias |
| 263 | - * @param $isUse |
|
| 263 | + * @param boolean $isUse |
|
| 264 | 264 | * @return QueryBuilder |
| 265 | 265 | * @author dp <[email protected]> |
| 266 | 266 | * |
@@ -392,8 +392,8 @@ discard block |
||
| 392 | 392 | * |
| 393 | 393 | * @param Model $modelClass |
| 394 | 394 | * @param $fieldNames |
| 395 | - * @param $isValidate |
|
| 396 | - * @param $isInvalidate boolean |
|
| 395 | + * @param boolean $isValidate |
|
| 396 | + * @param boolean $isInvalidate boolean |
|
| 397 | 397 | * |
| 398 | 398 | * @author dp <[email protected]> |
| 399 | 399 | * |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | /** |
| 420 | 420 | * Set in query part where expression 'IS NULL' |
| 421 | 421 | * |
| 422 | - * @param $fieldName |
|
| 422 | + * @param string $fieldName |
|
| 423 | 423 | * @param array $modelTableData |
| 424 | 424 | * @param string $sqlLogical |
| 425 | 425 | * @param bool $isUse |
@@ -620,8 +620,8 @@ discard block |
||
| 620 | 620 | /** |
| 621 | 621 | * Set in query part where expression '> ?' |
| 622 | 622 | * |
| 623 | - * @param $fieldName |
|
| 624 | - * @param $fieldValue |
|
| 623 | + * @param string $fieldName |
|
| 624 | + * @param string $fieldValue |
|
| 625 | 625 | * @param array $modelTableData |
| 626 | 626 | * @param string $sqlLogical |
| 627 | 627 | * @param bool $isUse |
@@ -707,7 +707,7 @@ discard block |
||
| 707 | 707 | * Set in query part where expression '<> ?' |
| 708 | 708 | * |
| 709 | 709 | * @param $fieldName |
| 710 | - * @param $fieldValue |
|
| 710 | + * @param string $fieldValue |
|
| 711 | 711 | * @param array $modelTableData |
| 712 | 712 | * @param string $sqlLogical |
| 713 | 713 | * @param bool $isUse |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | /** |
| 757 | 757 | * Set in query part where expression '== 1' is boolean true(1) |
| 758 | 758 | * |
| 759 | - * @param $fieldName |
|
| 759 | + * @param string $fieldName |
|
| 760 | 760 | * @param array $modelTableData |
| 761 | 761 | * @param string $sqlLogical |
| 762 | 762 | * @return QueryBuilder |
@@ -798,8 +798,8 @@ discard block |
||
| 798 | 798 | /** |
| 799 | 799 | * Set in query part where expression 'like ?' |
| 800 | 800 | * |
| 801 | - * @param $fieldName |
|
| 802 | - * @param $fieldValue |
|
| 801 | + * @param string $fieldName |
|
| 802 | + * @param string $fieldValue |
|
| 803 | 803 | * @param array $modelTableData |
| 804 | 804 | * @param string $sqlLogical |
| 805 | 805 | * @param bool $isUse |
@@ -869,7 +869,7 @@ discard block |
||
| 869 | 869 | * |
| 870 | 870 | * @param $modelTableData |
| 871 | 871 | * @param string $fieldNames |
| 872 | - * @param null $condition |
|
| 872 | + * @param string $condition |
|
| 873 | 873 | * @return QueryBuilder |
| 874 | 874 | * |
| 875 | 875 | * @author dp <[email protected]> |
@@ -947,7 +947,7 @@ discard block |
||
| 947 | 947 | /** |
| 948 | 948 | * Return table alias for model class for query |
| 949 | 949 | * |
| 950 | - * @return Model |
|
| 950 | + * @return null|string |
|
| 951 | 951 | * |
| 952 | 952 | * @author dp <[email protected]> |
| 953 | 953 | * |
@@ -1337,7 +1337,7 @@ discard block |
||
| 1337 | 1337 | * |
| 1338 | 1338 | * @param array $rows Key-value array |
| 1339 | 1339 | * @param $part |
| 1340 | - * @param $dataSourceKey |
|
| 1340 | + * @param string|null $dataSourceKey |
|
| 1341 | 1341 | * @return Query |
| 1342 | 1342 | * |
| 1343 | 1343 | * @author dp <[email protected]> |
@@ -1861,6 +1861,10 @@ discard block |
||
| 1861 | 1861 | return $this->addTrigger('afterSelect', $trigger, $params, $modelClass, $isUse); |
| 1862 | 1862 | } |
| 1863 | 1863 | |
| 1864 | + /** |
|
| 1865 | + * @param string $type |
|
| 1866 | + * @param boolean $isUse |
|
| 1867 | + */ |
|
| 1864 | 1868 | private function addTrigger($type, $trigger, $params, $modelClass, $isUse) |
| 1865 | 1869 | { |
| 1866 | 1870 | if (!$isUse) { |
@@ -1912,7 +1916,7 @@ discard block |
||
| 1912 | 1916 | } |
| 1913 | 1917 | |
| 1914 | 1918 | /** |
| 1915 | - * @param Widget[]|mixed $widgets |
|
| 1919 | + * @param string $widgets |
|
| 1916 | 1920 | * @param bool $applyWidgetQueryBuilderParts |
| 1917 | 1921 | * @return QueryBuilder |
| 1918 | 1922 | */ |
@@ -1980,7 +1984,7 @@ discard block |
||
| 1980 | 1984 | * Set query part limit |
| 1981 | 1985 | * |
| 1982 | 1986 | * @param $limit |
| 1983 | - * @param int|null $offset |
|
| 1987 | + * @param integer $offset |
|
| 1984 | 1988 | * @return QueryBuilder |
| 1985 | 1989 | * |
| 1986 | 1990 | * @author dp <[email protected]> |
@@ -2111,6 +2115,7 @@ discard block |
||
| 2111 | 2115 | * @param $funcName |
| 2112 | 2116 | * @param argumentString |
| 2113 | 2117 | * @param array $modelTableData |
| 2118 | + * @param string $argumentString |
|
| 2114 | 2119 | * @return $this |
| 2115 | 2120 | */ |
| 2116 | 2121 | public function func($funcName, $argumentString, $modelTableData = []) |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | /** |
| 74 | - * @param null $content |
|
| 74 | + * @param string $content |
|
| 75 | 75 | */ |
| 76 | 76 | public function setContent($content) |
| 77 | 77 | { |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | /** |
| 153 | 153 | * Init resource class |
| 154 | 154 | * |
| 155 | - * @param Resource|string|null $resourceClass |
|
| 155 | + * @param null|resource $resourceClass |
|
| 156 | 156 | * @return $this |
| 157 | 157 | */ |
| 158 | 158 | public function setResourceClass($resourceClass = null) |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | /** |
| 183 | - * @param $renderClass |
|
| 183 | + * @param string $renderClass |
|
| 184 | 184 | * @return Widget |
| 185 | 185 | */ |
| 186 | 186 | public function setRenderClass($renderClass = null) |
@@ -385,8 +385,8 @@ discard block |
||
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | /** |
| 388 | - * @param $name |
|
| 389 | - * @param null $default |
|
| 388 | + * @param string $name |
|
| 389 | + * @param integer $default |
|
| 390 | 390 | * @return mixed |
| 391 | 391 | */ |
| 392 | 392 | public function getOption($name = null, $default = null) |
@@ -399,8 +399,8 @@ discard block |
||
| 399 | 399 | } |
| 400 | 400 | |
| 401 | 401 | /** |
| 402 | - * @param $name |
|
| 403 | - * @param $value |
|
| 402 | + * @param string $name |
|
| 403 | + * @param integer $value |
|
| 404 | 404 | */ |
| 405 | 405 | public function setOption($name, $value) |
| 406 | 406 | { |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | } |
| 414 | 414 | |
| 415 | 415 | /** |
| 416 | - * @param $partName |
|
| 416 | + * @param string|null $partName |
|
| 417 | 417 | * @return WidgetComponent|WidgetComponent_Widget |
| 418 | 418 | */ |
| 419 | 419 | public function getPart($partName) |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | } |
| 513 | 513 | |
| 514 | 514 | /** |
| 515 | - * @return string|null |
|
| 515 | + * @return string |
|
| 516 | 516 | */ |
| 517 | 517 | public function getTemplateClass() |
| 518 | 518 | { |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | * @param string $templateClass |
| 524 | 524 | * |
| 525 | 525 | * @todo: Написать обработчик (init) конфига, где будет отдельный вызов setTemplateClass |
| 526 | - * @return null|string |
|
| 526 | + * @return Widget |
|
| 527 | 527 | */ |
| 528 | 528 | public function setTemplateClass($templateClass = null) |
| 529 | 529 | { |
@@ -787,7 +787,7 @@ discard block |
||
| 787 | 787 | } |
| 788 | 788 | |
| 789 | 789 | /** |
| 790 | - * @return string |
|
| 790 | + * @return integer |
|
| 791 | 791 | */ |
| 792 | 792 | public function getToken() |
| 793 | 793 | { |
@@ -862,7 +862,7 @@ discard block |
||
| 862 | 862 | /** |
| 863 | 863 | * Build a tag part |
| 864 | 864 | * |
| 865 | - * @param $columnName |
|
| 865 | + * @param string $columnName |
|
| 866 | 866 | * @param array $options |
| 867 | 867 | * @param string $template |
| 868 | 868 | * @return $this |
@@ -919,7 +919,7 @@ discard block |
||
| 919 | 919 | /** |
| 920 | 920 | * Build div part |
| 921 | 921 | * |
| 922 | - * @param $columnName |
|
| 922 | + * @param string $columnName |
|
| 923 | 923 | * @param array $options |
| 924 | 924 | * @param string $template |
| 925 | 925 | * @return $this |
@@ -945,7 +945,7 @@ discard block |
||
| 945 | 945 | /** |
| 946 | 946 | * Build p part |
| 947 | 947 | * |
| 948 | - * @param $columnName |
|
| 948 | + * @param string $columnName |
|
| 949 | 949 | * @param array $options |
| 950 | 950 | * @param string $template |
| 951 | 951 | * @return $this |
@@ -1146,7 +1146,7 @@ discard block |
||
| 1146 | 1146 | |
| 1147 | 1147 | /** |
| 1148 | 1148 | * @param $token |
| 1149 | - * @return bool |
|
| 1149 | + * @return boolean|null |
|
| 1150 | 1150 | * |
| 1151 | 1151 | * @todo: need implement |
| 1152 | 1152 | */ |
@@ -1199,9 +1199,9 @@ discard block |
||
| 1199 | 1199 | } |
| 1200 | 1200 | |
| 1201 | 1201 | /** |
| 1202 | - * @param $paramName string|null |
|
| 1202 | + * @param string $paramName string|null |
|
| 1203 | 1203 | * @param null $default |
| 1204 | - * @return mixed |
|
| 1204 | + * @return integer|null |
|
| 1205 | 1205 | */ |
| 1206 | 1206 | public function getAll($paramName = null, $default = null) |
| 1207 | 1207 | { |
@@ -1,8 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Ice\Core; |
| 3 | 3 | |
| 4 | -use Composer\Installer\PackageEvent; |
|
| 5 | -use Ice\DataProvider\Request as DataProvider_Request; |
|
| 6 | 4 | use Ice\Exception\Access_Denied; |
| 7 | 5 | use Ice\Exception\Http; |
| 8 | 6 | use Ice\Exception\RouteNotFound; |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Ice\Action\Render; |
| 6 | 6 | use Ice\Core\Action; |
| 7 | -use Ice\Core\Debuger; |
|
| 8 | 7 | use Ice\Core\Request; |
| 9 | 8 | use Ice\Core\Resource; |
| 10 | 9 | use Ice\Core\Route; |
@@ -90,9 +90,9 @@ |
||
| 90 | 90 | * |
| 91 | 91 | * @param string $template |
| 92 | 92 | * @param array $data |
| 93 | - * @param null $layout |
|
| 93 | + * @param string|null $layout |
|
| 94 | 94 | * @param string $templateType |
| 95 | - * @return mixed |
|
| 95 | + * @return string|null |
|
| 96 | 96 | * @throws \Exception |
| 97 | 97 | * @author dp <[email protected]> |
| 98 | 98 | * |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | use Ice\Core\Logger; |
| 15 | 15 | use Ice\Core\Module; |
| 16 | 16 | use Ice\Core\Render; |
| 17 | -use Ice\Core\ViiewOld; |
|
| 18 | 17 | |
| 19 | 18 | /** |
| 20 | 19 | * Class Twig |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Ice\Action\Render; |
| 6 | 6 | use Ice\Core\Action; |
| 7 | -use Ice\Core\Debuger; |
|
| 8 | 7 | use Ice\Core\Request; |
| 9 | 8 | use Ice\Core\Resource; |
| 10 | 9 | use Ice\Core\Route; |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Ice\Action\Render; |
| 6 | 6 | use Ice\Core\Action; |
| 7 | -use Ice\Core\Debuger; |
|
| 8 | 7 | use Ice\Core\Request; |
| 9 | 8 | use Ice\Core\Resource; |
| 10 | 9 | use Ice\Core\Route; |