Completed
Push — master ( 804439...cae4f5 )
by Ryo
89:04 queued 52:40
created
src/Eccube/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php 2 patches
Unused Use Statements   -9 removed lines patch added patch discarded remove patch
@@ -18,18 +18,9 @@
 block discarded – undo
18 18
 use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
19 19
 use Doctrine\DBAL\Platforms\SQLAnywherePlatform;
20 20
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
21
-use Doctrine\ORM\Query\AST\ArithmeticExpression;
22
-use Doctrine\ORM\Query\AST\ArithmeticFactor;
23
-use Doctrine\ORM\Query\AST\ArithmeticTerm;
24
-use Doctrine\ORM\Query\AST\Literal;
25 21
 use Doctrine\ORM\Query\AST\OrderByClause;
26
-use Doctrine\ORM\Query\AST\OrderByItem;
27 22
 use Doctrine\ORM\Query\AST\PartialObjectExpression;
28
-use Doctrine\ORM\Query\AST\PathExpression;
29 23
 use Doctrine\ORM\Query\AST\SelectExpression;
30
-use Doctrine\ORM\Query\AST\SimpleArithmeticExpression;
31
-use Doctrine\ORM\Query\Expr\OrderBy;
32
-use Doctrine\ORM\Query\Expr\Select;
33 24
 use Doctrine\ORM\Query\SqlWalker;
34 25
 use Doctrine\ORM\Query\AST\SelectStatement;
35 26
 
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -209,8 +209,8 @@  discard block
 block discarded – undo
209 209
         $sqlIdentifier = $this->getSQLIdentifier($AST);
210 210
 
211 211
         if ($hasOrderBy) {
212
-            $orderGroupBy = ' GROUP BY ' . implode(', ', $sqlIdentifier);
213
-            $sqlIdentifier[] = 'MIN(' . $this->walkResultVariable('dctrn_rownum') . ') AS dctrn_minrownum';
212
+            $orderGroupBy = ' GROUP BY '.implode(', ', $sqlIdentifier);
213
+            $sqlIdentifier[] = 'MIN('.$this->walkResultVariable('dctrn_rownum').') AS dctrn_minrownum';
214 214
         }
215 215
 
216 216
         // Build the counter query
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
         );
222 222
 
223 223
         if ($hasOrderBy) {
224
-            $sql .= $orderGroupBy . $outerOrderBy;
224
+            $sql .= $orderGroupBy.$outerOrderBy;
225 225
         }
226 226
 
227 227
         // Apply the limit and offset.
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
     {
369 369
         // If the sql statement has an order by clause, we need to wrap it in a new select distinct
370 370
         // statement
371
-        if (! $orderByClause instanceof OrderByClause) {
371
+        if (!$orderByClause instanceof OrderByClause) {
372 372
             return $sql;
373 373
         }
374 374
 
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
             = array();
405 405
 
406 406
         // Generate DQL alias -> SQL table alias mapping
407
-        foreach(array_keys($this->rsm->aliasMap) as $dqlAlias) {
407
+        foreach (array_keys($this->rsm->aliasMap) as $dqlAlias) {
408 408
             $dqlAliasToClassMap[$dqlAlias] = $class = $this->queryComponents[$dqlAlias]['metadata'];
409 409
             $dqlAliasToSqlTableAliasMap[$dqlAlias] = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
410 410
         }
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
         $fieldSearchPattern = '/(?<![a-z0-9_])%s\.%s(?![a-z0-9_])/i';
414 414
 
415 415
         // Generate search patterns for each field's path expression in the order by clause
416
-        foreach($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
416
+        foreach ($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
417 417
             $dqlAliasForFieldAlias = $this->rsm->columnOwnerMap[$fieldAlias];
418 418
             $class = $dqlAliasToClassMap[$dqlAliasForFieldAlias];
419 419
 
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
             $replacements[] = $fieldAlias;
450 450
         }
451 451
 
452
-        foreach($orderByClause->orderByItems as $orderByItem) {
452
+        foreach ($orderByClause->orderByItems as $orderByItem) {
453 453
             // Walk order by item to get string representation of it
454 454
             $orderByItemString = $this->walkOrderByItem($orderByItem);
455 455
 
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,9 +44,9 @@
 block discarded – undo
44 44
      */
45 45
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
46 46
     {
47
-        return 'ROW_NUMBER() OVER(' . trim($sqlWalker->walkOrderByClause(
47
+        return 'ROW_NUMBER() OVER('.trim($sqlWalker->walkOrderByClause(
48 48
             $this->orderByClause
49
-        )) . ')';
49
+        )).')';
50 50
     }
51 51
 
52 52
     /**
Please login to merge, or discard this patch.
src/Eccube/Command/ConfigCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
             }
92 92
         }
93 93
 
94
-        $recursive = function ($config, $space = '    ') use (&$recursive, $output) {
94
+        $recursive = function($config, $space = '    ') use (&$recursive, $output) {
95 95
             foreach ($config as $key => $item) {
96 96
                 if (is_array($item)) {
97 97
                     $space = '    ';
Please login to merge, or discard this patch.
src/Eccube/Command/PluginCommand/AbstractPluginGenerator.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,6 @@
 block discarded – undo
24 24
 
25 25
 namespace Eccube\Command\PluginCommand;
26 26
 
27
-use Eccube\Common\Constant;
28 27
 use Symfony\Component\Console\Question\Question;
29 28
 
30 29
 abstract class AbstractPluginGenerator
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
             if (is_array($params['value'])) {
128 128
                 $this->output->writeln($params['label']);
129 129
                 foreach ($params['value'] as $keys => $val) {
130
-                    $this->output->writeln('<info>  ' . $keys . '</info>');
130
+                    $this->output->writeln('<info>  '.$keys.'</info>');
131 131
                 }
132 132
             } else {
133 133
                 if (isset($params['show'])) {
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
                 } else {
136 136
                     $disp = $params['value'];
137 137
                 }
138
-                $this->output->writeln($params['label'] . ' <info>' . $disp . '</info>');
138
+                $this->output->writeln($params['label'].' <info>'.$disp.'</info>');
139 139
             }
140 140
         }
141 141
         $this->output->writeln('');
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
         $this->nestingLevel--;
166 166
         
167 167
         $this->output->writeln($params['name']);
168
-        $Question = new Question('<comment>Input' . self::INPUT_OPEN . $params['no'] . self::INPUT_CLOSE . ' : </comment>', '');
168
+        $Question = new Question('<comment>Input'.self::INPUT_OPEN.$params['no'].self::INPUT_CLOSE.' : </comment>', '');
169 169
         $value = $this->dialog->ask($this->input, $this->output, $Question);
170 170
         $value = trim($value);
171 171
         if ($value === self::STOP_PROCESS) {
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
                     $params['value'][$value] = $row[$value];
199 199
                     $this->output->writeln('<info>--- your entry list</info>');
200 200
                     foreach ($params['value'] as $subKey => $node) {
201
-                        $this->output->writeln('<info> - ' . $subKey . '</info>');
201
+                        $this->output->writeln('<info> - '.$subKey.'</info>');
202 202
                     }
203 203
                     $this->output->writeln('');
204 204
                     $this->output->writeln('--- Press Enter to move to the next step ---');
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
                     foreach ($row as $eventKey => $eventConst) {
211 211
                         if (strpos($eventKey, $value) !== false || strpos($eventConst, $value) !== false) {
212 212
                             if (count($searchList) >= $max) {
213
-                                $searchList['-- there are more then ' . $max . ''] = '';
213
+                                $searchList['-- there are more then '.$max.''] = '';
214 214
                                 break;
215 215
                             }
216 216
                             $searchList[$eventKey] = $eventConst;
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
                         $this->output->writeln('--- there are more then one search result');
222 222
                     }
223 223
                     foreach ($searchList as $subKey => $node) {
224
-                        $this->output->writeln(' - ' . $subKey);
224
+                        $this->output->writeln(' - '.$subKey);
225 225
                     }
226 226
 
227 227
                     if (!empty($searchList)) {
Please login to merge, or discard this patch.
src/Eccube/Command/PluginCommand.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
137 137
             if ($code) {
138 138
                 $pluginDir = $service->calcPluginDir($code);
139 139
                 $service->checkPluginArchiveContent($pluginDir);
140
-                $config = $service->readYml($pluginDir . '/config.yml');
141
-                $event = $service->readYml($pluginDir . '/event.yml');
140
+                $config = $service->readYml($pluginDir.'/config.yml');
141
+                $event = $service->readYml($pluginDir.'/event.yml');
142 142
                 $service->checkSamePlugin($config['code']);
143 143
                 $service->registerPlugin($config, $event);
144 144
 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 
188 188
             // ディレクトリは残し, プラグインを削除.
189 189
             $pluginDir = $service->calcPluginDir($code);
190
-            $config = $service->readYml($pluginDir . '/config.yml');
190
+            $config = $service->readYml($pluginDir.'/config.yml');
191 191
             $service->callPluginManagerMethod($config, 'disable');
192 192
             $service->callPluginManagerMethod($config, 'uninstall');
193 193
             $service->unregisterPlugin($plugin);
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,6 @@
 block discarded – undo
28 28
 use Symfony\Component\Console\Input\InputInterface;
29 29
 use Symfony\Component\Console\Output\OutputInterface;
30 30
 use Symfony\Component\Console\Input\InputOption;
31
-use Symfony\Component\Validator\Constraints as Assert;
32 31
 use Eccube\Command\PluginCommand\PluginGenerator;
33 32
 use Eccube\Command\PluginCommand\EntityFromDbGenerator;
34 33
 use Eccube\Command\PluginCommand\EntityFromYamlGenerator;
Please login to merge, or discard this patch.
src/Eccube/Command/PluginCommand/Resource/ServiceProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
         $app->match('/plugin/[lower_code]/hello', 'Plugin\[code]\Controller\[code]Controller::index')->bind('plugin_[code]_hello');
34 34
 
35 35
         // Form
36
-        $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) {
36
+        $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) {
37 37
             $types[] = new [code]ConfigType();
38 38
 
39 39
             return $types;
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
         // }
58 58
 
59 59
         // ログファイル設定
60
-        $app['monolog.logger.[lower_code]'] = $app->share(function ($app) {
60
+        $app['monolog.logger.[lower_code]'] = $app->share(function($app) {
61 61
 
62 62
             $logger = new $app['monolog.logger.class']('[lower_code]');
63 63
 
Please login to merge, or discard this patch.
src/Eccube/Command/PluginCommand/EntityFromYamlGenerator.php 2 patches
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
         $this->output->writeln('------------------------------------------------------');
48 48
         $this->output->writeln('---Plugin Generator for Entity');
49 49
         $this->output->writeln('---[*] You need to create yaml file first.');
50
-        $this->output->writeln('---[*]You can exit from Console Application, by typing ' . self::STOP_PROCESS . ' instead of typing another word.');
50
+        $this->output->writeln('---[*]You can exit from Console Application, by typing '.self::STOP_PROCESS.' instead of typing another word.');
51 51
         $this->output->writeln('------------------------------------------------------');
52 52
         $this->output->writeln('');
53 53
     }
@@ -62,11 +62,11 @@  discard block
 block discarded – undo
62 62
         $pluginCode = $this->paramList['pluginCode']['value'];
63 63
         $yamlList = $this->paramList['entityList']['value'];
64 64
 
65
-        $codePath = $this->app['config']['root_dir'] . '/app/Plugin/' . $pluginCode;
65
+        $codePath = $this->app['config']['root_dir'].'/app/Plugin/'.$pluginCode;
66 66
 
67 67
         $dirList = array('Entity', 'Repository', '/Resource/doctrine/migration');
68 68
         foreach ($dirList as $dirName) {
69
-            $dirPath = $codePath . '/' . $dirName;
69
+            $dirPath = $codePath.'/'.$dirName;
70 70
             if (!is_dir($dirPath)) {
71 71
                 mkdir($dirPath);
72 72
             }
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         $metadetas = array();
80 80
 
81 81
 
82
-        $YamlDriver = new YamlDriver(array($codePath . '/Resource/doctrine'));
82
+        $YamlDriver = new YamlDriver(array($codePath.'/Resource/doctrine'));
83 83
         foreach ($yamlList as $pathYaml => $fullClassName) {
84 84
 
85 85
             $MetadataInfo = new ClassMetadataInfo($fullClassName);
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
95 95
             $EntityGenerator->setGenerateStubMethods(true);
96 96
             $EntityGenerator->setUpdateEntityIfExists(false);
97 97
 
98
-            $pathClass = $this->app['config']['root_dir'] . '/app/';
98
+            $pathClass = $this->app['config']['root_dir'].'/app/';
99 99
             $EntityGenerator->generate(array($MetadataInfo), $pathClass);
100
-            $pathClass .= str_replace('\\', DIRECTORY_SEPARATOR, $MetadataInfo->name) . '.php';
100
+            $pathClass .= str_replace('\\', DIRECTORY_SEPARATOR, $MetadataInfo->name).'.php';
101 101
             if (is_file($pathClass)) {
102 102
                 $fsList['file'][$pathClass] = true;
103 103
             } else {
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
             $migrationContent = $this->makeMigration($pluginCode, $metadetas);
119 119
             $timeSt = date('YmdHis');
120 120
             $migrationContent = str_replace('[datetime]', $timeSt, $migrationContent);
121
-            $migPath = $codePath . '/Resource/doctrine/migration/Version' . $timeSt . '.php';
121
+            $migPath = $codePath.'/Resource/doctrine/migration/Version'.$timeSt.'.php';
122 122
 
123 123
             file_put_contents($migPath, $migrationContent);
124 124
             if (is_file($migPath)) {
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
             $this->output->writeln('');
151 151
             $this->output->writeln(' this files and folders were created.');
152 152
             foreach ($dirFileOk as $path) {
153
-                $this->output->writeln('<info> - ' . $path . '</info>');
153
+                $this->output->writeln('<info> - '.$path.'</info>');
154 154
             }
155 155
         }
156 156
     }
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 
202 202
         if ($this->entityList === null) {
203 203
             $this->entityList = array();
204
-            $directory = $this->app['config']['root_dir'] . '/app/Plugin/' . $this->paramList['pluginCode']['value'] . '/Resource/doctrine/';
204
+            $directory = $this->app['config']['root_dir'].'/app/Plugin/'.$this->paramList['pluginCode']['value'].'/Resource/doctrine/';
205 205
             if (!is_dir($directory)) {
206 206
                 return $this->entityList;
207 207
             }
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
     private function getPluginList()
223 223
     {
224 224
         $ret = array();
225
-        $pluginDir = $this->app['config']['root_dir'] . '/app/Plugin';
225
+        $pluginDir = $this->app['config']['root_dir'].'/app/Plugin';
226 226
         $iterator = new \DirectoryIterator($pluginDir);
227 227
         foreach ($iterator as $fileInfo) {
228 228
             if ($fileInfo->isDot()) {
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 
238 238
     private function toCamelCase($name)
239 239
     {
240
-        return lcfirst(implode('', array_map(function ($name) {
240
+        return lcfirst(implode('', array_map(function($name) {
241 241
                     return ucfirst($name);
242 242
                 }, explode('_', $name))));
243 243
     }
@@ -249,31 +249,31 @@  discard block
 block discarded – undo
249 249
         $line = array();
250 250
         $line[] = '<?php';
251 251
         $line[] = '/*';
252
-        $line[] = ' * This file is part of ' . $pluginCode;
252
+        $line[] = ' * This file is part of '.$pluginCode;
253 253
         $line[] = ' *';
254 254
         $line[] = ' *';
255 255
         $line[] = ' * For the full copyright and license information, please view the LICENSE';
256 256
         $line[] = ' * file that was distributed with this source code.';
257 257
         $line[] = ' */';
258 258
         $line[] = '';
259
-        $line[] = 'namespace Plugin\\' . $pluginCode . '\Repository;';
259
+        $line[] = 'namespace Plugin\\'.$pluginCode.'\Repository;';
260 260
         $line[] = '';
261 261
         $line[] = 'use Doctrine\ORM\EntityRepository;';
262 262
         $line[] = '';
263 263
         $line[] = '/**';
264
-        $line[] = ' * ' . $nameFormated;
264
+        $line[] = ' * '.$nameFormated;
265 265
         $line[] = ' *';
266 266
         $line[] = ' * This class was generated by the Doctrine ORM. Add your own custom';
267 267
         $line[] = ' * repository methods below.';
268 268
         $line[] = ' */';
269
-        $line[] = 'class ' . $nameFormated . 'Repository extends EntityRepository';
269
+        $line[] = 'class '.$nameFormated.'Repository extends EntityRepository';
270 270
         $line[] = '{';
271 271
         $line[] = '';
272 272
         $line[] = '}';
273 273
         $line[] = '';
274 274
 
275 275
         $cont = join(PHP_EOL, $line);
276
-        $filename = $this->app['config']['root_dir'] . '/app/Plugin/' . $pluginCode . '/Repository/' . $nameFormated . 'Repository.php';
276
+        $filename = $this->app['config']['root_dir'].'/app/Plugin/'.$pluginCode.'/Repository/'.$nameFormated.'Repository.php';
277 277
         file_put_contents($filename, $cont);
278 278
         return $filename;
279 279
     }
@@ -281,20 +281,20 @@  discard block
 block discarded – undo
281 281
     private function makeMigration($pluginCode, $metadetas)
282 282
     {
283 283
         if ($this->paramList['supportFlag']['value']) {
284
-            $migrationFileCont = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/MigrationVersionSupport.php');
284
+            $migrationFileCont = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/MigrationVersionSupport.php');
285 285
         } else {
286
-            $migrationFileCont = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/MigrationVersion.php');
286
+            $migrationFileCont = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/MigrationVersion.php');
287 287
         }
288 288
 
289 289
         $entityList = $this->createEntityList($pluginCode, $metadetas);
290 290
 
291
-        $entityListStr = join(',' . PHP_EOL, $entityList);
291
+        $entityListStr = join(','.PHP_EOL, $entityList);
292 292
         $migrationFileCont = str_replace('[entityList]', $entityListStr, $migrationFileCont);
293 293
         if ($this->paramList['supportFlag']['value']) {
294 294
             $createParts = $this->makeCreateParts($metadetas);
295 295
             $tableNameArr = array();
296 296
             foreach ($createParts as $tableName => $tableArr) {
297
-                $tableNameArr[] = '            $this->createTable' . $tableName . '($schema);';
297
+                $tableNameArr[] = '            $this->createTable'.$tableName.'($schema);';
298 298
             }
299 299
             $tableNameStr = join(PHP_EOL, $tableNameArr);
300 300
             $migrationFileCont = str_replace('[createTable]', $tableNameStr, $migrationFileCont);
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
     {
318 318
         $ret = array();
319 319
         foreach ($migrations as $metadata) {
320
-            $ret[] = "        '" . 'Plugin\\' . $pluginCode . '\Entity\\' . ucfirst($this->getShortClassName($metadata->table['name'])) . "'";
320
+            $ret[] = "        '".'Plugin\\'.$pluginCode.'\Entity\\'.ucfirst($this->getShortClassName($metadata->table['name']))."'";
321 321
         }
322 322
         return $ret;
323 323
     }
@@ -335,14 +335,14 @@  discard block
 block discarded – undo
335 335
             $nameFormated = $this->getShortClassName($metadata->table['name']);
336 336
             $tmp = array();
337 337
             $tmp[] = '';
338
-            $tmp[] = '    public function createTable' . ucfirst($nameFormated) . '(Schema $schema)';
338
+            $tmp[] = '    public function createTable'.ucfirst($nameFormated).'(Schema $schema)';
339 339
             $tmp[] = '    {';
340
-            $tmp[] = '        $table = $schema->createTable(\'' . $metadata->table['name'] . '\');';
340
+            $tmp[] = '        $table = $schema->createTable(\''.$metadata->table['name'].'\');';
341 341
             $columns = $metadata->fieldMappings;
342 342
             foreach ($columns as $column) {
343 343
 
344 344
                 $typeName = $column['type'];
345
-                $tmp[] = '        $table->addColumn(\'' . $column['columnName'] . '\', \'' . $typeName . '\', array(';
345
+                $tmp[] = '        $table->addColumn(\''.$column['columnName'].'\', \''.$typeName.'\', array(';
346 346
                 $param = array();
347 347
                 if (isset($column['nullable']) && $column['nullable']) {
348 348
                     $param['notnull'] = 'true';
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
                 }
352 352
 
353 353
                 foreach ($param as $parKey => $parVal) {
354
-                    $tmp[] = '            \'' . $parKey . '\' => ' . $parVal . ',';
354
+                    $tmp[] = '            \''.$parKey.'\' => '.$parVal.',';
355 355
                 }
356 356
                 $tmp[] = '        ));';
357 357
             }
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
     {
370 370
         $ret = array();
371 371
         foreach ($metadetas as $metadata) {
372
-            $ret[] = '            $schema->dropTable(\'' . $metadata->table['name'] . '\');';
372
+            $ret[] = '            $schema->dropTable(\''.$metadata->table['name'].'\');';
373 373
         }
374 374
 
375 375
         return $ret;
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -160,7 +160,7 @@
 block discarded – undo
160 160
         $this->paramList = array(
161 161
             'pluginCode' => array(
162 162
                 'no' => 1,
163
-                 'label' => '[+]Plugin Code: ',
163
+                    'label' => '[+]Plugin Code: ',
164 164
                 'value' => null,
165 165
                 'name' => '[+]Please enter Plugin Name (only pascal case letters numbers are allowed)',
166 166
                 'validation' => array(
Please login to merge, or discard this patch.
src/Eccube/Command/PluginCommand/EntityFromDbGenerator.php 1 patch
Spacing   +69 added lines, -69 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         $this->output->writeln('------------------------------------------------------');
44 44
         $this->output->writeln('---Plugin Generator for Entity');
45 45
         $this->output->writeln('---[*] You need to create table schema first.');
46
-        $this->output->writeln('---[*]You can exit from Console Application, by typing ' . self::STOP_PROCESS . ' instead of typing another word.');
46
+        $this->output->writeln('---[*]You can exit from Console Application, by typing '.self::STOP_PROCESS.' instead of typing another word.');
47 47
         $this->output->writeln('------------------------------------------------------');
48 48
         $this->output->writeln('');
49 49
     }
@@ -57,11 +57,11 @@  discard block
 block discarded – undo
57 57
 
58 58
         $pluginCode = $this->paramList['pluginCode']['value'];
59 59
         $tableList = $this->paramList['tableList']['value'];
60
-        $codePath = $this->app['config']['root_dir'] . '/app/Plugin/' . $pluginCode;
60
+        $codePath = $this->app['config']['root_dir'].'/app/Plugin/'.$pluginCode;
61 61
 
62 62
         $dirList = array('Entity', 'Repository', 'Resource', 'Resource/doctrine', '/Resource/doctrine/migration');
63 63
         foreach ($dirList as $dirName) {
64
-            $dirPath = $codePath . '/' . $dirName;
64
+            $dirPath = $codePath.'/'.$dirName;
65 65
             if (!is_dir($dirPath)) {
66 66
                 mkdir($dirPath);
67 67
             }
@@ -86,13 +86,13 @@  discard block
 block discarded – undo
86 86
             $migrationContent = $this->makeMigration($pluginCode, $migration);
87 87
             $timeSt = date('YmdHis');
88 88
             $migrationContent = str_replace('[datetime]', $timeSt, $migrationContent);
89
-            $path = '/Resource/doctrine/migration/Version' . $timeSt . '.php';
89
+            $path = '/Resource/doctrine/migration/Version'.$timeSt.'.php';
90 90
             $entityInfoList[] = array($path => $migrationContent);
91 91
         }
92 92
 
93 93
         foreach ($entityInfoList as $entityInfo) {
94 94
             foreach ($entityInfo as $path => $body) {
95
-                $fullPath = $this->app['config']['root_dir'] . '/app/Plugin/' . $pluginCode . $path;
95
+                $fullPath = $this->app['config']['root_dir'].'/app/Plugin/'.$pluginCode.$path;
96 96
                 file_put_contents($fullPath, $body);
97 97
                 if (is_file($fullPath)) {
98 98
                     $fsList['file'][$fullPath] = true;
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
             $this->output->writeln('');
124 124
             $this->output->writeln(' this files and folders were created.');
125 125
             foreach ($dirFileOk as $path) {
126
-                $this->output->writeln('<info> - ' . $path . '</info>');
126
+                $this->output->writeln('<info> - '.$path.'</info>');
127 127
             }
128 128
         }
129 129
     }
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
         $nameFormated = ucfirst($this->toCamelCase($tableName));
135 135
 
136 136
         $ret = array();
137
-        $ret['/Entity/' . $nameFormated . '.php'] = $this->getSrc($pluginCode, $TableInfo);
137
+        $ret['/Entity/'.$nameFormated.'.php'] = $this->getSrc($pluginCode, $TableInfo);
138 138
 
139
-        $ret['/Resource/doctrine/Plugin.' . $pluginCode . '.Entity.' . $nameFormated . '.dcm.yml'] = $this->getConfig($pluginCode, $TableInfo);
139
+        $ret['/Resource/doctrine/Plugin.'.$pluginCode.'.Entity.'.$nameFormated.'.dcm.yml'] = $this->getConfig($pluginCode, $TableInfo);
140 140
 
141
-        $ret['/Repository/' . $nameFormated . 'Repository.php'] = $this->getRepo($pluginCode, $TableInfo);
141
+        $ret['/Repository/'.$nameFormated.'Repository.php'] = $this->getRepo($pluginCode, $TableInfo);
142 142
 
143 143
         return $ret;
144 144
     }
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
     private function getPluginList()
202 202
     {
203 203
         $ret = array();
204
-        $pluginDir = $this->app['config']['root_dir'] . '/app/Plugin';
204
+        $pluginDir = $this->app['config']['root_dir'].'/app/Plugin';
205 205
         $iterator = new \DirectoryIterator($pluginDir);
206 206
         foreach ($iterator as $fileInfo) {
207 207
             if ($fileInfo->isDot()) {
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 
217 217
     private function toCamelCase($name)
218 218
     {
219
-        return lcfirst(implode('', array_map(function ($name) {
219
+        return lcfirst(implode('', array_map(function($name) {
220 220
                     return ucfirst($name);
221 221
                 }, explode('_', $name))));
222 222
     }
@@ -259,43 +259,43 @@  discard block
 block discarded – undo
259 259
                 $varName = 'string';
260 260
             }
261 261
 
262
-            $tmpProp = '' . PHP_EOL;
263
-            $tmpProp .= '    /**' . PHP_EOL;
264
-            $tmpProp .= '     * @var ' . $varName . PHP_EOL;
265
-            $tmpProp .= '     */' . PHP_EOL;
266
-            $tmpProp .= '    private $' . $columnName . ';' . PHP_EOL;
262
+            $tmpProp = ''.PHP_EOL;
263
+            $tmpProp .= '    /**'.PHP_EOL;
264
+            $tmpProp .= '     * @var '.$varName.PHP_EOL;
265
+            $tmpProp .= '     */'.PHP_EOL;
266
+            $tmpProp .= '    private $'.$columnName.';'.PHP_EOL;
267 267
 
268 268
             $prop[] = $tmpProp;
269 269
 
270
-            $tmpGetMethName = $this->toCamelCase('get_' . $columnName);
270
+            $tmpGetMethName = $this->toCamelCase('get_'.$columnName);
271 271
 
272
-            $tmpGet = '' . PHP_EOL;
273
-            $tmpGet .= '    /**' . PHP_EOL;
274
-            $tmpGet .= '     * Get ' . $columnName . PHP_EOL;
275
-            $tmpGet .= '     *' . PHP_EOL;
276
-            $tmpGet .= '     * @return ' . $varName . PHP_EOL;
277
-            $tmpGet .= '     */' . PHP_EOL;
278
-            $tmpGet .= '    public function ' . $tmpGetMethName . '()' . PHP_EOL;
279
-            $tmpGet .= '    {' . PHP_EOL;
280
-            $tmpGet .= '        return $this->' . $columnName . ';' . PHP_EOL;
281
-            $tmpGet .= '    }' . PHP_EOL;
272
+            $tmpGet = ''.PHP_EOL;
273
+            $tmpGet .= '    /**'.PHP_EOL;
274
+            $tmpGet .= '     * Get '.$columnName.PHP_EOL;
275
+            $tmpGet .= '     *'.PHP_EOL;
276
+            $tmpGet .= '     * @return '.$varName.PHP_EOL;
277
+            $tmpGet .= '     */'.PHP_EOL;
278
+            $tmpGet .= '    public function '.$tmpGetMethName.'()'.PHP_EOL;
279
+            $tmpGet .= '    {'.PHP_EOL;
280
+            $tmpGet .= '        return $this->'.$columnName.';'.PHP_EOL;
281
+            $tmpGet .= '    }'.PHP_EOL;
282 282
 
283 283
             $getMethods[] = $tmpGet;
284 284
 
285
-            $tmpSetMethName = $this->toCamelCase('set_' . $columnName);
286
-
287
-            $tmpSet = '' . PHP_EOL;
288
-            $tmpSet .= '    /**' . PHP_EOL;
289
-            $tmpSet .= '     * Set ' . $columnName . PHP_EOL;
290
-            $tmpSet .= '     *' . PHP_EOL;
291
-            $tmpSet .= '     * @param  ' . $varName . ' $' . $columnName . PHP_EOL;
292
-            $tmpSet .= '     * @return ' . $nameFormated . PHP_EOL;
293
-            $tmpSet .= '     */' . PHP_EOL;
294
-            $tmpSet .= '    public function ' . $tmpSetMethName . '( $' . $columnName . ')' . PHP_EOL;
295
-            $tmpSet .= '    {' . PHP_EOL;
296
-            $tmpSet .= '        $this->' . $columnName . ' = $' . $columnName . ';' . PHP_EOL;
297
-            $tmpSet .= '        return $this;' . PHP_EOL;
298
-            $tmpSet .= '    }' . PHP_EOL;
285
+            $tmpSetMethName = $this->toCamelCase('set_'.$columnName);
286
+
287
+            $tmpSet = ''.PHP_EOL;
288
+            $tmpSet .= '    /**'.PHP_EOL;
289
+            $tmpSet .= '     * Set '.$columnName.PHP_EOL;
290
+            $tmpSet .= '     *'.PHP_EOL;
291
+            $tmpSet .= '     * @param  '.$varName.' $'.$columnName.PHP_EOL;
292
+            $tmpSet .= '     * @return '.$nameFormated.PHP_EOL;
293
+            $tmpSet .= '     */'.PHP_EOL;
294
+            $tmpSet .= '    public function '.$tmpSetMethName.'( $'.$columnName.')'.PHP_EOL;
295
+            $tmpSet .= '    {'.PHP_EOL;
296
+            $tmpSet .= '        $this->'.$columnName.' = $'.$columnName.';'.PHP_EOL;
297
+            $tmpSet .= '        return $this;'.PHP_EOL;
298
+            $tmpSet .= '    }'.PHP_EOL;
299 299
             $setMethods[] = $tmpSet;
300 300
         }
301 301
         $ret .= PHP_EOL;
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
         $ret .= PHP_EOL;
306 306
         $ret .= join(PHP_EOL, $setMethods);
307 307
         $ret .= PHP_EOL;
308
-        $ret .= '}' . PHP_EOL;
308
+        $ret .= '}'.PHP_EOL;
309 309
 
310 310
 
311 311
         return $ret;
@@ -316,16 +316,16 @@  discard block
 block discarded – undo
316 316
         $line = array();
317 317
         $line[] = '<?php';
318 318
         $line[] = '/*';
319
-        $line[] = ' * This file is part of ' . $pluginCode;
319
+        $line[] = ' * This file is part of '.$pluginCode;
320 320
         $line[] = ' *';
321 321
         $line[] = ' *';
322 322
         $line[] = ' * For the full copyright and license information, please view the LICENSE';
323 323
         $line[] = ' * file that was distributed with this source code.';
324 324
         $line[] = ' */';
325 325
         $line[] = '';
326
-        $line[] = 'namespace Plugin\\' . $pluginCode . '\Entity;';
326
+        $line[] = 'namespace Plugin\\'.$pluginCode.'\Entity;';
327 327
         $line[] = '';
328
-        $line[] = 'class ' . ucfirst($nameFormated) . ' extends \Eccube\Entity\AbstractEntity';
328
+        $line[] = 'class '.ucfirst($nameFormated).' extends \Eccube\Entity\AbstractEntity';
329 329
         $line[] = '{';
330 330
         $line[] = '    /**';
331 331
         $line[] = '     * @return string';
@@ -409,10 +409,10 @@  discard block
 block discarded – undo
409 409
         }
410 410
 
411 411
         $yml = array(
412
-            'Plugin\\' . $pluginCode . '\Entity\\' . ucfirst($nameFormated) => array(
412
+            'Plugin\\'.$pluginCode.'\Entity\\'.ucfirst($nameFormated) => array(
413 413
                 'type' => 'entity',
414 414
                 'table' => $TableInfo->getName(),
415
-                'repositoryClass' => 'Plugin\\' . $pluginCode . '\Repository\\' . ucfirst($nameFormated) . 'Repository',
415
+                'repositoryClass' => 'Plugin\\'.$pluginCode.'\Repository\\'.ucfirst($nameFormated).'Repository',
416 416
                 'id' => array(
417 417
                     'id' => $id
418 418
                 ),
@@ -430,24 +430,24 @@  discard block
 block discarded – undo
430 430
         $line = array();
431 431
         $line[] = '<?php';
432 432
         $line[] = '/*';
433
-        $line[] = ' * This file is part of ' . $pluginCode;
433
+        $line[] = ' * This file is part of '.$pluginCode;
434 434
         $line[] = ' *';
435 435
         $line[] = ' *';
436 436
         $line[] = ' * For the full copyright and license information, please view the LICENSE';
437 437
         $line[] = ' * file that was distributed with this source code.';
438 438
         $line[] = ' */';
439 439
         $line[] = '';
440
-        $line[] = 'namespace Plugin\\' . $pluginCode . '\Repository;';
440
+        $line[] = 'namespace Plugin\\'.$pluginCode.'\Repository;';
441 441
         $line[] = '';
442 442
         $line[] = 'use Doctrine\ORM\EntityRepository;';
443 443
         $line[] = '';
444 444
         $line[] = '/**';
445
-        $line[] = ' * ' . ucfirst($nameFormated);
445
+        $line[] = ' * '.ucfirst($nameFormated);
446 446
         $line[] = ' *';
447 447
         $line[] = ' * This class was generated by the Doctrine ORM. Add your own custom';
448 448
         $line[] = ' * repository methods below.';
449 449
         $line[] = ' */';
450
-        $line[] = 'class ' . ucfirst($nameFormated) . 'Repository extends EntityRepository';
450
+        $line[] = 'class '.ucfirst($nameFormated).'Repository extends EntityRepository';
451 451
         $line[] = '{';
452 452
         $line[] = '';
453 453
         $line[] = '}';
@@ -458,21 +458,21 @@  discard block
 block discarded – undo
458 458
     private function makeMigration($pluginCode, $migration)
459 459
     {
460 460
         if ($this->paramList['supportFlag']['value']) {
461
-            $migrationFileCont = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/MigrationVersionSupport.php');
461
+            $migrationFileCont = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/MigrationVersionSupport.php');
462 462
         } else {
463
-            $migrationFileCont = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/MigrationVersion.php');
463
+            $migrationFileCont = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/MigrationVersion.php');
464 464
         }
465 465
 
466 466
         $entityList = $this->createEntityList($pluginCode, $migration);
467 467
 
468
-        $entityListStr = join(',' . PHP_EOL, $entityList);
468
+        $entityListStr = join(','.PHP_EOL, $entityList);
469 469
         $migrationFileCont = str_replace('[entityList]', $entityListStr, $migrationFileCont);
470 470
 
471 471
         if ($this->paramList['supportFlag']['value']) {
472 472
             $createParts = $this->makeCreateParts($migration);
473 473
             $tableNameArr = array();
474 474
             foreach ($createParts as $tableName => $tableArr) {
475
-                $tableNameArr[] = '            $this->createTable' . $tableName . '($schema);';
475
+                $tableNameArr[] = '            $this->createTable'.$tableName.'($schema);';
476 476
             }
477 477
             $tableNameStr = join(PHP_EOL, $tableNameArr);
478 478
             $migrationFileCont = str_replace('[createTable]', $tableNameStr, $migrationFileCont);
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
495 495
     {
496 496
         $ret = array();
497 497
         foreach ($migration as $TableInfo) {
498
-            $ret[] = "        '" . 'Plugin\\' . $pluginCode . '\Entity\\' . ucfirst($this->getShortClassName($TableInfo->getName())) . "'";
498
+            $ret[] = "        '".'Plugin\\'.$pluginCode.'\Entity\\'.ucfirst($this->getShortClassName($TableInfo->getName()))."'";
499 499
         }
500 500
         return $ret;
501 501
     }
@@ -512,14 +512,14 @@  discard block
 block discarded – undo
512 512
             $nameFormated = $this->getShortClassName($TableInfo->getName());
513 513
             $tmp = array();
514 514
             $tmp[] = PHP_EOL;
515
-            $tmp[] = '    public function createTable' . ucfirst($nameFormated) . '(Schema $schema)';
515
+            $tmp[] = '    public function createTable'.ucfirst($nameFormated).'(Schema $schema)';
516 516
             $tmp[] = '    {';
517
-            $tmp[] = '        $table = $schema->createTable(\'' . $TableInfo->getName() . '\');';
517
+            $tmp[] = '        $table = $schema->createTable(\''.$TableInfo->getName().'\');';
518 518
             $columns = $TableInfo->getColumns();
519 519
             foreach ($columns as $column) {
520 520
 
521 521
                 $typeName = $column->getType()->getName();
522
-                $tmp[] = '        $table->addColumn(\'' . $column->getName() . '\', \'' . $typeName . '\', array(';
522
+                $tmp[] = '        $table->addColumn(\''.$column->getName().'\', \''.$typeName.'\', array(';
523 523
                 $param = array();
524 524
                 if ($column->getNotNull()) {
525 525
                     $param['notnull'] = 'true';
@@ -530,16 +530,16 @@  discard block
 block discarded – undo
530 530
                     $param['unsigned'] = 'true';
531 531
                 }
532 532
                 if ($column->getDefault()) {
533
-                    $param['default'] = '\'' . $column->getDefault() . '\'';
533
+                    $param['default'] = '\''.$column->getDefault().'\'';
534 534
                 }
535 535
                 if ($column->getAutoincrement()) {
536 536
                     $param['autoincrement'] = 'true';
537 537
                 }
538 538
                 if ($column->getComment()) {
539
-                    $param['comment'] = '\'' . str_replace('\'', '\\\'', $column->getComment()) . '\'';
539
+                    $param['comment'] = '\''.str_replace('\'', '\\\'', $column->getComment()).'\'';
540 540
                 }
541 541
                 if ($column->getLength()) {
542
-                    $param['length'] = '\'' . $column->getLength() . '\'';
542
+                    $param['length'] = '\''.$column->getLength().'\'';
543 543
                 }
544 544
 
545 545
                 if ($typeName == 'decimal') {
@@ -547,7 +547,7 @@  discard block
 block discarded – undo
547 547
                     $param['scale'] = $column->getScale();
548 548
                 }
549 549
                 foreach ($param as $parKey => $parVal) {
550
-                    $tmp[] = '            \'' . $parKey . '\' => ' . $parVal . ',';
550
+                    $tmp[] = '            \''.$parKey.'\' => '.$parVal.',';
551 551
                 }
552 552
                 $tmp[] = '        ));';
553 553
             }
@@ -557,20 +557,20 @@  discard block
 block discarded – undo
557 557
                 if ($index->isPrimary()) {
558 558
                     $tmpCol = $index->getColumns();
559 559
                     foreach ($tmpCol as $colName) {
560
-                        $tmp[] = '        $table->setPrimaryKey(array(\'' . $colName . '\'));';
560
+                        $tmp[] = '        $table->setPrimaryKey(array(\''.$colName.'\'));';
561 561
                         break;
562 562
                     }
563 563
                 } else {
564 564
                     $tmp[] = '        $columnNames = array();';
565 565
                     foreach ($index->getColumns() as $IdentName) {
566
-                        $tmp[] = '        $columnNames[] = \'' . $IdentName . '\';';
566
+                        $tmp[] = '        $columnNames[] = \''.$IdentName.'\';';
567 567
                     }
568
-                    $tmp[] = '        $indexName = \'' . $index->getName() . '\';';
569
-                    $tmp[] = '        $options = ' . var_export($index->getOptions(), true) . ';';
568
+                    $tmp[] = '        $indexName = \''.$index->getName().'\';';
569
+                    $tmp[] = '        $options = '.var_export($index->getOptions(), true).';';
570 570
                     if ($index->isUnique()) {
571 571
                         $tmp[] = '        $table->addUniqueIndex($columnNames, $indexName, $options);';
572 572
                     } else {
573
-                        $tmp[] = '        $flags = ' . var_export($index->getFlags(), true) . ';';
573
+                        $tmp[] = '        $flags = '.var_export($index->getFlags(), true).';';
574 574
                         $tmp[] = '        $table->addIndex($columnNames, $indexName,$flags, $options);';
575 575
                     }
576 576
                 }
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
     {
588 588
         $ret = array();
589 589
         foreach ($migration as $TableInfo) {
590
-            $ret[] = '            $schema->dropTable(\'' . $TableInfo->getName() . '\');';
590
+            $ret[] = '            $schema->dropTable(\''.$TableInfo->getName().'\');';
591 591
         }
592 592
 
593 593
         return $ret;
Please login to merge, or discard this patch.
src/Eccube/Command/PluginCommand/PluginGenerator.php 1 patch
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     {
51 51
         $this->output->writeln('------------------------------------------------------');
52 52
         $this->output->writeln('---Plugin Generator');
53
-        $this->output->writeln('---[*]You can exit from Console Application, by typing ' . self::STOP_PROCESS . ' instead of typing another word.');
53
+        $this->output->writeln('---[*]You can exit from Console Application, by typing '.self::STOP_PROCESS.' instead of typing another word.');
54 54
         $this->output->writeln('------------------------------------------------------');
55 55
         $this->output->writeln('');
56 56
     }
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
                 'label' => '[+]Old version support: ',
102 102
                 'value' => null,
103 103
                 'name' => '[+]Do you want to support old versions too? [y/n]',
104
-                'show' => array(1 => 'Yes' ,0 => 'No'),
104
+                'show' => array(1 => 'Yes', 0 => 'No'),
105 105
                 'validation' => array(
106 106
                     'isRequired' => true,
107 107
                     'choice' => array('y' => 1, 'n' => 0)
@@ -148,13 +148,13 @@  discard block
 block discarded – undo
148 148
             $this->events = array();
149 149
             $routeEvents = array();
150 150
             if ($this->paramList['supportFlag']['value']) {
151
-                $this->events = include $this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/eventsList.php';
151
+                $this->events = include $this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/eventsList.php';
152 152
                 $routeEvents['eccube.event.controller.__route__.before'] = 'Controller__route__Before';
153 153
                 $routeEvents['eccube.event.controller.__route__.after'] = 'Controller__route__After';
154 154
                 $routeEvents['eccube.event.controller.__route__.finish'] = 'Controller__route__Finish';
155 155
                 $routeEvents['eccube.event.render.__route__.before'] = 'Render__route__Before';
156 156
             }
157
-            $this->events += include $this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/eventsListNew.php';
157
+            $this->events += include $this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/eventsListNew.php';
158 158
 
159 159
             $routeEvents['eccube.event.route.__route__.request'] = 'Route__route__Request';
160 160
             $routeEvents['eccube.event.route.__route__.controller'] = 'Route__route__Controller';
@@ -214,11 +214,11 @@  discard block
 block discarded – undo
214 214
         $config['code'] = $code;
215 215
         $config['version'] = $paramList['version']['value'];
216 216
         if (!empty($paramList['hookPoints']['value'])) {
217
-            $config['event'] = $code . 'Event';
217
+            $config['event'] = $code.'Event';
218 218
         }
219
-        $config['service'] = array($code . 'ServiceProvider');
219
+        $config['service'] = array($code.'ServiceProvider');
220 220
 
221
-        $codePath = $this->app['config']['root_dir'] . '/app/Plugin/' . $code;
221
+        $codePath = $this->app['config']['root_dir'].'/app/Plugin/'.$code;
222 222
 
223 223
         $file = new Filesystem();
224 224
         $file->mkdir($codePath);
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
             $fsList['dir'][$codePath] = false;
229 229
         }
230 230
 
231
-        $srcPath = $codePath . '/config.yml';
231
+        $srcPath = $codePath.'/config.yml';
232 232
         file_put_contents($srcPath, Yaml::dump($config));
233 233
         if (is_file($srcPath)) {
234 234
             $fsList['file'][$srcPath] = true;
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
         $year = date('Y');
241 241
 
242 242
         // PluginManager
243
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/PluginManager.php');
243
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/PluginManager.php');
244 244
         $from = '/\[code\]/';
245 245
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
246 246
         $from = '/\[author\]/';
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
         $from = '/\[year\]/';
249 249
         $pluginFileAfter = preg_replace($from, $year, $pluginFileAfter);
250 250
 
251
-        $srcPath = $codePath . '/PluginManager.php';
251
+        $srcPath = $codePath.'/PluginManager.php';
252 252
         file_put_contents($srcPath, $pluginFileAfter);
253 253
         if (is_file($srcPath)) {
254 254
             $fsList['file'][$srcPath] = true;
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
         }
258 258
 
259 259
         // ServiceProvider
260
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/ServiceProvider.php');
260
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/ServiceProvider.php');
261 261
         $from = '/\[code\]/';
262 262
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
263 263
         $from = '/\[author\]/';
@@ -265,14 +265,14 @@  discard block
 block discarded – undo
265 265
         $from = '/\[year\]/';
266 266
         $pluginFileAfter = preg_replace($from, $year, $pluginFileAfter);
267 267
 
268
-        $file->mkdir($codePath . '/ServiceProvider');
269
-        if (is_dir($codePath . '/ServiceProvider')) {
270
-            $fsList['dir'][$codePath . '/ServiceProvider'] = true;
268
+        $file->mkdir($codePath.'/ServiceProvider');
269
+        if (is_dir($codePath.'/ServiceProvider')) {
270
+            $fsList['dir'][$codePath.'/ServiceProvider'] = true;
271 271
         } else {
272
-            $fsList['dir'][$codePath . '/ServiceProvider'] = false;
272
+            $fsList['dir'][$codePath.'/ServiceProvider'] = false;
273 273
         }
274 274
 
275
-        $srcPath = $codePath . '/ServiceProvider/' . $code . 'ServiceProvider.php';
275
+        $srcPath = $codePath.'/ServiceProvider/'.$code.'ServiceProvider.php';
276 276
         file_put_contents($srcPath, $pluginFileAfter);
277 277
         if (is_file($srcPath)) {
278 278
             $fsList['file'][$srcPath] = true;
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
         }
282 282
 
283 283
         // ConfigController
284
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/ConfigController.php');
284
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/ConfigController.php');
285 285
         $from = '/\[code\]/';
286 286
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
287 287
         $from = '/\[author\]/';
@@ -291,14 +291,14 @@  discard block
 block discarded – undo
291 291
         $from = '/\[code_name\]/';
292 292
         $pluginFileAfter = preg_replace($from, mb_strtolower($code), $pluginFileAfter);
293 293
 
294
-        $file->mkdir($codePath . '/Controller');
295
-        if (is_dir($codePath . '/Controller')) {
296
-            $fsList['dir'][$codePath . '/Controller'] = true;
294
+        $file->mkdir($codePath.'/Controller');
295
+        if (is_dir($codePath.'/Controller')) {
296
+            $fsList['dir'][$codePath.'/Controller'] = true;
297 297
         } else {
298
-            $fsList['dir'][$codePath . '/Controller'] = false;
298
+            $fsList['dir'][$codePath.'/Controller'] = false;
299 299
         }
300 300
 
301
-        $srcPath = $codePath . '/Controller/ConfigController.php';
301
+        $srcPath = $codePath.'/Controller/ConfigController.php';
302 302
         file_put_contents($srcPath, $pluginFileAfter);
303 303
         if (is_file($srcPath)) {
304 304
             $fsList['file'][$srcPath] = true;
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
         }
308 308
 
309 309
         // Controller
310
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/Controller.php');
310
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/Controller.php');
311 311
         $from = '/\[code\]/';
312 312
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
313 313
         $from = '/\[author\]/';
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
         $from = '/\[code_name\]/';
318 318
         $pluginFileAfter = preg_replace($from, mb_strtolower($code), $pluginFileAfter);
319 319
 
320
-        $srcPath = $codePath . '/Controller/' . $code . 'Controller.php';
320
+        $srcPath = $codePath.'/Controller/'.$code.'Controller.php';
321 321
         file_put_contents($srcPath, $pluginFileAfter);
322 322
         if (is_file($srcPath)) {
323 323
             $fsList['file'][$srcPath] = true;
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
         }
327 327
 
328 328
         // Form
329
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/ConfigType.php');
329
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/ConfigType.php');
330 330
         $from = '/\[code\]/';
331 331
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
332 332
         $from = '/\[author\]/';
@@ -336,15 +336,15 @@  discard block
 block discarded – undo
336 336
         $from = '/\[code_name\]/';
337 337
         $pluginFileAfter = preg_replace($from, mb_strtolower($code), $pluginFileAfter);
338 338
 
339
-        $file->mkdir($codePath . '/Form/Type');
340
-        if (is_dir($codePath . '/Form/Type')) {
341
-            $fsList['dir'][$codePath . '/Form/Type'] = true;
339
+        $file->mkdir($codePath.'/Form/Type');
340
+        if (is_dir($codePath.'/Form/Type')) {
341
+            $fsList['dir'][$codePath.'/Form/Type'] = true;
342 342
         } else {
343
-            $fsList['dir'][$codePath . '/Form/Type'] = false;
343
+            $fsList['dir'][$codePath.'/Form/Type'] = false;
344 344
         }
345 345
 
346
-        $srcPath = $codePath . '/Form/Type/' . $code . 'ConfigType.php';
347
-        file_put_contents($codePath . '/Form/Type/' . $code . 'ConfigType.php', $pluginFileAfter);
346
+        $srcPath = $codePath.'/Form/Type/'.$code.'ConfigType.php';
347
+        file_put_contents($codePath.'/Form/Type/'.$code.'ConfigType.php', $pluginFileAfter);
348 348
         if (is_file($srcPath)) {
349 349
             $fsList['file'][$srcPath] = true;
350 350
         } else {
@@ -352,18 +352,18 @@  discard block
 block discarded – undo
352 352
         }
353 353
 
354 354
         // Twig
355
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/config.twig');
355
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/config.twig');
356 356
         $from = '/\[code\]/';
357 357
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
358 358
 
359
-        $file->mkdir($codePath . '/Resource/template/admin');
360
-        if (is_dir($codePath . '/Resource/template/admin')) {
361
-            $fsList['dir'][$codePath . '/Resource/template/admin'] = true;
359
+        $file->mkdir($codePath.'/Resource/template/admin');
360
+        if (is_dir($codePath.'/Resource/template/admin')) {
361
+            $fsList['dir'][$codePath.'/Resource/template/admin'] = true;
362 362
         } else {
363
-            $fsList['dir'][$codePath . '/Resource/template/admin'] = false;
363
+            $fsList['dir'][$codePath.'/Resource/template/admin'] = false;
364 364
         }
365 365
 
366
-        $srcPath = $codePath . '/Resource/template/admin/config.twig';
366
+        $srcPath = $codePath.'/Resource/template/admin/config.twig';
367 367
         file_put_contents($srcPath, $pluginFileAfter);
368 368
         if (is_file($srcPath)) {
369 369
             $fsList['file'][$srcPath] = true;
@@ -372,18 +372,18 @@  discard block
 block discarded – undo
372 372
         }
373 373
 
374 374
         // index.twig
375
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/index.twig');
375
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/index.twig');
376 376
         $from = '/\[code\]/';
377 377
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
378 378
 
379
-        $file->mkdir($codePath . '/Resource/template/admin');
380
-        if (is_dir($codePath . '/Resource/template/admin')) {
381
-            $fsList['dir'][$codePath . '/Resource/template/admin'] = true;
379
+        $file->mkdir($codePath.'/Resource/template/admin');
380
+        if (is_dir($codePath.'/Resource/template/admin')) {
381
+            $fsList['dir'][$codePath.'/Resource/template/admin'] = true;
382 382
         } else {
383
-            $fsList['dir'][$codePath . '/Resource/template/admin'] = false;
383
+            $fsList['dir'][$codePath.'/Resource/template/admin'] = false;
384 384
         }
385 385
 
386
-        $srcPath = $codePath . '/Resource/template/index.twig';
386
+        $srcPath = $codePath.'/Resource/template/index.twig';
387 387
         file_put_contents($srcPath, $pluginFileAfter);
388 388
         if (is_file($srcPath)) {
389 389
             $fsList['file'][$srcPath] = true;
@@ -398,8 +398,8 @@  discard block
 block discarded – undo
398 398
         $events = $paramList['events']['value'];
399 399
         if (count($events) > 0) {
400 400
             foreach ($events as $eventKey => $eventConst) {
401
-                $onEvents[$eventKey] = array(array('on' . $eventConst . ', NORMAL'));
402
-                $onFunctions[] = 'on' . $eventConst;
401
+                $onEvents[$eventKey] = array(array('on'.$eventConst.', NORMAL'));
402
+                $onFunctions[] = 'on'.$eventConst;
403 403
             }
404 404
         }
405 405
 
@@ -407,14 +407,14 @@  discard block
 block discarded – undo
407 407
         $hookPoints = $paramList['hookPoints']['value'];
408 408
         if (count($hookPoints)) {
409 409
             foreach ($hookPoints as $hookKey => $hookConst) {
410
-                $onName = 'on' . join(array_map('ucfirst', explode('_', strtolower($hookConst))));
411
-                $onEvents[$hookKey] = array(array($onName . ', NORMAL'));
410
+                $onName = 'on'.join(array_map('ucfirst', explode('_', strtolower($hookConst))));
411
+                $onEvents[$hookKey] = array(array($onName.', NORMAL'));
412 412
                 $onFunctions[] = $onName;
413 413
             }
414 414
         }
415 415
 
416 416
         if (count($onEvents)) {
417
-            $srcPath = $codePath . '/event.yml';
417
+            $srcPath = $codePath.'/event.yml';
418 418
             file_put_contents($srcPath, str_replace('\'', '', Yaml::dump($onEvents)));
419 419
             if (is_file($srcPath)) {
420 420
                 $fsList['file'][$srcPath] = true;
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
                 $fsList['file'][$srcPath] = false;
423 423
             }
424 424
 
425
-            $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/EventHookpoint2.php');
425
+            $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/EventHookpoint2.php');
426 426
 
427 427
             // Event
428 428
             $from = '/\[code\]/';
@@ -434,11 +434,11 @@  discard block
 block discarded – undo
434 434
 
435 435
             $functions = '';
436 436
             foreach ($onFunctions as $functionName) {
437
-                $functions .= "    public function " . $functionName . "(EventArgs \$event)\n    {\n    }\n\n";
437
+                $functions .= "    public function ".$functionName."(EventArgs \$event)\n    {\n    }\n\n";
438 438
             }
439 439
             $from = '/\[hookpoint_function\]/';
440 440
             $pluginFileAfter = preg_replace($from, $functions, $pluginFileAfter);
441
-            $srcPath = $codePath . '/' . $code . 'Event.php';
441
+            $srcPath = $codePath.'/'.$code.'Event.php';
442 442
             file_put_contents($srcPath, $pluginFileAfter);
443 443
             if (is_file($srcPath)) {
444 444
                 $fsList['file'][$srcPath] = true;
@@ -452,9 +452,9 @@  discard block
 block discarded – undo
452 452
         $config['name'] = $paramList['pluginName']['value'];
453 453
         $config['code'] = $code;
454 454
         $config['version'] = $paramList['version']['value'];
455
-        $config['event'] = $code . 'Event';
456
-        $config['service'] = array($code . 'ServiceProvider');
457
-        $srcPath = $codePath . '/config.yml';
455
+        $config['event'] = $code.'Event';
456
+        $config['service'] = array($code.'ServiceProvider');
457
+        $srcPath = $codePath.'/config.yml';
458 458
         file_put_contents($srcPath, Yaml::dump($config));
459 459
         if (is_file($srcPath)) {
460 460
             $fsList['file'][$srcPath] = true;
@@ -463,8 +463,8 @@  discard block
 block discarded – undo
463 463
         }
464 464
 
465 465
         // LICENSE
466
-        $srcPath = $codePath . '/LICENSE';
467
-        $file->copy($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/LICENSE', $srcPath);
466
+        $srcPath = $codePath.'/LICENSE';
467
+        $file->copy($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/LICENSE', $srcPath);
468 468
         if (is_file($srcPath)) {
469 469
             $fsList['file'][$srcPath] = true;
470 470
         } else {
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
             $this->output->writeln('');
494 494
             $this->output->writeln(' this files and folders were created.');
495 495
             foreach ($dirFileOk as $path) {
496
-                $this->output->writeln('<info> - ' . $path . '</info>');
496
+                $this->output->writeln('<info> - '.$path.'</info>');
497 497
             }
498 498
         }
499 499
 
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
             $this->output->writeln('');
502 502
             $this->output->writeln(' this files and folders was not created.');
503 503
             foreach ($dirFileOk as $path) {
504
-                $this->output->writeln('<error> - ' . $path . '</error>');
504
+                $this->output->writeln('<error> - '.$path.'</error>');
505 505
             }
506 506
         }
507 507
     }
@@ -524,9 +524,9 @@  discard block
 block discarded – undo
524 524
         $this->output->writeln('');
525 525
         $this->output->writeln('[+]Database');
526 526
         if ($Plugin->getId()) {
527
-            $this->output->writeln('<info> Plugin information was added to table [DB.Plugin] (id=' . $Plugin->getId() . ')</info>');
527
+            $this->output->writeln('<info> Plugin information was added to table [DB.Plugin] (id='.$Plugin->getId().')</info>');
528 528
         } else {
529
-            $this->output->writeln('<error> there was a problem inserting plugin information to table [DB.Plugin] (id=' . $Plugin->getId() . ')</error>');
529
+            $this->output->writeln('<error> there was a problem inserting plugin information to table [DB.Plugin] (id='.$Plugin->getId().')</error>');
530 530
         }
531 531
 
532 532
         $hookPoints = $paramList['hookPoints']['value'];
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
         $eventCount = 0;
538 538
         foreach ($hookPoints as $hookKey => $hookConst) {
539 539
             $PluginEventHandler = new PluginEventHandler();
540
-            $functionName = 'on' . join(array_map('ucfirst', explode('_', strtolower($hookConst))));
540
+            $functionName = 'on'.join(array_map('ucfirst', explode('_', strtolower($hookConst))));
541 541
             $PluginEventHandler->setPlugin($Plugin)
542 542
                 ->setEvent($hookKey)
543 543
                 ->setPriority($this->app['eccube.repository.plugin_event_handler']->calcNewPriority($hookKey, $functionName))
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
         $this->app['orm.em']->flush();
551 551
         if ($eventCount) {
552 552
             $this->output->writeln('');
553
-            $this->output->writeln('<info> Plugin information was added to table [DB.PluginEventHandler] (inserts number=' . $eventCount . ') </info>');
553
+            $this->output->writeln('<info> Plugin information was added to table [DB.PluginEventHandler] (inserts number='.$eventCount.') </info>');
554 554
         }
555 555
     }
556 556
 }
Please login to merge, or discard this patch.