@@ -892,7 +892,7 @@ discard block |
||
| 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 |
||
| 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 | /** |
@@ -66,7 +66,7 @@ |
||
| 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 | |
@@ -180,7 +180,7 @@ discard block |
||
| 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 |
||
| 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, |