luyadev / luya

core/helpers/Url.php

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
     public static function ensureHttp($url, $https = false)
     {
         if (!preg_match("~^(?:f|ht)tps?://~i", $url)) {
-            $url = ($https ? "https://" : "http://") . $url;
+            $url = ($https ? "https://" : "http://").$url;
         }
         
         return $url;

core/console/commands/BlockController.php

Spacing +8 added lines, -8 removed lines

@@ -64,11 +64,11 @@ 
     private function getExtraVarDef($type, $varName, $func)
     {
         $info = [
-            'image-upload' => function ($varName) use ($func) { return '$this->zaaImageUpload($this->'.$func.'(\''.$varName.'\'), false, true),'; },
-            'image-array-upload' => function ($varName) use ($func) { return '$this->zaaImageArrayUpload($this->'.$func.'(\''.$varName.'\'), false, true),'; },
-            'file-upload' => function ($varName) use ($func) { return '$this->zaaFileUpload($this->'.$func.'(\''.$varName.'\'), true),'; },
-            'file-array-upload' => function ($varName) use ($func) { return '$this->zaaFileArrayUpload($this->'.$func.'(\''.$varName.'\'), true),'; },
-            'cms-page' => function ($varName) use ($func) { return 'Yii::$app->menu->findOne([\'nav_id\' => $this->'.$func.'(\''.$varName.'\', 0)]),'; },
+            'image-upload' => function($varName) use ($func) { return '$this->zaaImageUpload($this->'.$func.'(\''.$varName.'\'), false, true),'; },
+            'image-array-upload' => function($varName) use ($func) { return '$this->zaaImageArrayUpload($this->'.$func.'(\''.$varName.'\'), false, true),'; },
+            'file-upload' => function($varName) use ($func) { return '$this->zaaFileUpload($this->'.$func.'(\''.$varName.'\'), true),'; },
+            'file-array-upload' => function($varName) use ($func) { return '$this->zaaFileArrayUpload($this->'.$func.'(\''.$varName.'\'), true),'; },
+            'cms-page' => function($varName) use ($func) { return 'Yii::$app->menu->findOne([\'nav_id\' => $this->'.$func.'(\''.$varName.'\', 0)]),'; },
         ];
         
         if (array_key_exists($type, $info)) {
@@ -186,15 +186,15 @@ 
         $content .= '     * @var bool Choose whether block is a layout/container/segmnet/section block or not, Container elements will be optically displayed'.PHP_EOL;
         $content .= '     * in a different way for a better user experience. Container block will not display isDirty colorizing.'.PHP_EOL;
         $content .= '     */'.PHP_EOL;
-        $content .= '    public $isContainer = false;'.PHP_EOL . PHP_EOL;
+        $content .= '    public $isContainer = false;'.PHP_EOL.PHP_EOL;
         $content .= '    /**'.PHP_EOL;
         $content .= '     * @var bool Choose whether a block can be cached trough the caching component. Be carefull with caching container blocks.'.PHP_EOL;
         $content .= '     */'.PHP_EOL;
-        $content .= '    public $cacheEnabled = false;'.PHP_EOL . PHP_EOL;
+        $content .= '    public $cacheEnabled = false;'.PHP_EOL.PHP_EOL;
         $content .= '    /**'.PHP_EOL;
         $content .= '     * @var int The cache lifetime for this block in seconds (3600 = 1 hour), only affects when cacheEnabled is true'.PHP_EOL;
         $content .= '     */'.PHP_EOL;
-        $content .= '    public $cacheExpiration = 3600;'.PHP_EOL . PHP_EOL;
+        $content .= '    public $cacheExpiration = 3600;'.PHP_EOL.PHP_EOL;
         
         // method name
         $content .= '    public function name()'.PHP_EOL;

core/traits/ErrorHandler.php

Spacing +2 added lines, -2 removed lines

@@ -114,9 +114,9 @@
             $_file = $exception->getFile();
             $_line = $exception->getLine();
         } elseif (is_string($exception)) {
-            $_message = 'exception string: ' . $exception;
+            $_message = 'exception string: '.$exception;
         } elseif (is_array($exception)) {
-            $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: ' . print_r($exception, true);
+            $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: '.print_r($exception, true);
             $_file = isset($exception['file']) ? $exception['file'] : __FILE__;
             $_line = isset($exception['line']) ? $exception['line'] : __LINE__;
         }

core/console/commands/StorageController.php

Spacing +6 added lines, -6 removed lines

@@ -28,26 +28,26 @@
                 $this->output($fileName);
             }
             //$this->output(print_r($fileList, true));
-            $this->outputInfo(count($fileList) . " files to remove.");
+            $this->outputInfo(count($fileList)." files to remove.");
         }
 
         if (count($fileList) !== 0) {
             $success = true;
-            if ($this->confirm("Do you want to delete " . count($fileList) . " files which are not referenced in the database any more? (can not be undon, maybe create a backup first!)")) {
+            if ($this->confirm("Do you want to delete ".count($fileList)." files which are not referenced in the database any more? (can not be undon, maybe create a backup first!)")) {
                 foreach ($fileList as $file) {
                     if (is_file($file) && @unlink($file)) {
-                        $this->outputSuccess($file . " successful deleted.");
+                        $this->outputSuccess($file." successful deleted.");
                     } elseif (is_file($file)) {
-                        $this->outputError($file . " could not be deleted!");
+                        $this->outputError($file." could not be deleted!");
                         $success = false;
                     } else {
-                        $this->outputError($file . " could not be found!");
+                        $this->outputError($file." could not be found!");
                         $success = false;
                     }
                 }
             }
             if ($success) {
-                return $this->outputSuccess(count($fileList) . " files successful deleted.");
+                return $this->outputSuccess(count($fileList)." files successful deleted.");
             }
             return $this->outputError("Cleanup could not be completed. Please look into error above.");
         }

core/console/commands/ImportController.php

Spacing +7 added lines, -7 removed lines

@@ -128,7 +128,7 @@ 
             $this->verbosePrint('Run import index', __METHOD__);
             foreach (Yii::$app->getModules() as $id => $module) {
                 if ($module instanceof \luya\base\Module) {
-                    $this->verbosePrint('collect module importers from module: ' . $id, __METHOD__);
+                    $this->verbosePrint('collect module importers from module: '.$id, __METHOD__);
                     $response = $module->import($this);
                     if (is_array($response)) { // importer returns an array with class names
                         foreach ($response as $class) {
@@ -150,9 +150,9 @@ 
             ksort($queue);
     
             foreach ($queue as $pos => $object) {
-                $this->verbosePrint("run object '" .$object->className() . " on pos $pos.", __METHOD__);
+                $this->verbosePrint("run object '".$object->className()." on pos $pos.", __METHOD__);
                 $objectResponse = $object->run();
-                $this->verbosePrint("run object response: " . var_export($objectResponse, true), __METHOD__);
+                $this->verbosePrint("run object response: ".var_export($objectResponse, true), __METHOD__);
             }
     
             if (Yii::$app->hasModule('admin')) {
@@ -160,21 +160,21 @@ 
                 Yii::$app->db->createCommand()->update('admin_user', ['force_reload' => 1])->execute();
             }
     
-            $this->verbosePrint('importer finished, get log output: ' . var_export($this->getLog(), true), __METHOD__);
+            $this->verbosePrint('importer finished, get log output: '.var_export($this->getLog(), true), __METHOD__);
             
             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);
                     }
                 }
             }