Completed
Pull Request — 4.0 (#4898)
by
unknown
04:55
created
src/Eccube/Controller/Admin/Product/CsvImportController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
892 892
                     '%from%' => $this->convertLineNo(2),
893 893
                     '%to%' => $this->currentLineNo]),
894 894
                 'errors' => $this->errors,
895
-                'error_message' => trans('admin.common.csv_upload_line_error',[
895
+                'error_message' => trans('admin.common.csv_upload_line_error', [
896 896
                     '%from%' => $this->convertLineNo(2)])
897 897
             ]);
898 898
         }
@@ -1641,7 +1641,7 @@  discard block
 block discarded – undo
1641 1641
             return $this->json(['success' => true, 'file_name' => $fileName, 'max_file_no' => $fileNo]);
1642 1642
         }
1643 1643
 
1644
-        return $this->json(['success' => false, 'message' => $form->getErrors(true ,true)]);
1644
+        return $this->json(['success' => false, 'message' => $form->getErrors(true, true)]);
1645 1645
     }
1646 1646
 
1647 1647
     /**
Please login to merge, or discard this patch.
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/Product/ProductController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -356,13 +356,13 @@  discard block
 block discarded – undo
356 356
 
357 357
                         // 新しく描画するキャンバスを作成
358 358
                         $canvas = imagecreatetruecolor($origin_w, $origin_h);
359
-                        imagecopyresampled($canvas, $origin_image, 0,0,0,0, $origin_w, $origin_h, $origin_w, $origin_h);
359
+                        imagecopyresampled($canvas, $origin_image, 0, 0, 0, 0, $origin_w, $origin_h, $origin_w, $origin_h);
360 360
 
361 361
                         $filename = date('mdHis').uniqid('_').'.'.$extension;
362 362
                         $files[] = $filename;
363 363
 
364 364
                         // 保存先を指定
365
-                        $resize_path = $this->eccubeConfig['eccube_temp_image_dir'] . '/' . $filename;
365
+                        $resize_path = $this->eccubeConfig['eccube_temp_image_dir'].'/'.$filename;
366 366
 
367 367
                         // 画像形式ごとの処理
368 368
                         switch ($type) {
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
                     if (!$this->productImageRepository->findOneBy(['file_name' => $delete_image])) {
608 608
                         // 削除
609 609
                         $fs = new Filesystem();
610
-                        $fs->remove($this->eccubeConfig['eccube_save_image_dir'] . '/' . $delete_image);
610
+                        $fs->remove($this->eccubeConfig['eccube_save_image_dir'].'/'.$delete_image);
611 611
                     }
612 612
                 }
613 613
                 $this->entityManager->persist($Product);
Please login to merge, or discard this patch.