luyadev / luya

core/console/commands/BaseCrudController.php

Spacing +7 added lines, -7 removed lines

@@ -74,10 +74,10 @@ 
         }
         $rules = [];
         foreach ($types as $type => $columns) {
-            $rules[] = "[['" . implode("', '", $columns) . "'], '$type']";
+            $rules[] = "[['".implode("', '", $columns)."'], '$type']";
         }
         foreach ($lengths as $length => $columns) {
-            $rules[] = "[['" . implode("', '", $columns) . "'], 'string', 'max' => $length]";
+            $rules[] = "[['".implode("', '", $columns)."'], 'string', 'max' => $length]";
         }
         $db = $this->getDbConnection();
         // Unique indexes rules
@@ -88,12 +88,12 @@ 
                 if (!$this->isColumnAutoIncremental($table, $uniqueColumns)) {
                     $attributesCount = count($uniqueColumns);
                     if ($attributesCount === 1) {
-                        $rules[] = "[['" . $uniqueColumns[0] . "'], 'unique']";
+                        $rules[] = "[['".$uniqueColumns[0]."'], 'unique']";
                     } elseif ($attributesCount > 1) {
                         $labels = array_intersect_key($this->generateLabels($table), array_flip($uniqueColumns));
                         $lastLabel = array_pop($labels);
                         $columnsList = implode("', '", $uniqueColumns);
-                        $rules[] = "[['$columnsList'], 'unique', 'targetAttribute' => ['$columnsList'], 'message' => 'The combination of " . implode(', ', $labels) . " and $lastLabel has already been taken.']";
+                        $rules[] = "[['$columnsList'], 'unique', 'targetAttribute' => ['$columnsList'], 'message' => 'The combination of ".implode(', ', $labels)." and $lastLabel has already been taken.']";
                     }
                 }
             }
@@ -136,7 +136,7 @@ 
         $fullTableName = $tableName;
         if (($pos = strrpos($tableName, '.')) !== false) {
             if (($useSchemaName === null && $this->useSchemaName) || $useSchemaName) {
-                $schemaName = substr($tableName, 0, $pos) . '_';
+                $schemaName = substr($tableName, 0, $pos).'_';
             }
             $tableName = substr($tableName, $pos + 1);
         }
@@ -149,7 +149,7 @@ 
             if (($pos = strrpos($pattern, '.')) !== false) {
                 $pattern = substr($pattern, $pos + 1);
             }
-            $patterns[] = '/^' . str_replace('*', '(\w+)', $pattern) . '$/';
+            $patterns[] = '/^'.str_replace('*', '(\w+)', $pattern).'$/';
         }
         $className = $tableName;
         foreach ($patterns as $pattern) {
@@ -193,7 +193,7 @@ 
             } else {
                 $label = Inflector::camel2words($column->name);
                 if (!empty($label) && substr_compare($label, ' id', -3, 3, true) === 0) {
-                    $label = substr($label, 0, -3) . ' ID';
+                    $label = substr($label, 0, -3).' ID';
                 }
                 $labels[$column->name] = $label;
             }

core/console/commands/views/block/create_block.php

Spacing +2 added lines, -2 removed lines

@@ -88,8 +88,8 @@
     {
         return [
 <?php foreach ($extras as $extra):?>
-            <?= $extra;?>
-<?php endforeach;?>
+            <?= $extra; ?>
+<?php endforeach; ?>
 
         ];
     }

core/helpers/StringHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
      * @param string $search Search string to look for.
      * @param string $replace Replacement value for the first found occurrence.
      * @param string $subject The string you want to look up to replace the first element.
-     * @return mixed Replaced string
+     * @return string Replaced string
      * @since 1.0.0-rc1
      */
     public static function replaceFirst($search, $replace, $subject)

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
             return true;
         }
         
-        return ($value == (string)(float) $value);
+        return ($value == (string) (float) $value);
     }
     
     /**

core/console/commands/CrudController.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     /**
      * Get the $moduleName without admin suffix (if any).
      *
-     * @return mixed Return the module name without admin suffix.
+     * @return string Return the module name without admin suffix.
      */
     public function getModuleNameWithoutAdminSuffix()
     {

Indentation +2 added lines, -2 removed lines

@@ -431,7 +431,7 @@ 
                 $this->apiEndpoint,
                 $this->getDbTableShema(),
                 $this->enableI18n
-             ),
+                ),
         ];
         
         foreach ($files as $file) {
@@ -487,7 +487,7 @@ 
                 $apiEndpoint,
                 Yii::$app->db->getTableSchema($object->tableName(), true),
                 $i18n
-             ),
+                ),
         ];
         
         $this->generateFile($data);

Spacing +14 added lines, -14 removed lines

@@ -88,7 +88,7 @@ 
      */
     public function getAbsoluteModelNamespace()
     {
-        return $this->getModelNamespace() . '\\models\\' . $this->getModelNameCamlized();
+        return $this->getModelNamespace().'\\models\\'.$this->getModelNameCamlized();
     }
     
     /**
@@ -384,7 +384,7 @@ 
                 $sqlTable = $this->prompt('Database Table name for the Model:', ['required' => true, 'default' => $this->getDatabaseNameSuggestion()]);
                 if ($sqlTable == '?') {
                     foreach ($this->getSqlTablesArray() as $table) {
-                        $this->outputInfo("- " . $table);
+                        $this->outputInfo("- ".$table);
                     }
                 }
                 if (isset($this->getSqlTablesArray()[$sqlTable])) {
@@ -407,26 +407,26 @@ 
         // api content
 
         $files['api'] = [
-            'path' => $this->getBasePath() . DIRECTORY_SEPARATOR . 'apis',
-            'fileName' => $this->getModelNameCamlized() . 'Controller.php',
-            'content' => $this->generateApiContent($this->getNamespace() . '\\apis', $this->getModelNameCamlized() . 'Controller', $this->getAbsoluteModelNamespace()),
+            'path' => $this->getBasePath().DIRECTORY_SEPARATOR.'apis',
+            'fileName' => $this->getModelNameCamlized().'Controller.php',
+            'content' => $this->generateApiContent($this->getNamespace().'\\apis', $this->getModelNameCamlized().'Controller', $this->getAbsoluteModelNamespace()),
         ];
         
         // controller
 
         $files['controller'] = [
-            'path' =>  $this->getBasePath() . DIRECTORY_SEPARATOR . 'controllers',
-            'fileName' => $this->getModelNameCamlized() . 'Controller.php',
-            'content' => $this->generateControllerContent($this->getNamespace() . '\\controllers', $this->getModelNameCamlized() . 'Controller', $this->getAbsoluteModelNamespace()),
+            'path' =>  $this->getBasePath().DIRECTORY_SEPARATOR.'controllers',
+            'fileName' => $this->getModelNameCamlized().'Controller.php',
+            'content' => $this->generateControllerContent($this->getNamespace().'\\controllers', $this->getModelNameCamlized().'Controller', $this->getAbsoluteModelNamespace()),
         ];
         
         // model
 
         $files['model'] = [
-            'path' =>  $this->getModelBasePath() . DIRECTORY_SEPARATOR . 'models',
-            'fileName' => $this->getModelNameCamlized() . '.php',
+            'path' =>  $this->getModelBasePath().DIRECTORY_SEPARATOR.'models',
+            'fileName' => $this->getModelNameCamlized().'.php',
             'content' => $this->generateModelContent(
-                $this->getModelNamespace() . '\\models',
+                $this->getModelNamespace().'\\models',
                 $this->getModelNameCamlized(),
                 $this->apiEndpoint,
                 $this->getDbTableShema(),
@@ -438,19 +438,19 @@ 
             $this->generateFile($file);
         }
         
-        return $this->outputSuccess($this->generateBuildSummery($this->apiEndpoint, $this->getNamespace() . '\\apis\\' . $this->getModelNameCamlized() . 'Controller', $this->getModelNameCamlized(), $this->getSummaryControllerRoute()));
+        return $this->outputSuccess($this->generateBuildSummery($this->apiEndpoint, $this->getNamespace().'\\apis\\'.$this->getModelNameCamlized().'Controller', $this->getModelNameCamlized(), $this->getSummaryControllerRoute()));
     }
     
     protected function generateFile(array $file)
     {
         FileHelper::createDirectory($file['path']);
-        if (file_exists($file['path'] . DIRECTORY_SEPARATOR . $file['fileName'])) {
+        if (file_exists($file['path'].DIRECTORY_SEPARATOR.$file['fileName'])) {
             if (!$this->confirm("The File '{$file['fileName']}' already exists, do you want to override the existing file?")) {
                 return false;
             }
         }
         
-        if (FileHelper::writeFile($file['path'] . DIRECTORY_SEPARATOR . $file['fileName'], $file['content'])) {
+        if (FileHelper::writeFile($file['path'].DIRECTORY_SEPARATOR.$file['fileName'], $file['content'])) {
             $this->outputSuccess("Wrote file '{$file['fileName']}'.");
         } else {
             $this->outputError("Error while writing file '{$file['fileName']}'.");

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use yii\helpers\Console;
 use yii\helpers\Inflector;
 use yii\db\TableSchema;
-use luya\Boot;
 use luya\helpers\FileHelper;
 use luya\admin\ngrest\base\NgRestModelInterface;
 use yii\console\Exception;

core/console/commands/BlockController.php

Doc Comments +14 added lines

@@ -146,6 +146,11 @@ 
         ];
     }
     
+    /**
+     * @param string $type
+     * @param string $varName
+     * @param string $func
+     */
     private function getExtraVarDef($type, $varName, $func)
     {
         $info = [
@@ -173,6 +178,9 @@ 
         return false;
     }
 
+    /**
+     * @param string $type
+     */
     private function getVariableTypeOption($type)
     {
         $types = $this->getVariableTypesOptions();
@@ -180,11 +188,17 @@ 
         return $types[$type];
     }
 
+    /**
+     * @param string $type
+     */
     private function hasVariableTypeOption($type)
     {
         return array_key_exists($type, $this->getVariableTypesOptions());
     }
 
+    /**
+     * @param string $prefix
+     */
     private function placeholderCreator($prefix)
     {
         $this->output(PHP_EOL.'-> Create new '.$prefix, Console::FG_YELLOW);

Spacing +12 added lines, -12 removed lines

@@ -182,19 +182,19 @@ 
     private function getExtraVarDef($type, $varName, $func)
     {
         $info = [
-            'image-upload' => function ($varName) use ($func) {
+            'image-upload' => function($varName) use ($func) {
                 return 'BlockHelper::imageUpload($this->'.$func.'(\''.$varName.'\'), false, true),';
             },
-            'image-array-upload' => function ($varName) use ($func) {
+            'image-array-upload' => function($varName) use ($func) {
                 return 'BlockHelper::imageArrayUpload($this->'.$func.'(\''.$varName.'\'), false, true),';
             },
-            'file-upload' => function ($varName) use ($func) {
+            'file-upload' => function($varName) use ($func) {
                 return 'BlockHelper::fileUpload($this->'.$func.'(\''.$varName.'\'), true),';
             },
-            'file-array-upload' => function ($varName) use ($func) {
+            'file-array-upload' => function($varName) use ($func) {
                 return 'BlockHelper::fileArrayUpload($this->'.$func.'(\''.$varName.'\'), true),';
             },
-            'cms-page' => function ($varName) use ($func) {
+            'cms-page' => function($varName) use ($func) {
                 return 'Yii::$app->menu->findOne([\'nav_id\' => $this->'.$func.'(\''.$varName.'\', 0)]),';
             },
         ];
@@ -288,7 +288,7 @@ 
             return 'app\\blocks';
         }
 
-        return Yii::$app->getModule($this->moduleName)->getNamespace()  . '\\blocks';
+        return Yii::$app->getModule($this->moduleName)->getNamespace().'\\blocks';
     }
 
     /**
@@ -397,8 +397,8 @@ 
             }
         }
         
-        $folder = $this->getFileBasePath() . DIRECTORY_SEPARATOR . 'blocks';
-        $filePath = $folder . DIRECTORY_SEPARATOR . $this->blockName . '.php';
+        $folder = $this->getFileBasePath().DIRECTORY_SEPARATOR.'blocks';
+        $filePath = $folder.DIRECTORY_SEPARATOR.$this->blockName.'.php';
         
         sort($this->phpdoc);
         
@@ -423,14 +423,14 @@ 
         if (FileHelper::createDirectory($folder) && FileHelper::writeFile($filePath, $content)) {
             
             // generate view file based on block object view context
-            $object = Yii::createObject(['class' => $this->getFileNamespace() . '\\' . $this->blockName]);
+            $object = Yii::createObject(['class' => $this->getFileNamespace().'\\'.$this->blockName]);
             $viewsFolder = Yii::getAlias($object->getViewPath());
-            $viewFilePath = $viewsFolder . DIRECTORY_SEPARATOR . $object->getViewFileName('php');
+            $viewFilePath = $viewsFolder.DIRECTORY_SEPARATOR.$object->getViewFileName('php');
             if (FileHelper::createDirectory($viewsFolder) && FileHelper::writeFile($viewFilePath, $this->generateViewFile($this->blockName))) {
-                $this->outputInfo('View file for the block has been created: ' . $viewFilePath);
+                $this->outputInfo('View file for the block has been created: '.$viewFilePath);
             }
             
-            return $this->outputSuccess("Block {$this->blockName} has been created: " . $filePath);
+            return $this->outputSuccess("Block {$this->blockName} has been created: ".$filePath);
         }
         
         return $this->outputError("Error while creating block '$filePath'");

core/base/BaseBootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
             // see if the module has a registerComponents method
             foreach ($module->registerComponents() as $componentId => $definition) {
                 if (!$app->has($componentId)) {
-                    Yii::trace('Register component ' . $componentId, __METHOD__);
+                    Yii::trace('Register component '.$componentId, __METHOD__);
                     $app->set($componentId, $definition);
                 }
             }

core/console/commands/ActiveWindowController.php

Spacing +3 added lines, -3 removed lines

@@ -55,11 +55,11 @@
         
         $module = Yii::$app->getModule($moduleId);
         
-        $folder = $module->basePath . DIRECTORY_SEPARATOR . 'aws';
+        $folder = $module->basePath.DIRECTORY_SEPARATOR.'aws';
         
-        $file = $folder . DIRECTORY_SEPARATOR . $className . '.php';
+        $file = $folder.DIRECTORY_SEPARATOR.$className.'.php';
         
-        $content = $this->renderWindowClassView($className, $module->getNamespace() . '\\aws', $moduleId);
+        $content = $this->renderWindowClassView($className, $module->getNamespace().'\\aws', $moduleId);
         
         FileHelper::createDirectory($folder);
         

core/console/commands/ModuleController.php

Doc Comments +1 added lines

@@ -17,6 +17,7 @@
     /**
      * Humanize the class name
      *
+     * @param string $name
      * @return string The humanized name.
      */
     public function humanizeName($name)

Spacing +14 added lines, -14 removed lines

@@ -106,23 +106,23 @@ 
             }
         }
         
-        $appModulesFolder = Yii::$app->basePath . DIRECTORY_SEPARATOR . 'modules';
-        $moduleFolder = $appModulesFolder . DIRECTORY_SEPARATOR . $moduleName;
+        $appModulesFolder = Yii::$app->basePath.DIRECTORY_SEPARATOR.'modules';
+        $moduleFolder = $appModulesFolder.DIRECTORY_SEPARATOR.$moduleName;
         
         if (file_exists($moduleFolder)) {
-            return $this->outputError("The folder " . $moduleFolder . " exists already.");
+            return $this->outputError("The folder ".$moduleFolder." exists already.");
         }
         
         $folders = [
             'basePath' => $moduleFolder,
-            'adminPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'admin',
-            'adminAwsPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . 'aws',
-            'adminMigrationPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . 'migrations',
-            'frontendPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend',
-            'frontendBlocksPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'blocks',
-            'frontendControllersPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'controllers',
-            'frontendViewsPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'views',
-            'modelsPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'models',
+            'adminPath' => $moduleFolder.DIRECTORY_SEPARATOR.'admin',
+            'adminAwsPath' => $moduleFolder.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.'aws',
+            'adminMigrationPath' => $moduleFolder.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.'migrations',
+            'frontendPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend',
+            'frontendBlocksPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'blocks',
+            'frontendControllersPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'controllers',
+            'frontendViewsPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'views',
+            'modelsPath' => $moduleFolder.DIRECTORY_SEPARATOR.'models',
         ];
 
         $ns = 'app\\modules\\'.$moduleName;
@@ -132,9 +132,9 @@ 
         }
         
         $contents = [
-            $moduleFolder. DIRECTORY_SEPARATOR . 'README.md' => $this->renderReadme($folders, $moduleName, $ns),
-            $moduleFolder. DIRECTORY_SEPARATOR . 'admin/Module.php' => $this->renderAdmin($folders, $moduleName, $ns),
-            $moduleFolder. DIRECTORY_SEPARATOR . 'frontend/Module.php' => $this->renderFrontend($folders, $moduleName, $ns),
+            $moduleFolder.DIRECTORY_SEPARATOR.'README.md' => $this->renderReadme($folders, $moduleName, $ns),
+            $moduleFolder.DIRECTORY_SEPARATOR.'admin/Module.php' => $this->renderAdmin($folders, $moduleName, $ns),
+            $moduleFolder.DIRECTORY_SEPARATOR.'frontend/Module.php' => $this->renderFrontend($folders, $moduleName, $ns),
         ];
         
         foreach ($contents as $fileName => $content) {

core/console/commands/ImportController.php

Spacing +3 added lines, -3 removed lines

@@ -164,18 +164,18 @@
             }
             
             foreach ($this->getLog() as $section => $value) {
-                $this->outputInfo(PHP_EOL . $section . ":");
+                $this->outputInfo(PHP_EOL.$section.":");
                 foreach ($value as $k => $v) {
                     if (is_array($v)) {
                         foreach ($v as $kk => $kv) {
                             if (is_array($kv)) {
-                                $this->output(" - {$kk}: " . print_r($kv, true));
+                                $this->output(" - {$kk}: ".print_r($kv, true));
                             } else {
                                 $this->output(" - {$kk}: {$kv}");
                             }
                         }
                     } else {
-                        $this->output(" - " . $v);
+                        $this->output(" - ".$v);
                     }
                 }
             }