Completed
Pull Request — master (#1302)
by Martin
04:11 queued 01:26
created
core/web/filters/ResponseCache.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@
 block discarded – undo
157 157
             return $response->send();
158 158
         }
159 159
         
160
-        $response->on(Response::EVENT_AFTER_SEND, function ($event) use ($action) {
160
+        $response->on(Response::EVENT_AFTER_SEND, function($event) use ($action) {
161 161
             $this->callActionCallable($action->id, $event->sender->content);
162 162
         });
163 163
         
Please login to merge, or discard this patch.
core/web/JsonLd.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
     {
52 52
         self::addGraph([
53 53
             "@context" => "http://schema.org",
54
-            "name" => $firstname . ' ' . $lastname,
54
+            "name" => $firstname.' '.$lastname,
55 55
             "givenName" => $firstname,
56 56
             "familyName" => $lastname,
57 57
             "jobTitle" => $jobTitle
@@ -115,8 +115,8 @@  discard block
 block discarded – undo
115 115
     private static function registerView()
116 116
     {
117 117
         if (self::$_view === null) {
118
-            Yii::$app->view->on(View::EVENT_BEGIN_BODY, function ($event) {
119
-                echo '<script type="application/ld+json">' . Json::encode($event->sender->params) . '</script>';
118
+            Yii::$app->view->on(View::EVENT_BEGIN_BODY, function($event) {
119
+                echo '<script type="application/ld+json">'.Json::encode($event->sender->params).'</script>';
120 120
             });
121 121
                     
122 122
             self::$_view = true;
Please login to merge, or discard this patch.
core/web/ExternalLink.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
     public function setHref($href)
54 54
     {
55 55
         if (StringHelper::startsWith($href, '//')) {
56
-            $this->_href = Url::base(true) . str_replace('//', '/', $href);
56
+            $this->_href = Url::base(true).str_replace('//', '/', $href);
57 57
         } else {
58 58
             $this->_href = Url::ensureHttp($href);
59 59
         }
Please login to merge, or discard this patch.
core/base/Boot.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -210,9 +210,9 @@
 block discarded – undo
210 210
         if (file_exists($this->_baseYiiFile)) {
211 211
             defined('LUYA_YII_VENDOR') ?: define('LUYA_YII_VENDOR', dirname($this->_baseYiiFile));
212 212
             
213
-            $require = require_once(dirname($this->_baseYiiFile) . DIRECTORY_SEPARATOR . 'BaseYii.php');
213
+            $require = require_once(dirname($this->_baseYiiFile).DIRECTORY_SEPARATOR.'BaseYii.php');
214 214
             
215
-            require_once($this->getCoreBasePath() . '/Yii.php');
215
+            require_once($this->getCoreBasePath().'/Yii.php');
216 216
             
217 217
             Yii::setAlias('@luya', $this->getCoreBasePath());
218 218
             return $require;
Please login to merge, or discard this patch.
core/Yii.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,5 +18,5 @@
 block discarded – undo
18 18
 }
19 19
 
20 20
 spl_autoload_register(['Yii', 'autoload'], true, true);
21
-Yii::$classMap = require(LUYA_YII_VENDOR . '/classes.php');
21
+Yii::$classMap = require(LUYA_YII_VENDOR.'/classes.php');
22 22
 Yii::$container = new yii\di\Container();
Please login to merge, or discard this patch.
core/traits/ApplicationTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
                 case 'en':
116 116
                     return 'en_US';
117 117
                 default:
118
-                    return strtolower($lang) . '_' . strtoupper($lang);
118
+                    return strtolower($lang).'_'.strtoupper($lang);
119 119
             }
120 120
         }
121 121
         
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
     public function getWebroot()
146 146
     {
147 147
         if ($this->_webroot === null) {
148
-            $this->_webroot = realpath(realpath($this->basePath) . DIRECTORY_SEPARATOR . $this->webrootDirectory);
148
+            $this->_webroot = realpath(realpath($this->basePath).DIRECTORY_SEPARATOR.$this->webrootDirectory);
149 149
         }
150 150
         
151 151
         return $this->_webroot;
Please login to merge, or discard this patch.
core/console/commands/views/crud/create_model.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
  * 
13 13
  * <?=$luyaVersion; ?> 
14 14
  *
15
-<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name . PHP_EOL; ?>
16
-<?php endforeach;?>
15
+<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name.PHP_EOL; ?>
16
+<?php endforeach; ?>
17 17
  */
18 18
 class <?= $className; ?> extends NgRestModel
19 19
 {
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
      */
24 24
     public $i18n = ['<?= implode("', '", $textFields); ?>'];
25 25
 
26
-<?php endif;?>
26
+<?php endif; ?>
27 27
     /**
28 28
      * @inheritdoc
29 29
      */
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
     {
78 78
         return [
79 79
         <?php foreach ($ngrestFieldConfig as $name => $type): ?>
80
-    '<?=$name; ?>' => '<?= $type;?>',
80
+    '<?=$name; ?>' => '<?= $type; ?>',
81 81
         <?php endforeach; ?>];
82 82
     }
83 83
 
Please login to merge, or discard this patch.
core/console/Bootstrap.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -36,15 +36,15 @@
 block discarded – undo
36 36
     public function run($app)
37 37
     {
38 38
         foreach ($app->getApplicationModules() as $id => $module) {
39
-            $folder = $module->basePath . DIRECTORY_SEPARATOR . 'commands';
39
+            $folder = $module->basePath.DIRECTORY_SEPARATOR.'commands';
40 40
             if (file_exists($folder) && is_dir($folder)) {
41 41
                 foreach (FileHelper::findFiles($folder) as $file) {
42 42
                     
43
-                    $module->controllerNamespace = $module->namespace . '\commands';
43
+                    $module->controllerNamespace = $module->namespace.'\commands';
44 44
                     
45
-                    $className = '\\'.$module->getNamespace().'\\commands\\' . pathinfo($file, PATHINFO_FILENAME);
45
+                    $className = '\\'.$module->getNamespace().'\\commands\\'.pathinfo($file, PATHINFO_FILENAME);
46 46
 
47
-                    $command = str_replace('-controller', '', $module->id . '/' . Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME)));
47
+                    $command = str_replace('-controller', '', $module->id.'/'.Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME)));
48 48
                     
49 49
                     Yii::$app->controllerMap[$command] = ['class' => $className];
50 50
                 }
Please login to merge, or discard this patch.
core/base/Module.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -278,6 +278,6 @@
 block discarded – undo
278 278
      */
279 279
     public function getControllerPath()
280 280
     {
281
-        return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false);
281
+        return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false);
282 282
     }
283 283
 }
Please login to merge, or discard this patch.