Completed
Pull Request — experimental/3.1 (#2168)
by Kentaro
48:37
created
src/Eccube/Doctrine/Filter/OrderStatusFilter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,12 +33,12 @@
 block discarded – undo
33 33
     {
34 34
         // 決済処理中/購入処理中を除く.
35 35
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Order') {
36
-            return $targetTableAlias . '.status <> 7 AND ' . $targetTableAlias . '.status <> 8';
36
+            return $targetTableAlias.'.status <> 7 AND '.$targetTableAlias.'.status <> 8';
37 37
         }
38 38
 
39 39
         // 決済処理中/購入処理中を除く.
40 40
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Master\OrderStatus') {
41
-            return $targetTableAlias . '.id <> 7 AND ' . $targetTableAlias . '.id <> 8';
41
+            return $targetTableAlias.'.id <> 7 AND '.$targetTableAlias.'.id <> 8';
42 42
         }
43 43
 
44 44
         return '';
Please login to merge, or discard this patch.
src/Eccube/Doctrine/Filter/SoftDeleteFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
47 47
     {
48 48
         if ($targetEntity->hasField('del_flg') && !in_array($targetEntity->getName(), $this->getExcludes())) {
49
-            return $targetTableAlias . '.del_flg = 0';
49
+            return $targetTableAlias.'.del_flg = 0';
50 50
         } else {
51 51
             return "";
52 52
         }
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ProductClassType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
                 'required' => false,
149 149
                 'value' => 1,
150 150
             ))
151
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
151
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
152 152
                 $form = $event->getForm();
153 153
                 $data = $form->getData();
154 154
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/TradelawType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 {
34 34
     protected $config;
35 35
 
36
-    public function __construct ($config)
36
+    public function __construct($config)
37 37
     {
38 38
         $this->config = $config;
39 39
     }
Please login to merge, or discard this patch.
src/Eccube/Form/Type/NameType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,10 +62,10 @@
 block discarded – undo
62 62
         }
63 63
 
64 64
         if (empty($options['lastname_name'])) {
65
-            $options['lastname_name'] = $builder->getName() . '01';
65
+            $options['lastname_name'] = $builder->getName().'01';
66 66
         }
67 67
         if (empty($options['firstname_name'])) {
68
-            $options['firstname_name'] = $builder->getName() . '02';
68
+            $options['firstname_name'] = $builder->getName().'02';
69 69
         }
70 70
 
71 71
         $builder
Please login to merge, or discard this patch.
src/Eccube/Form/Type/PriceType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
             new Assert\GreaterThanOrEqual(array('value' => 0)),
48 48
         );
49 49
 
50
-        $constraints = function (Options $options) use ($defaultValues) {
50
+        $constraints = function(Options $options) use ($defaultValues) {
51 51
             if (false !== $options['required']) {
52 52
                 return array_merge($defaultValues, array(new Assert\NotBlank()));
53 53
             }
Please login to merge, or discard this patch.
src/Eccube/Form/Type/ShippingMultipleType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
         $app = $this->app;
48 48
 
49 49
         $builder
50
-            ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) {
50
+            ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) {
51 51
                 /** @var \Eccube\Entity\ShipmentItem $data */
52 52
                 $data = $event->getData();
53 53
                 /** @var \Symfony\Component\Form\Form $form */
Please login to merge, or discard this patch.
src/Eccube/Plugin/AbstractPluginManager.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@
 block discarded – undo
17 17
         $config->registerMigrationsFromDirectory($migrationFilePath );
18 18
         $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode);
19 19
         $migration = new Migration($config);
20
-                                  // null 又は 'last' を渡すと最新バージョンまでマイグレートする
21
-                                  // 0か'first'を渡すと最初に戻る
20
+                                    // null 又は 'last' を渡すと最新バージョンまでマイグレートする
21
+                                    // 0か'first'を渡すと最初に戻る
22 22
         $migration->migrate($version, false); 
23 23
 
24 24
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,12 +9,12 @@
 block discarded – undo
9 9
 
10 10
     CONST MIGRATION_TABLE_PREFIX = 'migration_';
11 11
 
12
-    public function migrationSchema($app,$migrationFilePath,$pluginCode,$version=null)
12
+    public function migrationSchema($app, $migrationFilePath, $pluginCode, $version = null)
13 13
     {
14 14
         $config = new Configuration($app['db']);
15 15
         $config->setMigrationsNamespace('DoctrineMigrations');
16 16
         $config->setMigrationsDirectory($migrationFilePath);
17
-        $config->registerMigrationsFromDirectory($migrationFilePath );
17
+        $config->registerMigrationsFromDirectory($migrationFilePath);
18 18
         $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode);
19 19
         $migration = new Migration($config);
20 20
                                   // null 又は 'last' を渡すと最新バージョンまでマイグレートする
Please login to merge, or discard this patch.
src/Eccube/Repository/BlockRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -187,7 +187,7 @@
 block discarded – undo
187 187
             $this->app['config']['block_default_realdir'],
188 188
         );
189 189
         foreach ($readPaths as $readPath) {
190
-            $filePath = $readPath . '/' . $fileName . '.twig';
190
+            $filePath = $readPath.'/'.$fileName.'.twig';
191 191
             $fs = new Filesystem();
192 192
             if ($fs->exists($filePath)) {
193 193
                 return array(
Please login to merge, or discard this patch.