Completed
Pull Request — master (#1040)
by Carsten
04:04
created
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/helpers/FileHelper.php 1 patch
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.
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.
core/console/Importer.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,6 @@
 block discarded – undo
71 71
      * $this->addLog('block', 'new block <ID> have been found and added to database');
72 72
      * ```
73 73
      * 
74
-     * @param string $section
75 74
      * @param string $value
76 75
 	 * @todo trigger deprecated section call
77 76
      */
Please login to merge, or discard this patch.
core/console/Application.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
             if (isset($partial[0]) && (count($partial) > 1) && ($module = Yii::$app->getModule($partial[0]))) {
76 76
                 try {
77 77
                     // change the controller namespace of this module to make usage of `commands`.
78
-                    $module->controllerNamespace = $module->namespace . '\commands';
78
+                    $module->controllerNamespace = $module->namespace.'\commands';
79 79
                     unset($partial[0]);
80 80
                     // action response
81 81
                     return $module->runAction(implode("/", $partial), $params);
Please login to merge, or discard this patch.
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -25,26 +25,26 @@
 block discarded – undo
25 25
 
26 26
     public function coreCommands()
27 27
     {
28
-    	return [
29
-    		// yii default commands
30
-    		'asset' => 'yii\console\controllers\AssetController',
31
-    		'cache' => 'yii\console\controllers\CacheController',
32
-    		'fixture' => 'yii\console\controllers\FixtureController',
33
-    		'help' => 'yii\console\controllers\HelpController',
34
-    		'message' => 'yii\console\controllers\MessageController',
35
-    		'serve' => 'yii\console\controllers\ServeController',
36
-    		// luya default commands
37
-    		'migrate' => 'luya\console\commands\MigrateController',
38
-	        'crud' => 'luya\console\commands\CrudController',
39
-	        'module' => 'luya\console\commands\ModuleController',
40
-	        'command' => 'luya\console\commands\CommandController',
41
-	        'import' => 'luya\console\commands\ImportController',
42
-	        'setup' => 'luya\console\commands\SetupController',
43
-	        'health' => 'luya\console\commands\HealthController',
44
-	        'block' => 'luya\console\commands\BlockController',
45
-	        'storage' => 'luya\console\commands\StorageController',
46
-	        'aw' => 'luya\console\commands\ActiveWindowController',
47
-    	];
28
+        return [
29
+            // yii default commands
30
+            'asset' => 'yii\console\controllers\AssetController',
31
+            'cache' => 'yii\console\controllers\CacheController',
32
+            'fixture' => 'yii\console\controllers\FixtureController',
33
+            'help' => 'yii\console\controllers\HelpController',
34
+            'message' => 'yii\console\controllers\MessageController',
35
+            'serve' => 'yii\console\controllers\ServeController',
36
+            // luya default commands
37
+            'migrate' => 'luya\console\commands\MigrateController',
38
+            'crud' => 'luya\console\commands\CrudController',
39
+            'module' => 'luya\console\commands\ModuleController',
40
+            'command' => 'luya\console\commands\CommandController',
41
+            'import' => 'luya\console\commands\ImportController',
42
+            'setup' => 'luya\console\commands\SetupController',
43
+            'health' => 'luya\console\commands\HealthController',
44
+            'block' => 'luya\console\commands\BlockController',
45
+            'storage' => 'luya\console\commands\StorageController',
46
+            'aw' => 'luya\console\commands\ActiveWindowController',
47
+        ];
48 48
     }
49 49
     
50 50
     /**
Please login to merge, or discard this patch.
core/helpers/StringHelper.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@
 block discarded – undo
20 20
     {
21 21
         if (is_numeric($string)) {
22 22
             if (is_float($string)) {
23
-                return (float)$string;
23
+                return (float) $string;
24 24
             } else {
25
-                return (int)$string;
25
+                return (int) $string;
26 26
             }
27 27
         } elseif (is_array($string)) {
28 28
             return ArrayHelper::typeCast($string);
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
      * @param string $from
44 44
      * @param string $to
45 45
      * @param string $subject
46
-     * @return mixed
46
+     * @return string
47 47
      * @since 1.0.0-rc1
48 48
      */
49 49
     public static function replaceFirst($from, $to, $subject)
Please login to merge, or discard this patch.
core/web/Element.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -217,12 +217,12 @@
 block discarded – undo
217 217
     {
218 218
         if ($this->renderEngine == 'php') {
219 219
             $view = new View();
220
-            return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . FileHelper::ensureExtension($file, 'php'), $args);
220
+            return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.FileHelper::ensureExtension($file, 'php'), $args);
221 221
         } elseif ($this->renderEngine == 'twig') {
222 222
             $twig = Yii::$app->twig->env(new Twig_Loader_Filesystem($this->getFolder()));
223 223
             return $twig->render(FileHelper::ensureExtension($file, 'twig'), $args);
224 224
         }
225 225
         
226
-        throw new Exception('Not supported render engine: ' . $this->renderEngine);
226
+        throw new Exception('Not supported render engine: '.$this->renderEngine);
227 227
     }
228 228
 }
Please login to merge, or discard this patch.
core/console/commands/views/crud/create_model.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
 /**
23 23
  * NgRest Model created at <?= date("d.m.Y H:i"); ?> on LUYA Version <?= $luyaVersion; ?>.
24 24
  *
25
-<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name . PHP_EOL; ?>
26
-<?php endforeach;?>
25
+<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name.PHP_EOL; ?>
26
+<?php endforeach; ?>
27 27
  */
28 28
 <?php if (!$extended): ?>abstract <?php endif; ?>class <?= $className; ?> extends \admin\ngrest\base\Model
29 29
 {
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
     {
98 98
         return [
99 99
         <?php foreach ($fieldConfigs as $name => $type): ?>
100
-    '<?=$name; ?>' => '<?= $type;?>',
100
+    '<?=$name; ?>' => '<?= $type; ?>',
101 101
         <?php endforeach; ?>];
102 102
     }
103 103
     
Please login to merge, or discard this patch.