luyadev / luya

core/console/commands/views/crud/create_api.php

Spacing +1 added lines, -1 removed lines

@@ -19,5 +19,5 @@
     /**
      * @var string $modelClass The path to the model which is the provider for the rules and fields.
      */
-    public $modelClass = '<?= $modelClass;?>';
+    public $modelClass = '<?= $modelClass; ?>';
 }
\ No newline at end of file

core/console/commands/views/crud/create_model.php

Spacing +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@ 
 /**
  * NgRest Model created with LUYA Version <?php echo $luyaVersion; ?>.
  *
-<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name . PHP_EOL; ?>
-<?php endforeach;?>
+<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name.PHP_EOL; ?>
+<?php endforeach; ?>
  */
 class <?= $className; ?> extends NgRestModel
 {
@@ -51,7 +51,7 @@ 
      */
     public $i18n = ['<?= implode("', '", $textFields); ?>'];
 
-<?php endif;?>
+<?php endif; ?>
     /**
      * @inheritdoc
      */
@@ -86,7 +86,7 @@ 
     {
         return [
         <?php foreach ($ngrestFieldConfig as $name => $type): ?>
-    '<?=$name; ?>' => '<?= $type;?>',
+    '<?=$name; ?>' => '<?= $type; ?>',
         <?php endforeach; ?>];
     }
     

core/console/commands/BlockController.php

Spacing +12 added lines, -12 removed lines

@@ -146,19 +146,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)]),';
             },
         ];
@@ -246,7 +246,7 @@ 
             return 'app\\blocks';
         }
 
-        return Yii::$app->getModule($this->moduleName)->getNamespace()  . '\\blocks';
+        return Yii::$app->getModule($this->moduleName)->getNamespace().'\\blocks';
     }
 
     protected function getFileBasePath()
@@ -343,8 +343,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);
         
@@ -368,14 +368,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'");

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);

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()
     {

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;
 
 /**

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']}'.");

core/web/Composition.php

Doc Comments +1 added lines, -1 removed lines

@@ -397,7 +397,7 @@
      * 
      * @see ArrayAccess::offsetGet()
      * @param string $offset The key to get from the array.
-     * @return mixed The value for the offset key from the array.
+     * @return string|boolean The value for the offset key from the array.
      */
     public function offsetGet($offset)
     {

core/web/UrlManager.php

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
      * @param string $from
      * @param string $to
      * @param string $subject
-     * @return mixed
+     * @return string
      * @since 1.0.0-rc1
      */
     public static function replaceFirst($from, $to, $subject)

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
         $route = $parsedRequest[0];
         
         
-        if (substr($route, 0, $length+1) == $composition.'/') {
+        if (substr($route, 0, $length + 1) == $composition.'/') {
             $parsedRequest[0] = substr($parsedRequest[0], $length);
         }
         
@@ -267,10 +267,10 @@ 
         $params = (array) $params;
         $url = $this->internalCreateUrl($params);
         if (strpos($url, '://') === false) {
-            $url = $this->getHostInfo() . $url;
+            $url = $this->getHostInfo().$url;
         }
         if (is_string($scheme) && ($pos = strpos($url, '://')) !== false) {
-            $url = $scheme . substr($url, $pos);
+            $url = $scheme.substr($url, $pos);
         }
         return $url;
     }

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);