Completed
Pull Request — master (#900)
by Martin
03:48
created
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.
core/base/ModuleReflection.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
         
98 98
         return [
99 99
             'module' => $this->module->id,
100
-            'route' => $this->module->id . '/' . $request['route'],
100
+            'route' => $this->module->id.'/'.$request['route'],
101 101
             'params' => $request['args'],
102 102
         ];
103 103
     }
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
             throw new InvalidConfigException(sprintf("Unable to create controller '%s' for module '%s'.", $requestRoute['route'], $this->module->id));
118 118
         }
119 119
         
120
-        Yii::info('LUYA module run module "'.$this->module->id.'" route ' . $requestRoute['route'], __METHOD__);
120
+        Yii::info('LUYA module run module "'.$this->module->id.'" route '.$requestRoute['route'], __METHOD__);
121 121
         
122 122
         // run the action on the provided controller object
123 123
         return $controller[0]->runAction($controller[1], $requestRoute['args']);
Please login to merge, or discard this patch.
core/traits/Application.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
     public function getWebroot()
64 64
     {
65 65
         if ($this->_webroot === null) {
66
-            $this->_webroot = realpath(realpath($this->basePath) . DIRECTORY_SEPARATOR . $this->webrootDirectory);
66
+            $this->_webroot = realpath(realpath($this->basePath).DIRECTORY_SEPARATOR.$this->webrootDirectory);
67 67
         }
68 68
         
69 69
         return $this->_webroot;
Please login to merge, or discard this patch.
core/helpers/FileHelper.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
     {
42 42
         $info = pathinfo($file);
43 43
         if (!isset($info['extension']) || empty($info['extension'])) {
44
-            $file = rtrim($file, '.') . '.' . $extension;
44
+            $file = rtrim($file, '.').'.'.$extension;
45 45
         }
46 46
 
47 47
         return $file;
Please login to merge, or discard this patch.
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -102,10 +102,10 @@
 block discarded – undo
102 102
      */
103 103
     public static function getFileContent($fileName)
104 104
     {
105
-    	try {
106
-    		return file_get_contents(Yii::getAlias($fileName));
107
-    	} catch (Exception $error) {
108
-    		return false;
109
-    	}
105
+        try {
106
+            return file_get_contents(Yii::getAlias($fileName));
107
+        } catch (Exception $error) {
108
+            return false;
109
+        }
110 110
     }
111 111
 }
Please login to merge, or discard this patch.
core/console/commands/CrudController.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -104,8 +104,8 @@
 block discarded – undo
104 104
                 case 'model':
105 105
 
106 106
                     if (!$extended) {
107
-                        $modelName = $modelName . 'NgRest';
108
-                        $item['file'] = $modelName . '.php';
107
+                        $modelName = $modelName.'NgRest';
108
+                        $item['file'] = $modelName.'.php';
109 109
                         $item['class'] = $modelName;
110 110
                     }
111 111
                     
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
     /**
17 17
      * Create a new frontend/admin module.
18 18
      * 
19
-     * @return number
19
+     * @return integer
20 20
      */
21 21
     public function actionCreate()
22 22
     {
Please login to merge, or discard this patch.
core/console/commands/views/crud/create_controller.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,5 +19,5 @@
 block discarded – undo
19 19
     /**
20 20
      * @var string $modelClass The path to the model which is the provider for the rules and fields.
21 21
      */
22
-    public $modelClass = '<?= $modelClass;?>';
22
+    public $modelClass = '<?= $modelClass; ?>';
23 23
 }
Please login to merge, or discard this patch.
core/console/commands/views/crud/create_api.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,5 +19,5 @@
 block discarded – undo
19 19
     /**
20 20
      * @var string $modelClass The path to the model which is the provider for the rules and fields.
21 21
      */
22
-    public $modelClass = '<?= $modelClass;?>';
22
+    public $modelClass = '<?= $modelClass; ?>';
23 23
 }
Please login to merge, or discard this patch.