@@ -126,14 +126,14 @@ |
||
126 | 126 | setcookie($this->sessionName, '', 0, ini_get('session.cookie_path'), ini_get('session.cookie_domain'), filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN)); |
127 | 127 | } else { |
128 | 128 | setcookie($this->sessionName, '', |
129 | - [ |
|
130 | - 'expires' => 0, |
|
131 | - 'path' => $this->getCookiePath(), |
|
132 | - 'domain' => ini_get('session.cookie_domain'), |
|
133 | - 'secure' => filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), |
|
134 | - 'httponly' => filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN), |
|
135 | - 'samesite' => $this->getCookieSameSite(), |
|
136 | - ] |
|
129 | + [ |
|
130 | + 'expires' => 0, |
|
131 | + 'path' => $this->getCookiePath(), |
|
132 | + 'domain' => ini_get('session.cookie_domain'), |
|
133 | + 'secure' => filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), |
|
134 | + 'httponly' => filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN), |
|
135 | + 'samesite' => $this->getCookieSameSite(), |
|
136 | + ] |
|
137 | 137 | ); |
138 | 138 | } |
139 | 139 | } |
@@ -194,7 +194,7 @@ |
||
194 | 194 | /** |
195 | 195 | * 指定された複数ディレクトリのうち、いずれかのディレクトリ以下にファイルが存在するかを確認。 |
196 | 196 | * |
197 | - * @param $form FormInterface |
|
197 | + * @param FormInterface $form FormInterface |
|
198 | 198 | * @param $dirs array |
199 | 199 | */ |
200 | 200 | private function validateFilePath($form, $dirs) |
@@ -386,6 +386,9 @@ |
||
386 | 386 | $this->init($BaseInfo); |
387 | 387 | } |
388 | 388 | |
389 | + /** |
|
390 | + * @param string $packageNames |
|
391 | + */ |
|
389 | 392 | private function dropTableToExtra($packageNames) |
390 | 393 | { |
391 | 394 | foreach (explode(' ', trim($packageNames)) as $packageName) { |
@@ -54,7 +54,6 @@ |
||
54 | 54 | * @param callable $callback Metadata を生成した後に実行されるコールバック関数 |
55 | 55 | * @param array $generatedFiles Proxy ファイルパスの配列 |
56 | 56 | * @param string $proxiesDirectory Proxy ファイルを格納したディレクトリ |
57 | - * @param bool $saveMode UpdateSchema を即時実行する場合 true |
|
58 | 57 | * @param string $outputDir Metadata の出力先ディレクトリ |
59 | 58 | */ |
60 | 59 | public function executeCallback(callable $callback, $generatedFiles, $proxiesDirectory, $outputDir = null) |
@@ -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 | } |
@@ -412,7 +412,6 @@ discard block |
||
412 | 412 | } |
413 | 413 | |
414 | 414 | /** |
415 | - * @param \Doctrine\ORM\EntityManagerInterface $em |
|
416 | 415 | * @param array $excludes |
417 | 416 | * |
418 | 417 | * @return null|Request |
@@ -447,7 +446,7 @@ discard block |
||
447 | 446 | /** |
448 | 447 | * @param \DateTime $dateTime |
449 | 448 | * |
450 | - * @return array|mixed |
|
449 | + * @return null|Request |
|
451 | 450 | * |
452 | 451 | * @throws \Doctrine\ORM\NonUniqueResultException |
453 | 452 | */ |
@@ -484,7 +483,7 @@ discard block |
||
484 | 483 | /** |
485 | 484 | * @param \DateTime $dateTime |
486 | 485 | * |
487 | - * @return array|mixed |
|
486 | + * @return null|Request |
|
488 | 487 | * |
489 | 488 | * @throws \Doctrine\ORM\NonUniqueResultException |
490 | 489 | */ |
@@ -523,7 +522,7 @@ discard block |
||
523 | 522 | /** |
524 | 523 | * 在庫切れ商品数を取得 |
525 | 524 | * |
526 | - * @return mixed |
|
525 | + * @return null|Request |
|
527 | 526 | * |
528 | 527 | * @throws \Doctrine\ORM\NonUniqueResultException |
529 | 528 | */ |
@@ -543,7 +542,7 @@ discard block |
||
543 | 542 | /** |
544 | 543 | * 商品数を取得 |
545 | 544 | * |
546 | - * @return mixed |
|
545 | + * @return null|Request |
|
547 | 546 | * |
548 | 547 | * @throws \Doctrine\ORM\NonUniqueResultException |
549 | 548 | */ |
@@ -560,7 +559,7 @@ discard block |
||
560 | 559 | /** |
561 | 560 | * 本会員数を取得 |
562 | 561 | * |
563 | - * @return mixed |
|
562 | + * @return null|Request |
|
564 | 563 | * |
565 | 564 | * @throws \Doctrine\ORM\NonUniqueResultException |
566 | 565 | */ |
@@ -579,7 +578,7 @@ discard block |
||
579 | 578 | * |
580 | 579 | * @param Carbon $fromDate |
581 | 580 | * @param Carbon $toDate |
582 | - * @param $format |
|
581 | + * @param string $format |
|
583 | 582 | * |
584 | 583 | * @return array |
585 | 584 | */ |
@@ -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 | }); |
@@ -62,6 +62,9 @@ |
||
62 | 62 | $I->see('ログインできませんでした。', 'p.ec-errorMessage'); |
63 | 63 | } |
64 | 64 | |
65 | + /** |
|
66 | + * @param string $email |
|
67 | + */ |
|
65 | 68 | private function newCustomer($email) |
66 | 69 | { |
67 | 70 | $Customer = new Customer(); |