Completed
Pull Request — experimental/3.1 (#2644)
by k-yamamura
58:57 queued 33:58
created
app/Plugin/QueryCustomize/ServiceProvider/QueryCustomizeServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 {
13 13
     public function register(Container $app)
14 14
     {
15
-        $app['plugin.query_customize.customer_search'] = function (Container $container) {
15
+        $app['plugin.query_customize.customer_search'] = function(Container $container) {
16 16
             return new AdminCustomerCustomizer();
17 17
         };
18 18
     }
Please login to merge, or discard this patch.
src/Eccube/Command/RouterCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
             if (strtoupper($orderby) === "PATH") {
95 95
                 uasort(
96 96
                     $routes,
97
-                    function ($a, $b) {
97
+                    function($a, $b) {
98 98
                         return strcmp($a->getPath(), $b->getPath());
99 99
                     }
100 100
                 );
Please login to merge, or discard this patch.
app/Plugin/Strategy/ServiceProvider/StrategyServiceProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,14 +12,14 @@
 block discarded – undo
12 12
     public function register(Container $app)
13 13
     {
14 14
         // サンプルの空Strategyをコンテナに登録
15
-        $app['eccube.calculate.strategy.empty'] = function () {
15
+        $app['eccube.calculate.strategy.empty'] = function() {
16 16
             return new EmptyStrategy();
17 17
         };
18 18
 
19 19
         // 空Strategyを追加.
20 20
         $app->extend(
21 21
             'eccube.calculate.strategies',
22
-            function (CalculateStrategyCollection $Collection, Container $app) {
22
+            function(CalculateStrategyCollection $Collection, Container $app) {
23 23
                 $Collection->add($app['eccube.calculate.strategy.empty']);
24 24
 
25 25
                 return $Collection;
Please login to merge, or discard this patch.
PurchaseProcessors/ServiceProvider/PurchaseProcessorsServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
     {
15 15
         $app->extend(
16 16
             'eccube.purchase.flow.cart.item_processors',
17
-            function (ArrayCollection $processors, Container $app) {
17
+            function(ArrayCollection $processors, Container $app) {
18 18
                 $processors[] = new EmptyProcessor();
19 19
                 $processors[] = new ValidatableEmptyProcessor();
20 20
                 return $processors;
Please login to merge, or discard this patch.
app/Plugin/FormExtension/ServiceProvider/FormExtensionServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
     {
13 13
         $app->extend(
14 14
             'form.type.extensions',
15
-            function ($extensions) {
15
+            function($extensions) {
16 16
                 $extensions[] = new EntryTypeExtension();
17 17
 
18 18
                 return $extensions;
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/PurchaseFlow.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
      */
105 105
     protected function calculateTotal(ItemHolderInterface $itemHolder)
106 106
     {
107
-        $total = $itemHolder->getItems()->reduce(function ($sum, ItemInterface $item) {
107
+        $total = $itemHolder->getItems()->reduce(function($sum, ItemInterface $item) {
108 108
             $sum += $item->getPriceIncTax() * $item->getQuantity();
109 109
 
110 110
             return $sum;
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
     {
122 122
         $total = $itemHolder->getItems()
123 123
             ->getProductClasses()
124
-            ->reduce(function ($sum, ItemInterface $item) {
124
+            ->reduce(function($sum, ItemInterface $item) {
125 125
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
126 126
 
127 127
                 return $sum;
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
     {
141 141
         $total = $itemHolder->getItems()
142 142
             ->getDeliveryFees()
143
-            ->reduce(function ($sum, ItemInterface $item) {
143
+            ->reduce(function($sum, ItemInterface $item) {
144 144
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
145 145
 
146 146
                 return $sum;
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
     {
156 156
         $total = $itemHolder->getItems()
157 157
             ->getDiscounts()
158
-            ->reduce(function ($sum, ItemInterface $item) {
158
+            ->reduce(function($sum, ItemInterface $item) {
159 159
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
160 160
 
161 161
                 return $sum;
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
     {
172 172
         $total = $itemHolder->getItems()
173 173
             ->getCharges()
174
-            ->reduce(function ($sum, ItemInterface $item) {
174
+            ->reduce(function($sum, ItemInterface $item) {
175 175
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
176 176
 
177 177
                 return $sum;
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
     protected function calculateTax(ItemHolderInterface $itemHolder)
186 186
     {
187 187
         $total = $itemHolder->getItems()
188
-            ->reduce(function ($sum, ItemInterface $item) {
188
+            ->reduce(function($sum, ItemInterface $item) {
189 189
                 $sum += ($item->getPriceIncTax() - $item->getPrice()) * $item->getQuantity();
190 190
 
191 191
                 return $sum;
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/PurchaseFlowResult.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
      */
54 54
     public function getErrors()
55 55
     {
56
-        return array_filter($this->processResults, function (ProcessResult $processResult) {
56
+        return array_filter($this->processResults, function(ProcessResult $processResult) {
57 57
             return $processResult->isError();
58 58
         });
59 59
     }
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
      */
64 64
     public function getWarning()
65 65
     {
66
-        return array_filter($this->processResults, function (ProcessResult $processResult) {
66
+        return array_filter($this->processResults, function(ProcessResult $processResult) {
67 67
             return $processResult->isWarning();
68 68
         });
69 69
     }
Please login to merge, or discard this patch.
src/Eccube/Controller/AbstractController.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -59,11 +59,17 @@
 block discarded – undo
59 59
      */
60 60
     protected $formFactory;
61 61
 
62
+    /**
63
+     * @param \Eccube\Application $app
64
+     */
62 65
     protected function getSecurity($app)
63 66
     {
64 67
         return $this->tokenStorage;
65 68
     }
66 69
 
70
+    /**
71
+     * @param \Eccube\Application $app
72
+     */
67 73
     protected function isTokenValid($app)
68 74
     {
69 75
         $csrf = $this->csrfTokenManager;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/FileController.php 2 patches
Doc Comments   +11 added lines patch added patch discarded remove patch
@@ -270,6 +270,10 @@  discard block
 block discarded – undo
270 270
         return $str;
271 271
     }
272 272
 
273
+    /**
274
+     * @param string $topDir
275
+     * @param Request $request
276
+     */
273 277
     private function getTree($topDir, $request)
274 278
     {
275 279
         $finder = Finder::create()->in($topDir)
@@ -307,6 +311,10 @@  discard block
 block discarded – undo
307 311
         return $tree;
308 312
     }
309 313
 
314
+    /**
315
+     * @param Application $app
316
+     * @param string $nowDir
317
+     */
310 318
     private function getFileList($app, $nowDir)
311 319
     {
312 320
         $topDir = $this->appConfig['user_data_realdir'];
@@ -366,6 +374,9 @@  discard block
 block discarded – undo
366 374
         return (strpos($targetDir, $topDir) === 0);
367 375
     }
368 376
 
377
+    /**
378
+     * @return string
379
+     */
369 380
     private function convertStrFromServer($target)
370 381
     {
371 382
         if ($this->encode == self::SJIS) {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
     private $error = null;
65 65
     private $encode = '';
66 66
 
67
-    public function __construct(){
67
+    public function __construct() {
68 68
         $this->encode = self::UTF;
69 69
         if ('\\' === DIRECTORY_SEPARATOR) {
70 70
             $this->encode = self::SJIS;
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
         $arrFileList = $this->getFileList($app, $nowDir);
114 114
 
115 115
         $javascript = $this->getJsArrayList($tree);
116
-        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '" . $nowDir . "', 'tree_select_file', 'tree_status', 'move');";
116
+        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '".$nowDir."', 'tree_select_file', 'tree_status', 'move');";
117 117
 
118 118
         return [
119 119
             'form' => $form->createView(),
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
                 $nowDir = $this->checkDir($request->get('now_dir'), $topDir)
175 175
                     ? $this->normalizePath($request->get('now_dir'))
176 176
                     : $topDir;
177
-                $fs->mkdir($nowDir . '/' . $filename);
177
+                $fs->mkdir($nowDir.'/'.$filename);
178 178
             }
179 179
         }
180 180
     }
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
     {
260 260
         $str = "arrTree = new Array();\n";
261 261
         foreach ($tree as $key => $val) {
262
-            $str .= 'arrTree[' . $key . "] = new Array(" . $key . ", '" . $val['type'] . "', '" . $val['path'] . "', " . $val['rank'] . ',';
262
+            $str .= 'arrTree['.$key."] = new Array(".$key.", '".$val['type']."', '".$val['path']."', ".$val['rank'].',';
263 263
             if ($val['open']) {
264 264
                 $str .= "true);\n";
265 265
             } else {
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
     private function getFileList($app, $nowDir)
311 311
     {
312 312
         $topDir = $this->appConfig['user_data_realdir'];
313
-        $filter = function (\SplFileInfo $file) use ($topDir) {
313
+        $filter = function(\SplFileInfo $file) use ($topDir) {
314 314
             $acceptPath = realpath($topDir);
315 315
             $targetPath = $file->getRealPath();
316 316
             return (strpos($targetPath, $acceptPath) === 0);
Please login to merge, or discard this patch.