@@ -132,7 +132,7 @@ |
||
| 132 | 132 | * @param string $where 追加の検索条件 |
| 133 | 133 | * @param string[] $parameters 追加の検索パラメーター |
| 134 | 134 | * |
| 135 | - * @return array ページ属性の配列 |
|
| 135 | + * @return null|\Symfony\Component\HttpFoundation\Request ページ属性の配列 |
|
| 136 | 136 | */ |
| 137 | 137 | public function getPageList($where = null, $parameters = []) |
| 138 | 138 | { |
@@ -33,8 +33,8 @@ |
||
| 33 | 33 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
| 34 | 34 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 35 | 35 | use Symfony\Component\Form\FormInterface; |
| 36 | -use Symfony\Component\HttpFoundation\Response; |
|
| 37 | 36 | use Symfony\Component\HttpFoundation\Request; |
| 37 | +use Symfony\Component\HttpFoundation\Response; |
|
| 38 | 38 | use Symfony\Component\Routing\Annotation\Route; |
| 39 | 39 | use Symfony\Component\Routing\RouterInterface; |
| 40 | 40 | use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; |
@@ -251,7 +251,7 @@ |
||
| 251 | 251 | ] |
| 252 | 252 | ); |
| 253 | 253 | |
| 254 | - if(!is_null($qtyInCart)) { |
|
| 254 | + if (!is_null($qtyInCart)) { |
|
| 255 | 255 | |
| 256 | 256 | return [ |
| 257 | 257 | 'qtyInCart' => $qtyInCart, |
@@ -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 | */ |
@@ -541,7 +540,7 @@ discard block |
||
| 541 | 540 | /** |
| 542 | 541 | * 商品数を取得 |
| 543 | 542 | * |
| 544 | - * @return mixed |
|
| 543 | + * @return null|Request |
|
| 545 | 544 | * |
| 546 | 545 | * @throws \Doctrine\ORM\NonUniqueResultException |
| 547 | 546 | */ |
@@ -558,7 +557,7 @@ discard block |
||
| 558 | 557 | /** |
| 559 | 558 | * 本会員数を取得 |
| 560 | 559 | * |
| 561 | - * @return mixed |
|
| 560 | + * @return null|Request |
|
| 562 | 561 | * |
| 563 | 562 | * @throws \Doctrine\ORM\NonUniqueResultException |
| 564 | 563 | */ |
@@ -577,7 +576,7 @@ discard block |
||
| 577 | 576 | * |
| 578 | 577 | * @param Carbon $fromDate |
| 579 | 578 | * @param Carbon $toDate |
| 580 | - * @param $format |
|
| 579 | + * @param string $format |
|
| 581 | 580 | * |
| 582 | 581 | * @return array |
| 583 | 582 | */ |
@@ -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) |
@@ -24,8 +24,8 @@ |
||
| 24 | 24 | use Symfony\Component\Form\Extension\Core\Type\CollectionType; |
| 25 | 25 | use Symfony\Component\Form\Extension\Core\Type\FileType; |
| 26 | 26 | use Symfony\Component\Form\Extension\Core\Type\HiddenType; |
| 27 | -use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
| 28 | 27 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
| 28 | +use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
| 29 | 29 | use Symfony\Component\Form\FormBuilderInterface; |
| 30 | 30 | use Symfony\Component\Form\FormError; |
| 31 | 31 | use Symfony\Component\Form\FormEvent; |
@@ -47,7 +47,6 @@ |
||
| 47 | 47 | * @param callable $callback Metadata を生成した後に実行されるコールバック関数 |
| 48 | 48 | * @param array $generatedFiles Proxy ファイルパスの配列 |
| 49 | 49 | * @param string $proxiesDirectory Proxy ファイルを格納したディレクトリ |
| 50 | - * @param bool $saveMode UpdateSchema を即時実行する場合 true |
|
| 51 | 50 | * @param string $outputDir Metadata の出力先ディレクトリ |
| 52 | 51 | */ |
| 53 | 52 | public function executeCallback(callable $callback, $generatedFiles, $proxiesDirectory, $outputDir = null) |
@@ -19,8 +19,8 @@ |
||
| 19 | 19 | use Eccube\Doctrine\ORM\Mapping\Driver\NopAnnotationDriver; |
| 20 | 20 | use Eccube\Doctrine\ORM\Mapping\Driver\ReloadSafeAnnotationDriver; |
| 21 | 21 | use Eccube\Util\StringUtil; |
| 22 | -use Symfony\Component\Finder\Finder; |
|
| 23 | 22 | use Symfony\Component\Filesystem\Filesystem; |
| 23 | +use Symfony\Component\Finder\Finder; |
|
| 24 | 24 | |
| 25 | 25 | class SchemaService |
| 26 | 26 | { |
@@ -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) { |
@@ -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); |