Completed
Push — experimental/3.1 ( a10ce1...874d3d )
by Kiyotaka
28:39
created
src/Eccube/Form/Type/Admin/PaymentRegisterType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@
 block discarded – undo
87 87
                 'label' => '手数料',
88 88
             ))
89 89
             ->add('fixed', HiddenType::class)
90
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
90
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
91 91
                 $form = $event->getForm();
92 92
                 $ruleMax = $form['rule_max']->getData();
93 93
                 $ruleMin = $form['rule_min']->getData();
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/BlockController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
                 // ファイル生成・更新
172 172
                 $tplDir = $this->appConfig['block_realdir'];
173 173
 
174
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
174
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
175 175
 
176 176
                 $fs = new Filesystem();
177 177
                 $blockData = $form->get('block_html')->getData();
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
                 $fs->dumpFile($filePath, $blockData);
180 180
                 // 更新でファイル名を変更した場合、以前のファイルを削除
181 181
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
182
-                    $oldFilePath = $tplDir . '/' . $previous_filename . '.twig';
182
+                    $oldFilePath = $tplDir.'/'.$previous_filename.'.twig';
183 183
                     if ($fs->exists($oldFilePath)) {
184 184
                         $fs->remove($oldFilePath);
185 185
                     }
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
237 237
         if ($Block->isDeletable()) {
238 238
             $tplDir = $this->appConfig['block_realdir'];
239
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
239
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
240 240
             $fs = new Filesystem();
241 241
             if ($fs->exists($file)) {
242 242
                 $fs->remove($file);
Please login to merge, or discard this patch.
src/Eccube/DI/AutoWiring/RepositoryDefinition.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@
 block discarded – undo
32 32
 
33 33
     /**
34 34
      * RepositoryDefinition constructor.
35
-     * @param $id
36
-     * @param $refClass
37
-     * @param $entityClass
35
+     * @param string $id
36
+     * @param \ReflectionClass $refClass
37
+     * @param string $entityClass
38 38
      */
39 39
     public function __construct($id, $refClass, $entityClass)
40 40
     {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -58,9 +58,9 @@
 block discarded – undo
58 58
 
59 59
         // 同じパッケージのEntityがあれば返す
60 60
         if (count($partsOfFqcn) > 2) {
61
-            $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn)-2));
62
-            $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) -1]);
63
-            $result = $parentNamespace . '\\Entity\\' . $entityName;
61
+            $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn) - 2));
62
+            $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) - 1]);
63
+            $result = $parentNamespace.'\\Entity\\'.$entityName;
64 64
             if (class_exists($result)) {
65 65
                 return $result;
66 66
             }
Please login to merge, or discard this patch.
src/Eccube/Service/Composer/OutputParser.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@
 block discarded – undo
127 127
 
128 128
     /**
129 129
      * @param $rowArray
130
-     * @param $key
130
+     * @param string $key
131 131
      * @return array
132 132
      */
133 133
     private static function parseArrayInfoOutput($rowArray, $key)
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
40 40
         $installedLogs = array_filter(
41 41
             array_map(
42
-                function ($line) {
42
+                function($line) {
43 43
                     $matches = array();
44 44
                     preg_match('/^  - Installing (.*?) \((.*?)\) .*/', $line, $matches);
45 45
 
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     public static function parseInfo($output)
63 63
     {
64 64
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
65
-        $infoLogs = array_filter(array_map(function ($line) {
65
+        $infoLogs = array_filter(array_map(function($line) {
66 66
             $matches = array();
67 67
             preg_match('/^(name|descrip.|keywords|versions|type|license|source|dist|names)\s*:\s*(.*)$/', $line, $matches);
68 68
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     public static function parseConfig($output)
87 87
     {
88 88
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
89
-        $rowArray = array_filter($rowArray, function ($line) {
89
+        $rowArray = array_filter($rowArray, function($line) {
90 90
             return !preg_match('/^<warning>.*/', $line);
91 91
         });
92 92
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
     public static function parseList($output)
103 103
     {
104 104
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
105
-        $rawConfig = array_map(function ($line) {
105
+        $rawConfig = array_map(function($line) {
106 106
             $matches = array();
107 107
             preg_match('/^\[(.*?)\]\s?(.*)$/', $line, $matches);
108 108
 
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
     public static function parseComposerVersion($output)
160 160
     {
161 161
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
162
-        $rowArray = array_filter($rowArray, function ($line) {
162
+        $rowArray = array_filter($rowArray, function($line) {
163 163
             return preg_match('/^Composer */', $line);
164 164
         });
165 165
         return array_shift($rowArray);
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php 2 patches
Unused Use Statements   -6 removed lines patch added patch discarded remove patch
@@ -27,12 +27,6 @@
 block discarded – undo
27 27
 use Eccube\Annotation\Inject;
28 28
 use Eccube\Entity\BaseInfo;
29 29
 use Eccube\Entity\ItemHolderInterface;
30
-use Eccube\Entity\Master\OrderItemType;
31
-use Eccube\Entity\Master\TaxDisplayType;
32
-use Eccube\Entity\Master\TaxType;
33
-use Eccube\Entity\Order;
34
-use Eccube\Entity\OrderItem;
35
-use Eccube\Entity\Shipping;
36 30
 use Eccube\Service\PurchaseFlow\ItemHolderProcessor;
37 31
 use Eccube\Service\PurchaseFlow\ProcessResult;
38 32
 use Eccube\Service\PurchaseFlow\PurchaseContext;
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
      * @param integer $pointRate ポイント付与率(%)
92 92
      * @param integer $price 単価
93 93
      * @param integer $quantity 数量
94
-     * @return integer additional point
94
+     * @return double additional point
95 95
      */
96 96
     protected function priceToAddPoint($pointRate, $price, $quantity)
97 97
     {
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/Processor/UsePointProcessor.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -11,11 +11,9 @@
 block discarded – undo
11 11
 use Eccube\Entity\BaseInfo;
12 12
 use Eccube\Entity\Order;
13 13
 use Eccube\Entity\OrderItem;
14
-use Eccube\Entity\Shipping;
15 14
 use Eccube\Service\PurchaseFlow\ItemHolderProcessor;
16 15
 use Eccube\Service\PurchaseFlow\ProcessResult;
17 16
 use Eccube\Service\PurchaseFlow\PurchaseContext;
18
-use Eccube\Util\EntityUtil;
19 17
 
20 18
 /**
21 19
  * 使用ポイント値引明細追加.
Please login to merge, or discard this patch.
src/Eccube/Repository/DeliveryRepository.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 
43 43
     /**
44 44
      * @deprecated 呼び出し元で制御する
45
-     * @param $id
45
+     * @param integer $id
46 46
      * @return Delivery|null|object
47 47
      */
48 48
     public function findOrCreate($id)
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/PurchaseFlowServiceProvider.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@  discard block
 block discarded – undo
17 17
 {
18 18
     public function register(Container $app)
19 19
     {
20
-        $app['eccube.purchase.context'] = $app->protect(function (ItemHolderInterface $origin = null, Customer $user = null) {
20
+        $app['eccube.purchase.context'] = $app->protect(function(ItemHolderInterface $origin = null, Customer $user = null) {
21 21
             return new PurchaseContext($origin, $user);
22 22
         });
23 23
 
24
-        $app['eccube.purchase.flow.cart.item_processors'] = function (Container $app) {
24
+        $app['eccube.purchase.flow.cart.item_processors'] = function(Container $app) {
25 25
             $processors = new ArrayCollection();
26 26
             $processors[] = new Processor\DisplayStatusValidator();
27 27
             $processors[] = new Processor\SaleLimitValidator();
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
             return $processors;
32 32
         };
33 33
 
34
-        $app['eccube.purchase.flow.cart.holder_processors'] = function (Container $app) {
34
+        $app['eccube.purchase.flow.cart.holder_processors'] = function(Container $app) {
35 35
             $processors = new ArrayCollection();
36 36
             $processors[] = new Processor\PaymentProcessor($app[DeliveryRepository::class]);
37 37
             $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']);
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
             return $processors;
42 42
         };
43 43
 
44
-        $app['eccube.purchase.flow.cart'] = function (Container $app) {
44
+        $app['eccube.purchase.flow.cart'] = function(Container $app) {
45 45
             $flow = new PurchaseFlow();
46 46
             $flow->setItemProcessors($app['eccube.purchase.flow.cart.item_processors']);
47 47
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.cart.holder_processors']);
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
             return $flow;
50 50
         };
51 51
 
52
-        $app['eccube.purchase.flow.shopping.item_processors'] = function (Container $app) {
52
+        $app['eccube.purchase.flow.shopping.item_processors'] = function(Container $app) {
53 53
             $processors = new ArrayCollection();
54 54
             $processors[] = new Processor\StockValidator();
55 55
             $processors[] = new Processor\DisplayStatusValidator();
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
             return $processors;
58 58
         };
59 59
 
60
-        $app['eccube.purchase.flow.shopping.holder_processors'] = function (Container $app) {
60
+        $app['eccube.purchase.flow.shopping.holder_processors'] = function(Container $app) {
61 61
             $processors = new ArrayCollection();
62 62
             $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']);
63 63
             $processors[] = new Processor\DeliveryFeeProcessor($app['orm.em']);
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
             return $processors;
72 72
         };
73 73
 
74
-        $app['eccube.purchase.flow.shopping.purchase'] = function (Container $app) {
74
+        $app['eccube.purchase.flow.shopping.purchase'] = function(Container $app) {
75 75
             $processors = new ArrayCollection();
76 76
             if ($app[BaseInfo::class]->isOptionPoint()) {
77 77
                 $processors[] = new Processor\UsePointToCustomerPurchaseProcessor();
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
             return $processors;
81 81
         };
82 82
 
83
-        $app['eccube.purchase.flow.shopping'] = function (Container $app) {
83
+        $app['eccube.purchase.flow.shopping'] = function(Container $app) {
84 84
             $flow = new PurchaseFlow();
85 85
             $flow->setItemProcessors($app['eccube.purchase.flow.shopping.item_processors']);
86 86
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.shopping.holder_processors']);
@@ -89,14 +89,14 @@  discard block
 block discarded – undo
89 89
             return $flow;
90 90
         };
91 91
 
92
-        $app['eccube.purchase.flow.order.item_processors'] = function (Container $app) {
92
+        $app['eccube.purchase.flow.order.item_processors'] = function(Container $app) {
93 93
             $processors = new ArrayCollection();
94 94
             $processors[] = new Processor\StockValidator();
95 95
 
96 96
             return $processors;
97 97
         };
98 98
 
99
-        $app['eccube.purchase.flow.order.holder_processors'] = function (Container $app) {
99
+        $app['eccube.purchase.flow.order.holder_processors'] = function(Container $app) {
100 100
             $processors = new ArrayCollection();
101 101
             $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']);
102 102
             $processors[] = new Processor\UpdateDatePurchaseProcessor($app['config']);
@@ -109,14 +109,14 @@  discard block
 block discarded – undo
109 109
             return $processors;
110 110
         };
111 111
 
112
-        $app['eccube.purchase.flow.order.purchase'] = function (Container $app) {
112
+        $app['eccube.purchase.flow.order.purchase'] = function(Container $app) {
113 113
             $processors = new ArrayCollection();
114 114
             $processors[] = new Processor\AdminOrderRegisterPurchaseProcessor($app);
115 115
 
116 116
             return $processors;
117 117
         };
118 118
 
119
-        $app['eccube.purchase.flow.order'] = function (Container $app) {
119
+        $app['eccube.purchase.flow.order'] = function(Container $app) {
120 120
             $flow = new PurchaseFlow();
121 121
             $flow->setItemProcessors($app['eccube.purchase.flow.order.item_processors']);
122 122
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.order.holder_processors']);
Please login to merge, or discard this patch.
src/Eccube/Repository/NewsRepository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@
 block discarded – undo
114 114
      */
115 115
     public function delete($News)
116 116
     {
117
-       $this->createQueryBuilder('n')
117
+        $this->createQueryBuilder('n')
118 118
             ->update()
119 119
             ->set('n.sort_no', 'n.sort_no - 1')
120 120
             ->where('n.sort_no > :sort_no')
Please login to merge, or discard this patch.