Completed
Pull Request — master (#1213)
by Marc
03:56
created
core/console/commands/views/block/create_block.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -88,8 +88,8 @@
 block discarded – undo
88 88
     {
89 89
         return [
90 90
 <?php foreach ($extras as $extra):?>
91
-            <?= $extra;?>
92
-<?php endforeach;?>
91
+            <?= $extra; ?>
92
+<?php endforeach; ?>
93 93
 
94 94
         ];
95 95
     }
Please login to merge, or discard this patch.
core/base/BaseBootstrap.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
             // see if the module has a registerComponents method
101 101
             foreach ($module->registerComponents() as $componentId => $definition) {
102 102
                 if (!$app->has($componentId)) {
103
-                    Yii::trace('Register component ' . $componentId, __METHOD__);
103
+                    Yii::trace('Register component '.$componentId, __METHOD__);
104 104
                     $app->set($componentId, $definition);
105 105
                 }
106 106
             }
Please login to merge, or discard this patch.
core/console/commands/ActiveWindowController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -55,11 +55,11 @@
 block discarded – undo
55 55
         
56 56
         $module = Yii::$app->getModule($moduleId);
57 57
         
58
-        $folder = $module->basePath . DIRECTORY_SEPARATOR . 'aws';
58
+        $folder = $module->basePath.DIRECTORY_SEPARATOR.'aws';
59 59
         
60
-        $file = $folder . DIRECTORY_SEPARATOR . $className . '.php';
60
+        $file = $folder.DIRECTORY_SEPARATOR.$className.'.php';
61 61
         
62
-        $content = $this->renderWindowClassView($className, $module->getNamespace() . '\\aws', $moduleId);
62
+        $content = $this->renderWindowClassView($className, $module->getNamespace().'\\aws', $moduleId);
63 63
         
64 64
         FileHelper::createDirectory($folder);
65 65
         
Please login to merge, or discard this patch.
core/console/commands/ImportController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -164,18 +164,18 @@
 block discarded – undo
164 164
             }
165 165
             
166 166
             foreach ($this->getLog() as $section => $value) {
167
-                $this->outputInfo(PHP_EOL . $section . ":");
167
+                $this->outputInfo(PHP_EOL.$section.":");
168 168
                 foreach ($value as $k => $v) {
169 169
                     if (is_array($v)) {
170 170
                         foreach ($v as $kk => $kv) {
171 171
                             if (is_array($kv)) {
172
-                                $this->output(" - {$kk}: " . print_r($kv, true));
172
+                                $this->output(" - {$kk}: ".print_r($kv, true));
173 173
                             } else {
174 174
                                 $this->output(" - {$kk}: {$kv}");
175 175
                             }
176 176
                         }
177 177
                     } else {
178
-                        $this->output(" - " . $v);
178
+                        $this->output(" - ".$v);
179 179
                     }
180 180
                 }
181 181
             }
Please login to merge, or discard this patch.
core/helpers/ArrayHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@
 block discarded – undo
96 96
     public static function search($array, $searchText, $sensitive = false)
97 97
     {
98 98
         $function = ($sensitive) ? 'strpos' : 'stripos';
99
-        return array_filter($array, function ($item) use ($searchText, $function) {
99
+        return array_filter($array, function($item) use ($searchText, $function) {
100 100
             $response = false;
101 101
             foreach ($item as $key => $value) {
102 102
                 if ($response) {
Please login to merge, or discard this patch.
core/helpers/StringHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
             return true;
72 72
         }
73 73
         
74
-        return ($value == (string)(float) $value);
74
+        return ($value == (string) (float) $value);
75 75
     }
76 76
     
77 77
     /**
Please login to merge, or discard this patch.
core/console/commands/CrudController.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
      */
89 89
     public function getAbsoluteModelNamespace()
90 90
     {
91
-        return $this->getModelNamespace() . '\\models\\' . $this->getModelNameCamlized();
91
+        return $this->getModelNamespace().'\\models\\'.$this->getModelNameCamlized();
92 92
     }
93 93
     
94 94
     /**
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
                 $sqlTable = $this->prompt('Database Table name for the Model:', ['required' => true, 'default' => $this->getDatabaseNameSuggestion()]);
385 385
                 if ($sqlTable == '?') {
386 386
                     foreach ($this->getSqlTablesArray() as $table) {
387
-                        $this->outputInfo("- " . $table);
387
+                        $this->outputInfo("- ".$table);
388 388
                     }
389 389
                 }
390 390
                 if (isset($this->getSqlTablesArray()[$sqlTable])) {
@@ -407,26 +407,26 @@  discard block
 block discarded – undo
407 407
         // api content
408 408
 
409 409
         $files['api'] = [
410
-            'path' => $this->getBasePath() . DIRECTORY_SEPARATOR . 'apis',
411
-            'fileName' => $this->getModelNameCamlized() . 'Controller.php',
412
-            'content' => $this->generateApiContent($this->getNamespace() . '\\apis', $this->getModelNameCamlized() . 'Controller', $this->getAbsoluteModelNamespace()),
410
+            'path' => $this->getBasePath().DIRECTORY_SEPARATOR.'apis',
411
+            'fileName' => $this->getModelNameCamlized().'Controller.php',
412
+            'content' => $this->generateApiContent($this->getNamespace().'\\apis', $this->getModelNameCamlized().'Controller', $this->getAbsoluteModelNamespace()),
413 413
         ];
414 414
         
415 415
         // controller
416 416
 
417 417
         $files['controller'] = [
418
-            'path' =>  $this->getBasePath() . DIRECTORY_SEPARATOR . 'controllers',
419
-            'fileName' => $this->getModelNameCamlized() . 'Controller.php',
420
-            'content' => $this->generateControllerContent($this->getNamespace() . '\\controllers', $this->getModelNameCamlized() . 'Controller', $this->getAbsoluteModelNamespace()),
418
+            'path' =>  $this->getBasePath().DIRECTORY_SEPARATOR.'controllers',
419
+            'fileName' => $this->getModelNameCamlized().'Controller.php',
420
+            'content' => $this->generateControllerContent($this->getNamespace().'\\controllers', $this->getModelNameCamlized().'Controller', $this->getAbsoluteModelNamespace()),
421 421
         ];
422 422
         
423 423
         // model
424 424
 
425 425
         $files['model'] = [
426
-            'path' =>  $this->getModelBasePath() . DIRECTORY_SEPARATOR . 'models',
427
-            'fileName' => $this->getModelNameCamlized() . '.php',
426
+            'path' =>  $this->getModelBasePath().DIRECTORY_SEPARATOR.'models',
427
+            'fileName' => $this->getModelNameCamlized().'.php',
428 428
             'content' => $this->generateModelContent(
429
-                $this->getModelNamespace() . '\\models',
429
+                $this->getModelNamespace().'\\models',
430 430
                 $this->getModelNameCamlized(),
431 431
                 $this->apiEndpoint,
432 432
                 $this->getDbTableShema(),
@@ -438,19 +438,19 @@  discard block
 block discarded – undo
438 438
             $this->generateFile($file);
439 439
         }
440 440
         
441
-        return $this->outputSuccess($this->generateBuildSummery($this->apiEndpoint, $this->getNamespace() . '\\apis\\' . $this->getModelNameCamlized() . 'Controller', $this->getModelNameCamlized(), $this->getSummaryControllerRoute()));
441
+        return $this->outputSuccess($this->generateBuildSummery($this->apiEndpoint, $this->getNamespace().'\\apis\\'.$this->getModelNameCamlized().'Controller', $this->getModelNameCamlized(), $this->getSummaryControllerRoute()));
442 442
     }
443 443
     
444 444
     protected function generateFile(array $file)
445 445
     {
446 446
         FileHelper::createDirectory($file['path']);
447
-        if (file_exists($file['path'] . DIRECTORY_SEPARATOR . $file['fileName'])) {
447
+        if (file_exists($file['path'].DIRECTORY_SEPARATOR.$file['fileName'])) {
448 448
             if (!$this->confirm("The File '{$file['fileName']}' already exists, do you want to override the existing file?")) {
449 449
                 return false;
450 450
             }
451 451
         }
452 452
         
453
-        if (FileHelper::writeFile($file['path'] . DIRECTORY_SEPARATOR . $file['fileName'], $file['content'])) {
453
+        if (FileHelper::writeFile($file['path'].DIRECTORY_SEPARATOR.$file['fileName'], $file['content'])) {
454 454
             $this->outputSuccess("Wrote file '{$file['fileName']}'.");
455 455
         } else {
456 456
             $this->outputError("Error while writing file '{$file['fileName']}'.");
Please login to merge, or discard this patch.
core/console/commands/ModuleController.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -106,23 +106,23 @@  discard block
 block discarded – undo
106 106
             }
107 107
         }
108 108
         
109
-        $appModulesFolder = Yii::$app->basePath . DIRECTORY_SEPARATOR . 'modules';
110
-        $moduleFolder = $appModulesFolder . DIRECTORY_SEPARATOR . $moduleName;
109
+        $appModulesFolder = Yii::$app->basePath.DIRECTORY_SEPARATOR.'modules';
110
+        $moduleFolder = $appModulesFolder.DIRECTORY_SEPARATOR.$moduleName;
111 111
         
112 112
         if (file_exists($moduleFolder)) {
113
-            return $this->outputError("The folder " . $moduleFolder . " exists already.");
113
+            return $this->outputError("The folder ".$moduleFolder." exists already.");
114 114
         }
115 115
         
116 116
         $folders = [
117 117
             'basePath' => $moduleFolder,
118
-            'adminPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'admin',
119
-            'adminAwsPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . 'aws',
120
-            'adminMigrationPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . 'migrations',
121
-            'frontendPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend',
122
-            'frontendBlocksPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'blocks',
123
-            'frontendControllersPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'controllers',
124
-            'frontendViewsPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'views',
125
-            'modelsPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'models',
118
+            'adminPath' => $moduleFolder.DIRECTORY_SEPARATOR.'admin',
119
+            'adminAwsPath' => $moduleFolder.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.'aws',
120
+            'adminMigrationPath' => $moduleFolder.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.'migrations',
121
+            'frontendPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend',
122
+            'frontendBlocksPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'blocks',
123
+            'frontendControllersPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'controllers',
124
+            'frontendViewsPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'views',
125
+            'modelsPath' => $moduleFolder.DIRECTORY_SEPARATOR.'models',
126 126
         ];
127 127
 
128 128
         $ns = 'app\\modules\\'.$moduleName;
@@ -132,9 +132,9 @@  discard block
 block discarded – undo
132 132
         }
133 133
         
134 134
         $contents = [
135
-            $moduleFolder. DIRECTORY_SEPARATOR . 'README.md' => $this->renderReadme($folders, $moduleName, $ns),
136
-            $moduleFolder. DIRECTORY_SEPARATOR . 'admin/Module.php' => $this->renderAdmin($folders, $moduleName, $ns),
137
-            $moduleFolder. DIRECTORY_SEPARATOR . 'frontend/Module.php' => $this->renderFrontend($folders, $moduleName, $ns),
135
+            $moduleFolder.DIRECTORY_SEPARATOR.'README.md' => $this->renderReadme($folders, $moduleName, $ns),
136
+            $moduleFolder.DIRECTORY_SEPARATOR.'admin/Module.php' => $this->renderAdmin($folders, $moduleName, $ns),
137
+            $moduleFolder.DIRECTORY_SEPARATOR.'frontend/Module.php' => $this->renderFrontend($folders, $moduleName, $ns),
138 138
         ];
139 139
         
140 140
         foreach ($contents as $fileName => $content) {
Please login to merge, or discard this patch.
core/base/ModuleReflection.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.