Completed
Pull Request — master (#1213)
by Marc
03:56
created
core/web/Twig.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -41,38 +41,38 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
             }
Please login to merge, or discard this patch.
core/web/Element.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -275,13 +275,13 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
core/web/UrlManager.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
core/TagParser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@
 block discarded – undo
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
     
Please login to merge, or discard this patch.
core/console/commands/HealthController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
core/console/commands/BlockController.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -182,19 +182,19 @@  discard block
 block discarded – undo
182 182
     private function getExtraVarDef($type, $varName, $func)
183 183
     {
184 184
         $info = [
185
-            'image-upload' => function ($varName) use ($func) {
185
+            'image-upload' => function($varName) use ($func) {
186 186
                 return 'BlockHelper::imageUpload($this->'.$func.'(\''.$varName.'\'), false, true),';
187 187
             },
188
-            'image-array-upload' => function ($varName) use ($func) {
188
+            'image-array-upload' => function($varName) use ($func) {
189 189
                 return 'BlockHelper::imageArrayUpload($this->'.$func.'(\''.$varName.'\'), false, true),';
190 190
             },
191
-            'file-upload' => function ($varName) use ($func) {
191
+            'file-upload' => function($varName) use ($func) {
192 192
                 return 'BlockHelper::fileUpload($this->'.$func.'(\''.$varName.'\'), true),';
193 193
             },
194
-            'file-array-upload' => function ($varName) use ($func) {
194
+            'file-array-upload' => function($varName) use ($func) {
195 195
                 return 'BlockHelper::fileArrayUpload($this->'.$func.'(\''.$varName.'\'), true),';
196 196
             },
197
-            'cms-page' => function ($varName) use ($func) {
197
+            'cms-page' => function($varName) use ($func) {
198 198
                 return 'Yii::$app->menu->findOne([\'nav_id\' => $this->'.$func.'(\''.$varName.'\', 0)]),';
199 199
             },
200 200
         ];
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
             return 'app\\blocks';
289 289
         }
290 290
 
291
-        return Yii::$app->getModule($this->moduleName)->getNamespace()  . '\\blocks';
291
+        return Yii::$app->getModule($this->moduleName)->getNamespace().'\\blocks';
292 292
     }
293 293
 
294 294
     /**
@@ -397,8 +397,8 @@  discard block
 block discarded – undo
397 397
             }
398 398
         }
399 399
         
400
-        $folder = $this->getFileBasePath() . DIRECTORY_SEPARATOR . 'blocks';
401
-        $filePath = $folder . DIRECTORY_SEPARATOR . $this->blockName . '.php';
400
+        $folder = $this->getFileBasePath().DIRECTORY_SEPARATOR.'blocks';
401
+        $filePath = $folder.DIRECTORY_SEPARATOR.$this->blockName.'.php';
402 402
         
403 403
         sort($this->phpdoc);
404 404
         
@@ -423,14 +423,14 @@  discard block
 block discarded – undo
423 423
         if (FileHelper::createDirectory($folder) && FileHelper::writeFile($filePath, $content)) {
424 424
             
425 425
             // generate view file based on block object view context
426
-            $object = Yii::createObject(['class' => $this->getFileNamespace() . '\\' . $this->blockName]);
426
+            $object = Yii::createObject(['class' => $this->getFileNamespace().'\\'.$this->blockName]);
427 427
             $viewsFolder = Yii::getAlias($object->getViewPath());
428
-            $viewFilePath = $viewsFolder . DIRECTORY_SEPARATOR . $object->getViewFileName('php');
428
+            $viewFilePath = $viewsFolder.DIRECTORY_SEPARATOR.$object->getViewFileName('php');
429 429
             if (FileHelper::createDirectory($viewsFolder) && FileHelper::writeFile($viewFilePath, $this->generateViewFile($this->blockName))) {
430
-                $this->outputInfo('View file for the block has been created: ' . $viewFilePath);
430
+                $this->outputInfo('View file for the block has been created: '.$viewFilePath);
431 431
             }
432 432
             
433
-            return $this->outputSuccess("Block {$this->blockName} has been created: " . $filePath);
433
+            return $this->outputSuccess("Block {$this->blockName} has been created: ".$filePath);
434 434
         }
435 435
         
436 436
         return $this->outputError("Error while creating block '$filePath'");
Please login to merge, or discard this patch.
core/console/commands/MigrateController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
      */
67 67
     protected function createMigration($class)
68 68
     {
69
-        $orig = $this->migrationPath . DIRECTORY_SEPARATOR . $class . '.php';
69
+        $orig = $this->migrationPath.DIRECTORY_SEPARATOR.$class.'.php';
70 70
         
71 71
         if (file_exists($orig)) {
72 72
             require_once $orig;
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
         
85 85
         $module = $this->prompt("Could not find migration class. Please enter the module name who belongs to '$class.':");
86 86
         $dir = $this->getModuleMigrationDirectorie($module);
87
-        $file = $dir . DIRECTORY_SEPARATOR . $class . '.php';
87
+        $file = $dir.DIRECTORY_SEPARATOR.$class.'.php';
88 88
         if (file_exists($file)) {
89 89
             require_once $file;
90 90
             return new $class();
Please login to merge, or discard this patch.
core/console/commands/views/crud/create_model.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     
Please login to merge, or discard this patch.
core/console/commands/views/crud/create_controller.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,5 +21,5 @@
 block discarded – undo
21 21
     /**
22 22
      * @var string The path to the model which is the provider for the rules and fields.
23 23
      */
24
-    public $modelClass = '<?= $modelClass;?>';
24
+    public $modelClass = '<?= $modelClass; ?>';
25 25
 }
26 26
\ No newline at end of file
Please login to merge, or discard this patch.