luyadev / luya

dev/TranslationController.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
         $messageFiles = glob("$repoPath/src/**/messages/$language/$filename.php") ?: glob("$repoPath/src/messages/$language/$filename.php");
 
         $this->outputInfo('Following files will be affected:');
-        $this->output(implode("\n", $messageFiles) . "\n");
+        $this->output(implode("\n", $messageFiles)."\n");
 
         $key = $this->prompt('Insert translation key:');
         $text = $this->prompt('Insert translation text:');
@@ -59,7 +59,7 @@ 
 
         if (!$this->dry) {
             if (exec("[ -d $repoPath/.git ] && command -v git")) {
-                $diffCommand = "git --git-dir=$repoPath/.git --work-tree=$repoPath diff -- " . str_replace($repoPath . '/', '', implode(" ", $messageFiles));
+                $diffCommand = "git --git-dir=$repoPath/.git --work-tree=$repoPath diff -- ".str_replace($repoPath.'/', '', implode(" ", $messageFiles));
                 exec($diffCommand, $diff);
                 $this->output(implode("\n", $diff));
             }

core/web/Controller.php

Spacing +3 added lines, -3 removed lines

@@ -33,14 +33,14 @@
     {
         if ($this->module instanceof Module) {
             if ($this->module->useAppViewPath) {
-                return '@app/views/' . $this->module->id . '/' . $this->id;
+                return '@app/views/'.$this->module->id.'/'.$this->id;
             } elseif (is_array($this->module->viewMap)) {
-                $currentAction = $this->id . '/' . ($this->action ? $this->action->id : $this->defaultAction);
+                $currentAction = $this->id.'/'.($this->action ? $this->action->id : $this->defaultAction);
                 foreach ($this->module->viewMap as $action => $viewPath) {
 
                     // Special case for map all views of controller
                     if ($action === '*') {
-                        return $viewPath . '/' . $this->id;
+                        return $viewPath.'/'.$this->id;
                     } elseif (fnmatch($action, $currentAction)) {
                         return $viewPath;
                     }

core/web/Svg.php

Spacing +7 added lines, -7 removed lines

@@ -100,25 +100,25 @@ 
     public function run()
     {
         // Cache generated code
-        return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass], function () {
+        return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass], function() {
 
             // Check if file ends with .svg, if not add the extension
-            $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file . '.svg';
+            $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file.'.svg';
 
             if ($this->symbolMode) {
-                $svgPath = Yii::$app->view->publicHtml . '/' . $svgFile;
+                $svgPath = Yii::$app->view->publicHtml.'/'.$svgFile;
 
-                return '<svg class="symbol symbol--' . $this->symbolName . '' . ($this->cssClass ? ' ' . $this->cssClass : '') . '"><use class="symbol__use" xlink:href="' . $svgPath . '#' . $this->symbolName . '" /></svg>';
+                return '<svg class="symbol symbol--'.$this->symbolName.''.($this->cssClass ? ' '.$this->cssClass : '').'"><use class="symbol__use" xlink:href="'.$svgPath.'#'.$this->symbolName.'" /></svg>';
             } else {
                 // Build the full svg file path
-                $svgPath = $this->folder . DIRECTORY_SEPARATOR . $svgFile;
+                $svgPath = $this->folder.DIRECTORY_SEPARATOR.$svgFile;
 
                 // Get the svg contents
                 $content = FileHelper::getFileContent($svgPath);
 
                 // If a cssClass string is given, add it to the <svg> tag
                 if ($this->cssClass && is_string($this->cssClass)) {
-                    $content = preg_replace('/<svg/', '<svg class="' . $this->cssClass . '"', $content);
+                    $content = preg_replace('/<svg/', '<svg class="'.$this->cssClass.'"', $content);
                 }
 
                 if ($content) {
@@ -126,7 +126,7 @@ 
                 }
             }
 
-            throw new Exception('Unable to access SVG File: ' . $svgPath);
+            throw new Exception('Unable to access SVG File: '.$svgPath);
         });
     }
 }

core/web/Element.php

Spacing +1 added lines, -1 removed lines

@@ -255,6 +255,6 @@
     {
         $view = new View();
         $view->autoRegisterCsrf = false;
-        return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . FileHelper::ensureExtension($file, 'php'), $args);
+        return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.FileHelper::ensureExtension($file, 'php'), $args);
     }
 }

core/helpers/StringHelper.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
             return true;
         }
         
-        return ($value == (string)(float) $value);
+        return ($value == (string) (float) $value);
     }
     
     /**
@@ -205,7 +205,7 @@ 
         // we could not find any match, therefore use casual truncate method.
         if ($first === false) {
             // as the length value in truncate middle stands for to the left and to the right, we multiple this value with 2
-            return self::truncate($content, ($length*2), $affix);
+            return self::truncate($content, ($length * 2), $affix);
         }
 
         $last = $first + mb_strlen($word);
@@ -217,9 +217,9 @@ 
 
         // string before
         $before = (count($left) > $length) ? $affix.implode("", array_slice($left, -$length)) : implode("", $left);
-        $after = (count($right) > $length) ? implode("", array_slice($right, 0, $length)) . $affix : implode("", $right);
+        $after = (count($right) > $length) ? implode("", array_slice($right, 0, $length)).$affix : implode("", $right);
 
-        return $before . implode("", $middle) . $after;
+        return $before.implode("", $middle).$after;
     }
 
     /**

Doc Comments +3 added lines, -4 removed lines

@@ -89,7 +89,6 @@ 
      * ```
      *
      * @param $value The value on which the filter conditions should be applied on.
-     * @param array|string $filters An array of filter conditions, if a string is given he will be exploded by commas.
      * @param boolean $caseSensitive Whether to match value even when lower/upper case is not correct/same.
      * @return bool Returns true if one of the given filter conditions matches.
      * @since 1.3.0
@@ -170,7 +169,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
      */
     public static function replaceFirst($search, $replace, $subject)
     {
@@ -200,7 +199,7 @@ 
      * }
      * ```
      *
-     * @param string|array $needle The char or word to find in the $haystack. Can be an array to multi find words or char in the string.
+     * @param string $needle The char or word to find in the $haystack. Can be an array to multi find words or char in the string.
      * @param string $haystack The haystack where the $needle string should be looked up. A string or phrase with words.
      * @param boolean $strict If an array of needles is provided the $strict parameter defines whether all keys must be found ($strict = true) or just one result must be found ($strict = false).
      * @return boolean If an array of values is provided the response may change depending on $findAll.
@@ -237,7 +236,7 @@ 
      * @param string $content The content to minify.
      * @param array $options Optional arguments to provide for minification:
      * - comments: boolean, where html comments should be removed or not. defaults to false
-     * @return mixed Returns the minified content.
+     * @return string Returns the minified content.
      * @since 1.0.7
      */
     public static function minify($content, array $options = [])

core/web/jsonld/EventTrait.php

Doc Comments +4 added lines, -4 removed lines

@@ -169,7 +169,7 @@ 
     /**
      * The time admission will commence.
      *
-     * @param DateTime $doorTime
+     * @param DateTimeValue $doorTime
      * @return static
      */
     public function setDoorTime(DateTimeValue $doorTime)
@@ -191,7 +191,7 @@ 
     /**
      * The duration of the item (movie, audio recording, event, etc.) in ISO 8601 date format.
      *
-     * @param Duration $duration
+     * @param DurationValue $duration
      * @return static
      */
     public function setDuration(DurationValue $duration)
@@ -213,7 +213,7 @@ 
     /**
      * The end date and time of the item (in ISO 8601 date format).
      *
-     * @param Date|DateTime $endDate
+     * @param DateTimeValue $endDate
      * @return static
      */
     public function setEndDate(DateTimeValue $endDate)
@@ -261,7 +261,7 @@ 
      * Please use one of the language codes from the IETF BCP 47 standard. See also availableLanguage.
      * Supersedes language.
      *
-     * @param Language|Text $inLanguage
+     * @param LanguageValue $inLanguage
      * @return static
      */
     public function setInLanguage(LanguageValue $inLanguage)

core/base/ModuleReflection.php

Spacing +4 added lines, -4 removed lines

@@ -216,7 +216,7 @@ 
         
         return [
             'module' => $this->module->id,
-            'route' => $this->module->id . '/' . $request['route'],
+            'route' => $this->module->id.'/'.$request['route'],
             'params' => $request['originalArgs'],
         ];
     }
@@ -237,7 +237,7 @@ 
             throw new NotFoundHttpException(sprintf("Unable to create controller '%s' for module '%s'.", $requestRoute['route'], $this->module->id));
         }
         
-        Yii::debug('LUYA module run module "'.$this->module->id.'" route ' . $requestRoute['route'], __METHOD__);
+        Yii::debug('LUYA module run module "'.$this->module->id.'" route '.$requestRoute['route'], __METHOD__);
         
         $this->controller = $controller[0];
         $originalController = Yii::$app->controller;
@@ -248,7 +248,7 @@ 
          *
          * @see https://github.com/luyadev/luya/issues/1730
          */
-        $this->controller->on(Controller::EVENT_BEFORE_ACTION, function ($event) {
+        $this->controller->on(Controller::EVENT_BEFORE_ACTION, function($event) {
             Yii::$app->controller = $this->controller;
         });
         /**
@@ -256,7 +256,7 @@ 
          *
          * @see https://github.com/luyadev/luya/issues/1768
          */
-        $this->controller->on(Controller::EVENT_AFTER_ACTION, function ($event) use ($originalController) {
+        $this->controller->on(Controller::EVENT_AFTER_ACTION, function($event) use ($originalController) {
             Yii::$app->controller = $originalController;
         });
         

core/web/EmailLink.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     /**
      * Getter method for the e-mail.
      *
-     * @return string|boolean Returns the e-mail from the setter method, if mail is not valid false is returned.
+     * @return string|false Returns the e-mail from the setter method, if mail is not valid false is returned.
      */
     public function getEmail()
     {

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
      */
     public function getHref()
     {
-        return empty($this->getEmail()) ? null : 'mailto:' . $this->getEmail();
+        return empty($this->getEmail()) ? null : 'mailto:'.$this->getEmail();
     }
 
     /**

core/console/commands/ThemeController.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use luya\theme\ThemeConfig;
 use Yii;
 use yii\helpers\Console;
-use yii\helpers\Inflector;
 
 /**
  * Command to create a new LUYA theme.

Doc Comments +2 added lines, -2 removed lines

@@ -144,7 +144,7 @@ 
     }
     
     /**
-     * @param $themeName
+     * @param string $themeName
      *
      * @return string
      */
@@ -165,7 +165,7 @@ 
     }
     
     /**
-     * @param $themeName
+     * @param string $themeName
      *
      * @return string
      */

Spacing +13 added lines, -13 removed lines

@@ -47,7 +47,7 @@ 
         
         $availableModules = implode(', ', array_column(Yii::$app->getFrontendModules(), 'id'));
         $themeLocation = $this->prompt("Enter the theme location where to generate (as path alias e.g. app, $availableModules):", ['default' => 'app']);
-        $themeLocation = '@' . ltrim($themeLocation, '@');
+        $themeLocation = '@'.ltrim($themeLocation, '@');
         
         preg_match("#^@[A-z]+#", $themeLocation, $newThemeLocation);
         
@@ -59,15 +59,15 @@ 
             }
         }
         
-        $basePath = $themeLocation . '/themes/' . $themeName;
+        $basePath = $themeLocation.'/themes/'.$themeName;
         $themeFolder = Yii::getAlias($basePath);
         
         if (file_exists($themeFolder)) {
-            return $this->outputError("The folder " . $themeFolder . " exists already.");
+            return $this->outputError("The folder ".$themeFolder." exists already.");
         }
         
-        $this->outputInfo("Theme path alias: " . $basePath);
-        $this->outputInfo("Theme real path: " . $themeFolder);
+        $this->outputInfo("Theme path alias: ".$basePath);
+        $this->outputInfo("Theme real path: ".$themeFolder);
         if (!$this->confirm("Do you want continue?")) {
             return $this->outputError('Abort by user.');
         }
@@ -81,15 +81,15 @@ 
         ];
         
         foreach ($folders as $folder) {
-            FileHelper::createDirectory($themeFolder . DIRECTORY_SEPARATOR . $folder);
+            FileHelper::createDirectory($themeFolder.DIRECTORY_SEPARATOR.$folder);
         }
         
         $contents = [
-            $themeFolder. DIRECTORY_SEPARATOR . 'theme.json' => $this->renderJson($basePath, $themeName),
-            $themeFolder. DIRECTORY_SEPARATOR . ucfirst($themeName) . 'Asset.php' => $this->renderAssetClass($themeName),
-            $themeFolder. DIRECTORY_SEPARATOR . 'resources/'. $themeName .'.css' => '',
-            $themeFolder. DIRECTORY_SEPARATOR . 'views/layouts/theme.php' => $this->renderLayout($themeName),
-            $themeFolder. DIRECTORY_SEPARATOR . 'views/cmslayouts/theme.php' => $this->renderCmsLayout($themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.'theme.json' => $this->renderJson($basePath, $themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.ucfirst($themeName).'Asset.php' => $this->renderAssetClass($themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.'resources/'.$themeName.'.css' => '',
+            $themeFolder.DIRECTORY_SEPARATOR.'views/layouts/theme.php' => $this->renderLayout($themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.'views/cmslayouts/theme.php' => $this->renderCmsLayout($themeName),
         ];
         
         foreach ($contents as $fileName => $content) {
@@ -150,7 +150,7 @@ 
      */
     private function renderAssetClass($themeName)
     {
-        $className = ucfirst($themeName) . 'Asset';
+        $className = ucfirst($themeName).'Asset';
         return "<?php
 namespace app\\themes\\{$themeName};
 
@@ -171,7 +171,7 @@ 
      */
     private function renderLayout($themeName)
     {
-        $className = ucfirst($themeName) . 'Asset';
+        $className = ucfirst($themeName).'Asset';
     
         return '<?php
 /**