Completed
Pull Request — master (#1040)
by Carsten
04:04
created
core/traits/CacheableTrait.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -73,6 +73,7 @@
 block discarded – undo
73 73
      * @param string $key The identifier key
74 74
      * @param mixed $value The value to store in the cache component.
75 75
      * @param \yii\caching\Dependency $dependency Dependency of the cached item. If the dependency changes, the corresponding value in the cache will be invalidated when it is fetched via get(). This parameter is ignored if $serializer is false.
76
+     * @param integer $cacheExpiration
76 77
      * @return void
77 78
      */
78 79
     public function setHasCache($key, $value, $dependency = null, $cacheExpiration = null)
Please login to merge, or discard this patch.
core/console/commands/StorageController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -28,26 +28,26 @@
 block discarded – undo
28 28
                 $this->output($fileName);
29 29
             }
30 30
             //$this->output(print_r($fileList, true));
31
-            $this->outputInfo(count($fileList) . " files to remove.");
31
+            $this->outputInfo(count($fileList)." files to remove.");
32 32
         }
33 33
 
34 34
         if (count($fileList) !== 0) {
35 35
             $success = true;
36
-            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!)")) {
36
+            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!)")) {
37 37
                 foreach ($fileList as $file) {
38 38
                     if (is_file($file) && @unlink($file)) {
39
-                        $this->outputSuccess($file . " successful deleted.");
39
+                        $this->outputSuccess($file." successful deleted.");
40 40
                     } elseif (is_file($file)) {
41
-                        $this->outputError($file . " could not be deleted!");
41
+                        $this->outputError($file." could not be deleted!");
42 42
                         $success = false;
43 43
                     } else {
44
-                        $this->outputError($file . " could not be found!");
44
+                        $this->outputError($file." could not be found!");
45 45
                         $success = false;
46 46
                     }
47 47
                 }
48 48
             }
49 49
             if ($success) {
50
-                return $this->outputSuccess(count($fileList) . " files successful deleted.");
50
+                return $this->outputSuccess(count($fileList)." files successful deleted.");
51 51
             }
52 52
             return $this->outputError("Cleanup could not be completed. Please look into error above.");
53 53
         }
Please login to merge, or discard this patch.
core/console/commands/ImportController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
             $this->verbosePrint('Run import index', __METHOD__);
129 129
             foreach (Yii::$app->getModules() as $id => $module) {
130 130
                 if ($module instanceof \luya\base\Module) {
131
-                    $this->verbosePrint('collect module importers from module: ' . $id, __METHOD__);
131
+                    $this->verbosePrint('collect module importers from module: '.$id, __METHOD__);
132 132
                     $response = $module->import($this);
133 133
                     if (is_array($response)) { // importer returns an array with class names
134 134
                         foreach ($response as $class) {
@@ -150,9 +150,9 @@  discard block
 block discarded – undo
150 150
             ksort($queue);
151 151
     
152 152
             foreach ($queue as $pos => $object) {
153
-                $this->verbosePrint("run object '" .$object->className() . " on pos $pos.", __METHOD__);
153
+                $this->verbosePrint("run object '".$object->className()." on pos $pos.", __METHOD__);
154 154
                 $objectResponse = $object->run();
155
-                $this->verbosePrint("run object response: " . var_export($objectResponse, true), __METHOD__);
155
+                $this->verbosePrint("run object response: ".var_export($objectResponse, true), __METHOD__);
156 156
             }
157 157
     
158 158
             if (Yii::$app->hasModule('admin')) {
@@ -160,21 +160,21 @@  discard block
 block discarded – undo
160 160
                 Yii::$app->db->createCommand()->update('admin_user', ['force_reload' => 1])->execute();
161 161
             }
162 162
     
163
-            $this->verbosePrint('importer finished, get log output: ' . var_export($this->getLog(), true), __METHOD__);
163
+            $this->verbosePrint('importer finished, get log output: '.var_export($this->getLog(), true), __METHOD__);
164 164
             
165 165
             foreach ($this->getLog() as $section => $value) {
166
-                $this->outputInfo(PHP_EOL . $section . ":");
166
+                $this->outputInfo(PHP_EOL.$section.":");
167 167
                 foreach ($value as $k => $v) {
168 168
                     if (is_array($v)) {
169 169
                         foreach ($v as $kk => $kv) {
170 170
                             if (is_array($kv)) {
171
-                                $this->output(" - {$kk}: " . print_r($kv, true));
171
+                                $this->output(" - {$kk}: ".print_r($kv, true));
172 172
                             } else {
173 173
                                 $this->output(" - {$kk}: {$kv}");
174 174
                             }
175 175
                         }
176 176
                     } else {
177
-                        $this->output(" - " . $v);
177
+                        $this->output(" - ".$v);
178 178
                     }
179 179
                 }
180 180
             }
Please login to merge, or discard this patch.
core/traits/ApplicationTrait.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/traits/ErrorHandlerTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -114,9 +114,9 @@
 block discarded – undo
114 114
             $_file = $exception->getFile();
115 115
             $_line = $exception->getLine();
116 116
         } elseif (is_string($exception)) {
117
-            $_message = 'exception string: ' . $exception;
117
+            $_message = 'exception string: '.$exception;
118 118
         } elseif (is_array($exception)) {
119
-            $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: ' . print_r($exception, true);
119
+            $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: '.print_r($exception, true);
120 120
             $_file = isset($exception['file']) ? $exception['file'] : __FILE__;
121 121
             $_line = isset($exception['line']) ? $exception['line'] : __LINE__;
122 122
         }
Please login to merge, or discard this patch.
core/TagParser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
         
63 63
         if (!is_object($this->tags[$tag])) {
64 64
             $this->tags[$tag] = Yii::createObject($this->tags[$tag]);
65
-            Yii::trace('tag parser object generated for:'. $tag, __CLASS__);
65
+            Yii::trace('tag parser object generated for:'.$tag, __CLASS__);
66 66
         }
67 67
         
68 68
         $value = isset($context['value']) ? $context['value'] : false;
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
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
             // see if the module has a registerComponents method
101 101
             foreach ($module->registerComponents() as $componentId => $definition) {
102 102
                 if (!$app->has($componentId)) {
103
-                    Yii::trace('Register component ' . $componentId, __METHOD__);
103
+                    Yii::trace('Register component '.$componentId, __METHOD__);
104 104
                     $app->set($componentId, $definition);
105 105
                 }
106 106
             }
Please login to merge, or discard this patch.
core/tag/tags/TelTag.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
     
16 16
     public function parse($value, $sub)
17 17
     {
18
-        return Html::a(empty($sub) ? $value : $sub, 'tel:' . $this->ensureNumber($value));
18
+        return Html::a(empty($sub) ? $value : $sub, 'tel:'.$this->ensureNumber($value));
19 19
     }
20 20
         
21 21
     private function ensureNumber($number)
Please login to merge, or discard this patch.
core/console/commands/SetupController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
         }
106 106
         
107 107
         if (empty($this->langShortCode)) {
108
-            $this->langShortCode = $this->prompt('Short-Code of the Standard language:', ['required' => true, 'default' => 'en', 'validator' => function ($input, &$error) {
108
+            $this->langShortCode = $this->prompt('Short-Code of the Standard language:', ['required' => true, 'default' => 'en', 'validator' => function($input, &$error) {
109 109
                 if (strlen($input) !== 2) {
110 110
                     $error = 'The Short-Code must be 2 chars length only. Examples: de, en, fr, ru';
111 111
                     return false;
Please login to merge, or discard this patch.