Completed
Pull Request — 4.0 (#4926)
by akira
174:19 queued 160:06
created
src/Eccube/Form/Type/PostalType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
     public function configureOptions(OptionsResolver $resolver)
57 57
     {
58 58
         $eccubeConfig = $this->eccubeConfig;
59
-        $constraints = function(Options $options) use ($eccubeConfig) {
59
+        $constraints = function (Options $options) use ($eccubeConfig) {
60 60
             $constraints = [];
61 61
             // requiredがtrueに指定されている場合, NotBlankを追加
62 62
             if (isset($options['required']) && true === $options['required']) {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/PhoneNumberType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
     public function configureOptions(OptionsResolver $resolver)
57 57
     {
58 58
         $eccubeConfig = $this->eccubeConfig;
59
-        $constraints = function(Options $options) use ($eccubeConfig) {
59
+        $constraints = function (Options $options) use ($eccubeConfig) {
60 60
             $constraints = [];
61 61
             // requiredがtrueに指定されている場合, NotBlankを追加
62 62
             if (isset($options['required']) && true === $options['required']) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -550,7 +550,7 @@
 block discarded – undo
550 550
                     if (!$this->productImageRepository->findOneBy(['file_name' => $delete_image])) {
551 551
                         // 削除
552 552
                         $fs = new Filesystem();
553
-                        $fs->remove($this->eccubeConfig['eccube_save_image_dir'] . '/' . $delete_image);
553
+                        $fs->remove($this->eccubeConfig['eccube_save_image_dir'].'/'.$delete_image);
554 554
                     }
555 555
                 }
556 556
                 $this->entityManager->persist($Product);
Please login to merge, or discard this patch.
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/Controller/Admin/AbstractCsvImportController.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -76,6 +76,9 @@
 block discarded – undo
76 76
         return $data->setHeaderRowNumber(0) ? $data : false;
77 77
     }
78 78
 
79
+    /**
80
+     * @param string $filename
81
+     */
79 82
     protected function sendTemplateResponse(Request $request, $columns, $filename)
80 83
     {
81 84
         set_time_limit(0);
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/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.