@@ -398,7 +398,7 @@ |
||
398 | 398 | * |
399 | 399 | * @see ArrayAccess::offsetGet() |
400 | 400 | * @param string $offset The key to get from the array. |
401 | - * @return mixed The value for the offset key from the array. |
|
401 | + * @return string|boolean The value for the offset key from the array. |
|
402 | 402 | */ |
403 | 403 | public function offsetGet($offset) |
404 | 404 | { |
@@ -187,7 +187,7 @@ |
||
187 | 187 | * Remove the base url from a route |
188 | 188 | * |
189 | 189 | * @param string $route The route where the baseUrl should be removed from. |
190 | - * @return mixed |
|
190 | + * @return string |
|
191 | 191 | */ |
192 | 192 | public function removeBaseUrl($route) |
193 | 193 | { |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $length = strlen($composition); |
95 | 95 | $route = $parsedRequest[0]; |
96 | 96 | |
97 | - if (substr($route, 0, $length+1) == $composition.'/') { |
|
97 | + if (substr($route, 0, $length + 1) == $composition.'/') { |
|
98 | 98 | $parsedRequest[0] = substr($parsedRequest[0], $length); |
99 | 99 | } |
100 | 100 | |
@@ -302,10 +302,10 @@ discard block |
||
302 | 302 | $params = (array) $params; |
303 | 303 | $url = $this->internalCreateUrl($params); |
304 | 304 | if (strpos($url, '://') === false) { |
305 | - $url = $this->getHostInfo() . $url; |
|
305 | + $url = $this->getHostInfo().$url; |
|
306 | 306 | } |
307 | 307 | if (is_string($scheme) && ($pos = strpos($url, '://')) !== false) { |
308 | - $url = $scheme . substr($url, $pos); |
|
308 | + $url = $scheme.substr($url, $pos); |
|
309 | 309 | } |
310 | 310 | return $url; |
311 | 311 | } |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | |
191 | 191 | return [ |
192 | 192 | 'module' => $this->module->id, |
193 | - 'route' => $this->module->id . '/' . $request['route'], |
|
193 | + 'route' => $this->module->id.'/'.$request['route'], |
|
194 | 194 | 'params' => $request['args'], |
195 | 195 | ]; |
196 | 196 | } |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | throw new NotFoundHttpException(sprintf("Unable to create controller '%s' for module '%s'.", $requestRoute['route'], $this->module->id)); |
213 | 213 | } |
214 | 214 | |
215 | - Yii::info('LUYA module run module "'.$this->module->id.'" route ' . $requestRoute['route'], __METHOD__); |
|
215 | + Yii::info('LUYA module run module "'.$this->module->id.'" route '.$requestRoute['route'], __METHOD__); |
|
216 | 216 | |
217 | 217 | /** |
218 | 218 | * issue: https://github.com/zephir/luya/issues/754 |
@@ -39,6 +39,6 @@ |
||
39 | 39 | // get reflection |
40 | 40 | $class = new ReflectionClass($this); |
41 | 41 | // get path with alias |
42 | - return '@app/views/widgets/' . Inflector::camel2id($class->getShortName()); |
|
42 | + return '@app/views/widgets/'.Inflector::camel2id($class->getShortName()); |
|
43 | 43 | } |
44 | 44 | } |
@@ -41,38 +41,38 @@ discard block |
||
41 | 41 | public function getFunctions() |
42 | 42 | { |
43 | 43 | return [ |
44 | - 'menuFindAll' => function ($container, $parentNavId) { |
|
44 | + 'menuFindAll' => function($container, $parentNavId) { |
|
45 | 45 | return Yii::$app->menu->findAll(['container' => $container, 'parent_nav_id' => $parentNavId]); |
46 | 46 | }, |
47 | - 'menuFindOne' => function ($id) { |
|
47 | + 'menuFindOne' => function($id) { |
|
48 | 48 | return Yii::$app->menu->findOne(['id' => $id]); |
49 | 49 | }, |
50 | - 'menuCurrent' => function () { |
|
50 | + 'menuCurrent' => function() { |
|
51 | 51 | return Yii::$app->menu->current; |
52 | 52 | }, |
53 | - 'menuCurrentLevel' => function ($level) { |
|
53 | + 'menuCurrentLevel' => function($level) { |
|
54 | 54 | return Yii::$app->menu->getLevelCurrent($level); |
55 | 55 | }, |
56 | - 'menuLevelContainer' => function ($level) { |
|
56 | + 'menuLevelContainer' => function($level) { |
|
57 | 57 | return Yii::$app->menu->getLevelContainer($level); |
58 | 58 | }, |
59 | - 'asset' => function ($name) { |
|
59 | + 'asset' => function($name) { |
|
60 | 60 | return Yii::$app->getAssetManager()->getBundle($name); |
61 | 61 | }, |
62 | - 'filterApply' => function ($imageId, $filterIdentifier) { |
|
62 | + 'filterApply' => function($imageId, $filterIdentifier) { |
|
63 | 63 | return Yii::$app->storage->getImage($imageId)->applyFilter($filterIdentifier); |
64 | 64 | }, |
65 | - 'image' => function ($imageId) { |
|
65 | + 'image' => function($imageId) { |
|
66 | 66 | return Yii::$app->storage->getImage($imageId); |
67 | 67 | }, |
68 | - 'element' => function () { |
|
68 | + 'element' => function() { |
|
69 | 69 | $args = func_get_args(); |
70 | 70 | $method = $args[0]; |
71 | 71 | unset($args[0]); |
72 | 72 | |
73 | 73 | return Yii::$app->element->getElement($method, $args); |
74 | 74 | }, |
75 | - 't' => function () { |
|
75 | + 't' => function() { |
|
76 | 76 | $args = func_get_args(); |
77 | 77 | |
78 | 78 | return call_user_func_array(['Yii', 't'], $args); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | $twig->addFunction(new Twig_SimpleFunction($name, $lambda)); |
112 | 112 | } |
113 | 113 | |
114 | - $twig->addFilter(new Twig_SimpleFilter('strftime', function ($timestamp, $format) { |
|
114 | + $twig->addFilter(new Twig_SimpleFilter('strftime', function($timestamp, $format) { |
|
115 | 115 | if (is_numeric($timestamp)) { |
116 | 116 | return strftime($format, $timestamp); |
117 | 117 | } |
@@ -275,13 +275,13 @@ |
||
275 | 275 | { |
276 | 276 | if ($this->renderEngine == 'php') { |
277 | 277 | $view = new View(); |
278 | - return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . FileHelper::ensureExtension($file, 'php'), $args); |
|
278 | + return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.FileHelper::ensureExtension($file, 'php'), $args); |
|
279 | 279 | } elseif ($this->renderEngine == 'twig') { |
280 | 280 | // @deprecated 1.0.0-RC2 Marked as deprecated and will be removed on 1.0.0 release. |
281 | 281 | $twig = Yii::$app->twig->env(new Twig_Loader_Filesystem($this->getFolder())); |
282 | 282 | return $twig->render(FileHelper::ensureExtension($file, 'twig'), $args); |
283 | 283 | } |
284 | 284 | |
285 | - throw new Exception('Not supported render engine: ' . $this->renderEngine); |
|
285 | + throw new Exception('Not supported render engine: '.$this->renderEngine); |
|
286 | 286 | } |
287 | 287 | } |
@@ -123,7 +123,7 @@ |
||
123 | 123 | { |
124 | 124 | if (!is_object($this->tags[$tag])) { |
125 | 125 | $this->tags[$tag] = Yii::createObject($this->tags[$tag]); |
126 | - Yii::trace('tag parser object generated for:'. $tag, __CLASS__); |
|
126 | + Yii::trace('tag parser object generated for:'.$tag, __CLASS__); |
|
127 | 127 | } |
128 | 128 | } |
129 | 129 |
@@ -46,7 +46,7 @@ |
||
46 | 46 | |
47 | 47 | @chdir(Yii::getAlias('@app')); |
48 | 48 | |
49 | - $this->output('The directory the health commands is applying to: ' . Yii::getAlias('@app')); |
|
49 | + $this->output('The directory the health commands is applying to: '.Yii::getAlias('@app')); |
|
50 | 50 | |
51 | 51 | foreach ($this->folders as $folder => $writable) { |
52 | 52 | $mode = ($writable) ? 0777 : 0775; |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Yii; |
6 | 6 | use yii\helpers\FileHelper; |
7 | -use yii\helpers\Console; |
|
8 | 7 | use yii\imagine\Image; |
9 | 8 | |
10 | 9 | /** |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | * |
13 | 13 | * <?=$luyaVersion; ?> |
14 | 14 | * |
15 | -<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name . PHP_EOL; ?> |
|
16 | -<?php endforeach;?> |
|
15 | +<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name.PHP_EOL; ?> |
|
16 | +<?php endforeach; ?> |
|
17 | 17 | */ |
18 | 18 | class <?= $className; ?> extends NgRestModel |
19 | 19 | { |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public $i18n = ['<?= implode("', '", $textFields); ?>']; |
55 | 55 | |
56 | -<?php endif;?> |
|
56 | +<?php endif; ?> |
|
57 | 57 | /** |
58 | 58 | * @return array An array containing all field which can be lookedup during the admin search process. |
59 | 59 | */ |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | { |
78 | 78 | return [ |
79 | 79 | <?php foreach ($ngrestFieldConfig as $name => $type): ?> |
80 | - '<?=$name; ?>' => '<?= $type;?>', |
|
80 | + '<?=$name; ?>' => '<?= $type; ?>', |
|
81 | 81 | <?php endforeach; ?>]; |
82 | 82 | } |
83 | 83 |