Completed
Pull Request — master (#1302)
by Martin
04:12 queued 01:34
created
core/console/commands/views/crud/create_api.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,5 +21,5 @@
 block discarded – undo
21 21
     /**
22 22
      * @var string The path to the model which is the provider for the rules and fields.
23 23
      */
24
-    public $modelClass = '<?= $modelClass;?>';
24
+    public $modelClass = '<?= $modelClass; ?>';
25 25
 }
26 26
\ No newline at end of file
Please login to merge, or discard this patch.
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 2 patches
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.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -202,14 +202,14 @@
 block discarded – undo
202 202
      */
203 203
     public function getAdminModules()
204 204
     {
205
-    	$modules = [];
205
+        $modules = [];
206 206
     	
207
-    	foreach ($this->getModules() as $id => $obj) {
208
-    		if ($obj instanceof Module && $obj instanceof AdminModuleInterface) {
209
-    			$modules[$id] = $obj;
210
-    		}
211
-    	}
207
+        foreach ($this->getModules() as $id => $obj) {
208
+            if ($obj instanceof Module && $obj instanceof AdminModuleInterface) {
209
+                $modules[$id] = $obj;
210
+            }
211
+        }
212 212
     	
213
-    	return $modules;
213
+        return $modules;
214 214
     }
215 215
 }
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/traits/CacheableTrait.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -79,34 +79,34 @@
 block discarded – undo
79 79
         return $this->_cachable;
80 80
     }
81 81
     
82
-     /**
83
-     * Method combines both [[setHasCache()]] and [[getHasCache()]] methods to retrieve value identified by a $key,
84
-     * or to store the result of $closure execution if there is no cache available for the $key.
85
-     *
86
-     * Usage example:
87
-     *
88
-     * ```php
89
-     * use CacheableTrait;
90
-     *
91
-     * public function getTopProducts($count = 10)
92
-     * {
93
-     *     return $this->getOrSetHasCache(['top-n-products', 'n' => $count], function ($cache) use ($count) {
94
-     *         return Products::find()->mostPopular()->limit(10)->all();
95
-     *     }, 1000);
96
-     * }
97
-     * ```
98
-     *
99
-     * @param mixed $key a key identifying the value to be cached. This can be a simple string or
100
-     * a complex data structure consisting of factors representing the key.
101
-     * @param \Closure $closure the closure that will be used to generate a value to be cached.
102
-     * In case $closure returns `false`, the value will not be cached.
103
-     * @param int $duration default duration in seconds before the cache will expire. If not set,
104
-     * [[defaultDuration]] value will be used.
105
-     * @param Dependency $dependency dependency of the cached item. If the dependency changes,
106
-     * the corresponding value in the cache will be invalidated when it is fetched via [[get()]].
107
-     * This parameter is ignored if [[serializer]] is `false`.
108
-     * @return mixed result of $closure execution
109
-     */
82
+        /**
83
+         * Method combines both [[setHasCache()]] and [[getHasCache()]] methods to retrieve value identified by a $key,
84
+         * or to store the result of $closure execution if there is no cache available for the $key.
85
+         *
86
+         * Usage example:
87
+         *
88
+         * ```php
89
+         * use CacheableTrait;
90
+         *
91
+         * public function getTopProducts($count = 10)
92
+         * {
93
+         *     return $this->getOrSetHasCache(['top-n-products', 'n' => $count], function ($cache) use ($count) {
94
+         *         return Products::find()->mostPopular()->limit(10)->all();
95
+         *     }, 1000);
96
+         * }
97
+         * ```
98
+         *
99
+         * @param mixed $key a key identifying the value to be cached. This can be a simple string or
100
+         * a complex data structure consisting of factors representing the key.
101
+         * @param \Closure $closure the closure that will be used to generate a value to be cached.
102
+         * In case $closure returns `false`, the value will not be cached.
103
+         * @param int $duration default duration in seconds before the cache will expire. If not set,
104
+         * [[defaultDuration]] value will be used.
105
+         * @param Dependency $dependency dependency of the cached item. If the dependency changes,
106
+         * the corresponding value in the cache will be invalidated when it is fetched via [[get()]].
107
+         * This parameter is ignored if [[serializer]] is `false`.
108
+         * @return mixed result of $closure execution
109
+         */
110 110
     public function getOrSetHasCache($key, \Closure $closure, $duration = null, $dependency = null)
111 111
     {
112 112
         if (($value = $this->getHasCache($key)) !== false) {
Please login to merge, or discard this patch.