@@ -445,6 +445,9 @@ discard block |
||
445 | 445 | ->削除(); |
446 | 446 | } |
447 | 447 | |
448 | + /** |
|
449 | + * @param string $fileName |
|
450 | + */ |
|
448 | 451 | private function publishPlugin($fileName) |
449 | 452 | { |
450 | 453 | copy(codecept_data_dir().'/'.'plugins/'.$fileName, codecept_root_dir().'/repos/'.$fileName); |
@@ -591,6 +594,9 @@ discard block |
||
591 | 594 | /** @var Store_Plugin */ |
592 | 595 | protected $dependency; |
593 | 596 | |
597 | + /** |
|
598 | + * @param string $code |
|
599 | + */ |
|
594 | 600 | public function __construct(AcceptanceTester $I, $code, Store_Plugin $dependency = null) |
595 | 601 | { |
596 | 602 | parent::__construct($I); |
@@ -723,6 +729,9 @@ discard block |
||
723 | 729 | return $this; |
724 | 730 | } |
725 | 731 | |
732 | + /** |
|
733 | + * @param string $fileName |
|
734 | + */ |
|
726 | 735 | protected function publishPlugin($fileName) |
727 | 736 | { |
728 | 737 | $published = copy(codecept_data_dir().'/'.'plugins/'.$fileName, codecept_root_dir().'/repos/'.$fileName); |
@@ -741,6 +750,9 @@ discard block |
||
741 | 750 | /** @var string */ |
742 | 751 | private $code; |
743 | 752 | |
753 | + /** |
|
754 | + * @param string $code |
|
755 | + */ |
|
744 | 756 | public function __construct(AcceptanceTester $I, $code) |
745 | 757 | { |
746 | 758 | parent::__construct($I); |
@@ -226,7 +226,7 @@ |
||
226 | 226 | |
227 | 227 | // id |
228 | 228 | if (isset($searchData['id']) && StringUtil::isNotBlank($searchData['id'])) { |
229 | - $id = preg_match('/^\d{0,10}$/', $searchData['id']) ? $searchData['id'] : null; |
|
229 | + $id = preg_match('/^\d{0,10}$/', $searchData['id']) ? $searchData['id'] : null; |
|
230 | 230 | if ($id && $id > '2147483647' && $this->isPostgreSQL()) { |
231 | 231 | $id = null; |
232 | 232 | } |
@@ -17,10 +17,10 @@ |
||
17 | 17 | use Eccube\Event\EccubeEvents; |
18 | 18 | use Eccube\Event\EventArgs; |
19 | 19 | use Eccube\Form\Type\Admin\LogType; |
20 | -use Symfony\Component\Routing\Annotation\Route; |
|
21 | 20 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
22 | 21 | use Symfony\Component\HttpFoundation\Request; |
23 | 22 | use Symfony\Component\HttpFoundation\StreamedResponse; |
23 | +use Symfony\Component\Routing\Annotation\Route; |
|
24 | 24 | |
25 | 25 | class LogController extends AbstractController |
26 | 26 | { |
@@ -71,13 +71,13 @@ |
||
71 | 71 | if ($form->getClickedButton() && $form->getClickedButton()->getName() === 'download') { |
72 | 72 | $bufferSize = 1024 * 50; |
73 | 73 | $response = new StreamedResponse(); |
74 | - $response->headers->set('Content-Length',filesize($logFile)); |
|
75 | - $response->headers->set('Content-Disposition','attachment; filename=' . basename($logFile)); |
|
76 | - $response->headers->set('Content-Type','application/octet-stream'); |
|
77 | - $response->setCallback(function() use($logFile,$bufferSize) { |
|
78 | - if ($fh = fopen($logFile,'r')) { |
|
74 | + $response->headers->set('Content-Length', filesize($logFile)); |
|
75 | + $response->headers->set('Content-Disposition', 'attachment; filename='.basename($logFile)); |
|
76 | + $response->headers->set('Content-Type', 'application/octet-stream'); |
|
77 | + $response->setCallback(function () use($logFile, $bufferSize) { |
|
78 | + if ($fh = fopen($logFile, 'r')) { |
|
79 | 79 | while (!feof($fh)) { |
80 | - echo fread($fh,$bufferSize); |
|
80 | + echo fread($fh, $bufferSize); |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 | }); |
@@ -56,7 +56,7 @@ |
||
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']) { |
@@ -56,7 +56,7 @@ |
||
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']) { |
@@ -550,7 +550,7 @@ |
||
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); |
@@ -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 | /** |
@@ -76,6 +76,9 @@ |
||
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); |