Completed
Pull Request — master (#1302)
by Martin
04:11 queued 01:26
created
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/Widget.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,6 +39,6 @@
 block discarded – undo
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
 }
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/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_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.
core/tag/tags/TelTag.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
      */
50 50
     public function parse($value, $sub)
51 51
     {
52
-        return Html::a(empty($sub) ? $value : $sub, 'tel:' . $this->ensureNumber($value));
52
+        return Html::a(empty($sub) ? $value : $sub, 'tel:'.$this->ensureNumber($value));
53 53
     }
54 54
         
55 55
     private function ensureNumber($number)
Please login to merge, or discard this patch.