Completed
Pull Request — master (#904)
by Martin
03:02
created
core/web/UrlManager.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
         if ($route === $composition) {
49 49
             $parsedRequest[0] = false;
50 50
         // now see if the composition (+1 as we add add trailing slash at the end) matches the cutted route request part, if so its composition prefix, remove it.
51
-        } elseif (substr($route, 0, $length+1) == $composition.'/') {
51
+        } elseif (substr($route, 0, $length + 1) == $composition.'/') {
52 52
             $parsedRequest[0] = substr($parsedRequest[0], $length);
53 53
         }
54 54
         // fix broken request urls
@@ -211,10 +211,10 @@  discard block
 block discarded – undo
211 211
         $params = (array) $params;
212 212
         $url = $this->internalCreateUrl($params);
213 213
         if (strpos($url, '://') === false) {
214
-            $url = $this->getHostInfo() . $url;
214
+            $url = $this->getHostInfo().$url;
215 215
         }
216 216
         if (is_string($scheme) && ($pos = strpos($url, '://')) !== false) {
217
-            $url = $scheme . substr($url, $pos);
217
+            $url = $scheme.substr($url, $pos);
218 218
         }
219 219
         return $url;
220 220
     }
Please login to merge, or discard this patch.
core/web/Twig.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -30,38 +30,38 @@  discard block
 block discarded – undo
30 30
     public function getFunctions()
31 31
     {
32 32
         return [
33
-            'menuFindAll' => function ($container, $parentNavId) {
33
+            'menuFindAll' => function($container, $parentNavId) {
34 34
                 return Yii::$app->menu->findAll(['container' => $container, 'parent_nav_id' => $parentNavId]);
35 35
             },
36
-            'menuFindOne' => function ($id) {
36
+            'menuFindOne' => function($id) {
37 37
                 return Yii::$app->menu->findOne(['id' => $id]);
38 38
             },
39
-            'menuCurrent' => function () {
39
+            'menuCurrent' => function() {
40 40
                 return Yii::$app->menu->current;
41 41
             },
42
-            'menuCurrentLevel' => function ($level) {
42
+            'menuCurrentLevel' => function($level) {
43 43
                 return Yii::$app->menu->getLevelCurrent($level);
44 44
             },
45
-            'menuLevelContainer' => function ($level) {
45
+            'menuLevelContainer' => function($level) {
46 46
                 return Yii::$app->menu->getLevelContainer($level);
47 47
             },
48
-            'asset' => function ($name) {
48
+            'asset' => function($name) {
49 49
                 return Yii::$app->getAssetManager()->getBundle($name);
50 50
             },
51
-            'filterApply' => function ($imageId, $filterIdentifier) {
51
+            'filterApply' => function($imageId, $filterIdentifier) {
52 52
                 return Yii::$app->storage->getImage($imageId)->applyFilter($filterIdentifier);
53 53
             },
54
-            'image' => function ($imageId) {
54
+            'image' => function($imageId) {
55 55
                 return Yii::$app->storage->getImage($imageId);
56 56
             },
57
-            'element' => function () {
57
+            'element' => function() {
58 58
                 $args = func_get_args();
59 59
                 $method = $args[0];
60 60
                 unset($args[0]);
61 61
 
62 62
                 return Yii::$app->element->run($method, $args);
63 63
             },
64
-            't' => function () {
64
+            't' => function() {
65 65
                 $args = func_get_args();
66 66
 
67 67
                 return call_user_func_array(['Yii', 't'], $args);
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
             $twig->addFunction(new Twig_SimpleFunction($name, $lambda));
80 80
         }
81 81
         
82
-        $twig->addFilter(new Twig_SimpleFilter('strftime', function ($timestamp, $format) {
82
+        $twig->addFilter(new Twig_SimpleFilter('strftime', function($timestamp, $format) {
83 83
             if (is_numeric($timestamp)) {
84 84
                 return strftime($format, $timestamp);
85 85
             }
Please login to merge, or discard this patch.
core/console/commands/MigrateController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
     protected function createMigration($class)
55 55
     {
56
-        $orig = $this->migrationPath . DIRECTORY_SEPARATOR . $class . '.php';
56
+        $orig = $this->migrationPath.DIRECTORY_SEPARATOR.$class.'.php';
57 57
         
58 58
         if (file_exists($orig)) {
59 59
             require_once $file;
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
         
72 72
         $module = $this->prompt("Could not find migration class. Please enter the module name who belongs to '$class.':");
73 73
         $dir = $this->getModuleMigrationDirectorie($module);
74
-        $file = $dir . DIRECTORY_SEPARATOR . $class . '.php';
74
+        $file = $dir.DIRECTORY_SEPARATOR.$class.'.php';
75 75
         if (file_exists($file)) {
76 76
             require_once $file;
77 77
             return new $class();
Please login to merge, or discard this patch.
core/console/commands/HealthController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
         
37 37
         @chdir(Yii::getAlias('@app'));
38 38
 
39
-        $this->output('The directory the health commands is applying to: ' . Yii::getAlias('@app'));
39
+        $this->output('The directory the health commands is applying to: '.Yii::getAlias('@app'));
40 40
         
41 41
         foreach ($this->folders as $folder => $writable) {
42 42
             if (!file_exists($folder)) {
Please login to merge, or discard this patch.
core/console/commands/StorageController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -25,21 +25,21 @@
 block discarded – undo
25 25
 
26 26
         if (count($fileList) !== 0) {
27 27
             $success = true;
28
-            if ($this->confirm("Do you want to delete " . count($fileList) . " files which are not referenced in the database any more?")) {
28
+            if ($this->confirm("Do you want to delete ".count($fileList)." files which are not referenced in the database any more?")) {
29 29
                 foreach ($fileList as $file) {
30 30
                     if (is_file($file) && @unlink($file)) {
31
-                        $this->outputSuccess($file . " successful deleted.");
31
+                        $this->outputSuccess($file." successful deleted.");
32 32
                     } elseif (is_file($file)) {
33
-                        $this->outputError($file . " could not be deleted!");
33
+                        $this->outputError($file." could not be deleted!");
34 34
                         $success = false;
35 35
                     } else {
36
-                        $this->outputError($file . " could not be found!");
36
+                        $this->outputError($file." could not be found!");
37 37
                         $success = false;
38 38
                     }
39 39
                 }
40 40
             }
41 41
             if ($success) {
42
-                return $this->outputSuccess(count($fileList) . " files successful deleted.");
42
+                return $this->outputSuccess(count($fileList)." files successful deleted.");
43 43
             }
44 44
             return $this->outputError("Cleanup could not be completed. Please look into error above.");
45 45
         }
Please login to merge, or discard this patch.
core/console/commands/ActiveWindowController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,13 +31,13 @@
 block discarded – undo
31 31
         
32 32
         $module = Yii::$app->getModule($moduleId);
33 33
         
34
-        $folder = $module->basePath . DIRECTORY_SEPARATOR . 'aws';
34
+        $folder = $module->basePath.DIRECTORY_SEPARATOR.'aws';
35 35
         
36
-        $file = $folder . DIRECTORY_SEPARATOR . $className . '.php';
36
+        $file = $folder.DIRECTORY_SEPARATOR.$className.'.php';
37 37
         
38 38
         $content = $this->view->render('@luya/console/commands/views/aw/create.php', [
39 39
             'className' => $className,
40
-            'namespace' => $module->getNamespace() . '\\aws',
40
+            'namespace' => $module->getNamespace().'\\aws',
41 41
             'luya' => $this->getLuyaVersion(),
42 42
             'moduleId' => $moduleId,
43 43
             'alias' => Inflector::humanize(Inflector::camel2words($className)),
Please login to merge, or discard this patch.
core/components/Mail.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@
 block discarded – undo
168 168
                         return true;
169 169
                     } else {
170 170
                         $data = [$this->host, $this->port, $this->smtpSecure, $this->username];
171
-                        throw new Exception('Authentication failed ('.implode(',', $data).'): '.$smtp->getLastReply() . PHP_EOL . print_r($smtp->getError(), true));
171
+                        throw new Exception('Authentication failed ('.implode(',', $data).'): '.$smtp->getLastReply().PHP_EOL.print_r($smtp->getError(), true));
172 172
                     }
173 173
                 } else {
174 174
                     throw new Exception('HELO failed: '.$smtp->getLastReply());
Please login to merge, or discard this patch.
core/base/Widget.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,6 +11,6 @@
 block discarded – undo
11 11
     {
12 12
         $class = new ReflectionClass($this);
13 13
         
14
-        return '@app/views/widgets/' . Inflector::camel2id($class->getShortName());
14
+        return '@app/views/widgets/'.Inflector::camel2id($class->getShortName());
15 15
     }
16 16
 }
Please login to merge, or discard this patch.
core/base/Bootstrap.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
             if (method_exists($module, 'registerComponents')) {
95 95
                 foreach ($module->registerComponents() as $componentId => $definition) {
96 96
                     if (!$app->has($componentId)) {
97
-                        Yii::trace('Register component ' . $componentId, __METHOD__);
97
+                        Yii::trace('Register component '.$componentId, __METHOD__);
98 98
                         $app->set($componentId, $definition);
99 99
                     }
100 100
                 }
Please login to merge, or discard this patch.