Completed
Pull Request — 4.0 (#4935)
by
unknown
05:32
created
src/Eccube/Form/Type/Admin/MasterdataType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
 
67 67
                     // OrderStatus/OrderStatusColorは対象外
68 68
                     // @see https://github.com/EC-CUBE/ec-cube/pull/4844
69
-                    if (in_array($meta->getName(), [OrderStatus::class, OrderStatusColor::class, CustomerOrderStatus::class,])) {
69
+                    if (in_array($meta->getName(), [OrderStatus::class, OrderStatusColor::class, CustomerOrderStatus::class, ])) {
70 70
                         continue;
71 71
                     }
72 72
 
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/FileController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
                 : $topDir;
181 181
             $newFilePath = $nowDir.'/'.$filename;
182 182
             if (file_exists($newFilePath)) {
183
-                throw new IOException(trans('admin.content.file.dir_exists', [ '%file_name%' => $filename, ]));
183
+                throw new IOException(trans('admin.content.file.dir_exists', ['%file_name%' => $filename, ]));
184 184
             }
185 185
             $fs->mkdir($newFilePath);
186 186
 
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
             $filename = $this->convertStrToServer($file->getClientOriginalName());
289 289
             try {
290 290
                 $file->move($nowDir, $filename);
291
-                $successCount ++;
291
+                $successCount++;
292 292
             } catch (FileException $e) {
293 293
                 $this->errors[] = ['message' => trans('admin.content.file.upload_error', [
294 294
                     '%file_name%' => $filename,
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -551,12 +551,12 @@
 block discarded – undo
551 551
 
552 552
                         // 他に同じ画像を参照する商品がなければ画像ファイルを削除
553 553
                         if (!$this->productImageRepository->findOneBy(['file_name' => $delete_image])) {
554
-                            $fs->remove($this->eccubeConfig['eccube_save_image_dir'] . '/' . $delete_image);
554
+                            $fs->remove($this->eccubeConfig['eccube_save_image_dir'].'/'.$delete_image);
555 555
                         }
556 556
 
557 557
                     } else {
558 558
                         // 追加してすぐに削除した画像は、Entityに追加されない
559
-                        $fs->remove($this->eccubeConfig['eccube_temp_image_dir'] . '/' . $delete_image);
559
+                        $fs->remove($this->eccubeConfig['eccube_temp_image_dir'].'/'.$delete_image);
560 560
                     }
561 561
                 }
562 562
 
Please login to merge, or discard this patch.