luyadev / luya

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/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/web/Composition.php

Doc Comments +1 added lines, -1 removed lines

@@ -398,7 +398,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

@@ -187,7 +187,7 @@
      * Remove the base url from a route
      *
      * @param string $route The route where the baseUrl should be removed from.
-     * @return mixed
+     * @return string
      */
     public function removeBaseUrl($route)
     {

Spacing +3 added lines, -3 removed lines

@@ -94,7 +94,7 @@ 
         $length = strlen($composition);
         $route = $parsedRequest[0];
         
-        if (substr($route, 0, $length+1) == $composition.'/') {
+        if (substr($route, 0, $length + 1) == $composition.'/') {
             $parsedRequest[0] = substr($parsedRequest[0], $length);
         }
         
@@ -302,10 +302,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/ModuleReflection.php

Spacing +2 added lines, -2 removed lines

@@ -190,7 +190,7 @@ 
         
         return [
             'module' => $this->module->id,
-            'route' => $this->module->id . '/' . $request['route'],
+            'route' => $this->module->id.'/'.$request['route'],
             'params' => $request['args'],
         ];
     }
@@ -212,7 +212,7 @@ 
             throw new NotFoundHttpException(sprintf("Unable to create controller '%s' for module '%s'.", $requestRoute['route'], $this->module->id));
         }
         
-        Yii::info('LUYA module run module "'.$this->module->id.'" route ' . $requestRoute['route'], __METHOD__);
+        Yii::info('LUYA module run module "'.$this->module->id.'" route '.$requestRoute['route'], __METHOD__);
         
         /**
          * issue: https://github.com/zephir/luya/issues/754

core/base/Widget.php

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
         // get reflection
         $class = new ReflectionClass($this);
         // get path with alias
-        return '@app/views/widgets/' . Inflector::camel2id($class->getShortName());
+        return '@app/views/widgets/'.Inflector::camel2id($class->getShortName());
     }
 }

core/web/Twig.php

Spacing +11 added lines, -11 removed lines

@@ -41,38 +41,38 @@ 
     public function getFunctions()
     {
         return [
-            'menuFindAll' => function ($container, $parentNavId) {
+            'menuFindAll' => function($container, $parentNavId) {
                 return Yii::$app->menu->findAll(['container' => $container, 'parent_nav_id' => $parentNavId]);
             },
-            'menuFindOne' => function ($id) {
+            'menuFindOne' => function($id) {
                 return Yii::$app->menu->findOne(['id' => $id]);
             },
-            'menuCurrent' => function () {
+            'menuCurrent' => function() {
                 return Yii::$app->menu->current;
             },
-            'menuCurrentLevel' => function ($level) {
+            'menuCurrentLevel' => function($level) {
                 return Yii::$app->menu->getLevelCurrent($level);
             },
-            'menuLevelContainer' => function ($level) {
+            'menuLevelContainer' => function($level) {
                 return Yii::$app->menu->getLevelContainer($level);
             },
-            'asset' => function ($name) {
+            'asset' => function($name) {
                 return Yii::$app->getAssetManager()->getBundle($name);
             },
-            'filterApply' => function ($imageId, $filterIdentifier) {
+            'filterApply' => function($imageId, $filterIdentifier) {
                 return Yii::$app->storage->getImage($imageId)->applyFilter($filterIdentifier);
             },
-            'image' => function ($imageId) {
+            'image' => function($imageId) {
                 return Yii::$app->storage->getImage($imageId);
             },
-            'element' => function () {
+            'element' => function() {
                 $args = func_get_args();
                 $method = $args[0];
                 unset($args[0]);
 
                 return Yii::$app->element->getElement($method, $args);
             },
-            't' => function () {
+            't' => function() {
                 $args = func_get_args();
 
                 return call_user_func_array(['Yii', 't'], $args);
@@ -111,7 +111,7 @@ 
             $twig->addFunction(new Twig_SimpleFunction($name, $lambda));
         }
         
-        $twig->addFilter(new Twig_SimpleFilter('strftime', function ($timestamp, $format) {
+        $twig->addFilter(new Twig_SimpleFilter('strftime', function($timestamp, $format) {
             if (is_numeric($timestamp)) {
                 return strftime($format, $timestamp);
             }