@@ -40,6 +40,9 @@ |
||
| 40 | 40 | return $this->render->render(); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | + /** |
|
| 44 | + * @return Config |
|
| 45 | + */ |
|
| 43 | 46 | public static function findConfig($ngRestConfigHash) |
| 44 | 47 | { |
| 45 | 48 | // decode the session, find the hash, if yes return the |
@@ -26,11 +26,11 @@ |
||
| 26 | 26 | public $displayTemplate = null; |
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | - * @param unknown $model \news\models\Tag::className() |
|
| 30 | - * @param unknown $refJoinTable news_article_tag |
|
| 31 | - * @param unknown $refModelPkId news_article_tag.arictle_id |
|
| 32 | - * @param unknown $refJoinPkId news_article_tag.tag_id |
|
| 33 | - * @param array $displayFields |
|
| 29 | + * @param string $model \news\models\Tag::className() |
|
| 30 | + * @param string $refJoinTable news_article_tag |
|
| 31 | + * @param string $refModelPkId news_article_tag.arictle_id |
|
| 32 | + * @param string $refJoinPkId news_article_tag.tag_id |
|
| 33 | + * @param string[] $displayFields |
|
| 34 | 34 | * @param string $displayTemplate |
| 35 | 35 | */ |
| 36 | 36 | public function __construct($model, $refJoinTable, $refModelPkId, $refJoinPkId, array $displayFields, $displayTemplate = null) |
@@ -119,6 +119,9 @@ discard block |
||
| 119 | 119 | return $this->_buttons; |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | + /** |
|
| 123 | + * @param string $type |
|
| 124 | + */ |
|
| 122 | 125 | public function apiQueryString($type) |
| 123 | 126 | { |
| 124 | 127 | // basic query |
@@ -226,6 +229,12 @@ discard block |
||
| 226 | 229 | ]; |
| 227 | 230 | } |
| 228 | 231 | |
| 232 | + /** |
|
| 233 | + * @param string $configContext |
|
| 234 | + * @param string $elmnId |
|
| 235 | + * @param string $elmnModel |
|
| 236 | + * @param boolean $elmni18n |
|
| 237 | + */ |
|
| 229 | 238 | private function renderElementPlugins($configContext, $plugins, $elmnId, $elmnName, $elmnModel, $elmnAlias, $elmni18n) |
| 230 | 239 | { |
| 231 | 240 | $doc = new DOMDocument('1.0'); |
@@ -247,11 +256,17 @@ discard block |
||
| 247 | 256 | return $obj->$method($DOMDocument); |
| 248 | 257 | } |
| 249 | 258 | |
| 259 | + /** |
|
| 260 | + * @param string $configContext |
|
| 261 | + */ |
|
| 250 | 262 | private function ngModelString($configContext, $fieldId) |
| 251 | 263 | { |
| 252 | 264 | return 'data.'.$configContext.'.'.$fieldId; |
| 253 | 265 | } |
| 254 | 266 | |
| 267 | + /** |
|
| 268 | + * @param string $configContext |
|
| 269 | + */ |
|
| 255 | 270 | private function i18nNgModelString($configContext, $fieldId, $lang) |
| 256 | 271 | { |
| 257 | 272 | return 'data.'.$configContext.'.'.$fieldId.'[\''.$lang.'\']'; |
@@ -113,7 +113,6 @@ discard block |
||
| 113 | 113 | * Class constructor to DI the request object. |
| 114 | 114 | * |
| 115 | 115 | * @param \luya\web\Request $request |
| 116 | - * @param \luya\components\Composition $composition |
|
| 117 | 116 | * @param array $config |
| 118 | 117 | */ |
| 119 | 118 | public function __construct(\luya\web\Request $request, array $config = []) |
@@ -370,7 +369,7 @@ discard block |
||
| 370 | 369 | * |
| 371 | 370 | * @see \cms\menu\Query::where() |
| 372 | 371 | * |
| 373 | - * @return \cms\menu\QueryIterator |
|
| 372 | + * @return QueryIteratorFilter |
|
| 374 | 373 | */ |
| 375 | 374 | public function findAll(array $where) |
| 376 | 375 | { |
@@ -448,6 +447,7 @@ discard block |
||
| 448 | 447 | * prepand the base url for the provided alias. |
| 449 | 448 | * |
| 450 | 449 | * @param string $alias |
| 450 | + * @param string $langShortCode |
|
| 451 | 451 | * |
| 452 | 452 | * @return string |
| 453 | 453 | */ |
@@ -585,7 +585,7 @@ |
||
| 585 | 585 | public function flushCache() |
| 586 | 586 | { |
| 587 | 587 | foreach ($this->getLanguages() as $lang) { |
| 588 | - $this->deleteHasCache($this->cachePrefix . $lang['short_code']); |
|
| 588 | + $this->deleteHasCache($this->cachePrefix.$lang['short_code']); |
|
| 589 | 589 | } |
| 590 | 590 | } |
| 591 | 591 | } |
@@ -229,6 +229,7 @@ discard block |
||
| 229 | 229 | |
| 230 | 230 | /** |
| 231 | 231 | * Internal used to retriev redirect data if any |
| 232 | + * @param string $key |
|
| 232 | 233 | * @return multitype: |
| 233 | 234 | */ |
| 234 | 235 | protected function redirectMapData($key) |
@@ -313,7 +314,7 @@ discard block |
||
| 313 | 314 | /** |
| 314 | 315 | * Get all sibilings for the current item, this also includes the current item iteself. |
| 315 | 316 | * |
| 316 | - * @return array An array with all item-object siblings |
|
| 317 | + * @return QueryIteratorFilter An array with all item-object siblings |
|
| 317 | 318 | * @since 1.0.0-beta3 |
| 318 | 319 | */ |
| 319 | 320 | public function getSiblings() |
@@ -342,7 +343,7 @@ discard block |
||
| 342 | 343 | /** |
| 343 | 344 | * Get all children of the current item. Children means going the depth/menulevel down e.g. from 1 to 2. |
| 344 | 345 | * |
| 345 | - * @return \cms\menu\QueryIterator Returns all children |
|
| 346 | + * @return QueryIteratorFilter Returns all children |
|
| 346 | 347 | */ |
| 347 | 348 | public function getChildren() |
| 348 | 349 | { |
@@ -369,6 +370,7 @@ discard block |
||
| 369 | 370 | * |
| 370 | 371 | * @see \cms\menu\Query::with() |
| 371 | 372 | * |
| 373 | + * @param string $with |
|
| 372 | 374 | * @return \cms\menu\Item; |
| 373 | 375 | */ |
| 374 | 376 | public function with($with) |
@@ -155,8 +155,6 @@ discard block |
||
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | /** |
| 158 | - * @param string|array $with can be a string containg "hidden" or an array with multiple patters |
|
| 159 | - * for example `['hidden']`. Further with statements upcoming. |
|
| 160 | 158 | * @return \cms\menu\Query |
| 161 | 159 | */ |
| 162 | 160 | public function with($types) |
@@ -239,7 +237,7 @@ discard block |
||
| 239 | 237 | * Retrieve all found rows based on the filtering options and returns the the QueryIterator object |
| 240 | 238 | * which is represents an array. |
| 241 | 239 | * |
| 242 | - * @return \cms\menu\QueryIterator Returns the QueryIterator object. |
|
| 240 | + * @return QueryIteratorFilter Returns the QueryIterator object. |
|
| 243 | 241 | */ |
| 244 | 242 | public function all() |
| 245 | 243 | { |
@@ -262,7 +260,7 @@ discard block |
||
| 262 | 260 | * |
| 263 | 261 | * @param array $data The filtere results where the iterator object should be created with |
| 264 | 262 | * @param string $langContext The language short code context, if any. |
| 265 | - * @return \cms\menu\QueryIterator |
|
| 263 | + * @return QueryIteratorFilter |
|
| 266 | 264 | */ |
| 267 | 265 | public static function createArrayIterator(array $data, $langContext) |
| 268 | 266 | { |
@@ -284,7 +284,7 @@ |
||
| 284 | 284 | |
| 285 | 285 | protected function filter(array $whereExpression, $containerData) |
| 286 | 286 | { |
| 287 | - $data = array_filter($containerData, function ($item) { |
|
| 287 | + $data = array_filter($containerData, function($item) { |
|
| 288 | 288 | foreach ($item as $field => $value) { |
| 289 | 289 | if (!$this->arrayFilter($value, $field)) { |
| 290 | 290 | return false; |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | |
| 6 | 6 | use Yii; |
| 7 | -use cms\components\Menu; |
|
| 8 | 7 | |
| 9 | 8 | class ContainerTest extends \tests\web\Base |
| 10 | 9 | { |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use yii\db\Query; |
| 6 | 6 | use luya\helpers\ArrayHelper; |
| 7 | -use cmsadmin\models\NavContainer; |
|
| 8 | 7 | use admin\models\Lang; |
| 9 | 8 | |
| 10 | 9 | class MenuController extends \admin\base\RestController |
@@ -19,6 +19,9 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | class NavController extends \admin\base\RestController |
| 21 | 21 | { |
| 22 | + /** |
|
| 23 | + * @param string $name |
|
| 24 | + */ |
|
| 22 | 25 | private function postArg($name) |
| 23 | 26 | { |
| 24 | 27 | return Yii::$app->request->post($name, null); |
@@ -170,7 +173,6 @@ discard block |
||
| 170 | 173 | /** |
| 171 | 174 | * creates a new nav entry for the type page (nav_id will be created. |
| 172 | 175 | * |
| 173 | - * @param array $_POST: |
|
| 174 | 176 | */ |
| 175 | 177 | public function actionCreatePage() |
| 176 | 178 | { |