@@ -347,7 +347,7 @@ |
||
| 347 | 347 | * |
| 348 | 348 | * @param null $currency |
| 349 | 349 | * |
| 350 | - * @return bool|string |
|
| 350 | + * @return string|null |
|
| 351 | 351 | */ |
| 352 | 352 | public function getCurrencySymbol($currency = null) |
| 353 | 353 | { |
@@ -64,12 +64,12 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | // SSL強制時は, httpsのみにアクセス制限する |
| 66 | 66 | $accessControl = [ |
| 67 | - ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 68 | - ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'], |
|
| 69 | - ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 70 | - ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 71 | - ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'], |
|
| 72 | - ['path' => '^/mypage/', 'roles' => 'ROLE_USER'], |
|
| 67 | + ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 68 | + ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'], |
|
| 69 | + ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 70 | + ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 71 | + ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'], |
|
| 72 | + ['path' => '^/mypage/', 'roles' => 'ROLE_USER'], |
|
| 73 | 73 | ]; |
| 74 | 74 | if ($forceSSL) { |
| 75 | 75 | foreach ($accessControl as &$control) { |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | // security.ymlでは制御できないため, ここで定義する. |
| 81 | 81 | $container->prependExtensionConfig('security', [ |
| 82 | - 'access_control' => $accessControl, |
|
| 82 | + 'access_control' => $accessControl, |
|
| 83 | 83 | ]); |
| 84 | 84 | } |
| 85 | 85 | |
@@ -112,6 +112,9 @@ |
||
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | + /** |
|
| 116 | + * @param string $outputDir |
|
| 117 | + */ |
|
| 115 | 118 | protected function removeOutputDir($outputDir) |
| 116 | 119 | { |
| 117 | 120 | if (file_exists($outputDir)) { |
@@ -24,8 +24,8 @@ |
||
| 24 | 24 | use Symfony\Component\Console\Input\InputOption; |
| 25 | 25 | use Symfony\Component\Console\Output\OutputInterface; |
| 26 | 26 | use Symfony\Component\Console\Style\SymfonyStyle; |
| 27 | -use Symfony\Component\Finder\Finder; |
|
| 28 | 27 | use Symfony\Component\Filesystem\Filesystem; |
| 28 | +use Symfony\Component\Finder\Finder; |
|
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | * Command to generate the SQL needed to update the database schema to match |
@@ -45,7 +45,6 @@ discard block |
||
| 45 | 45 | * @param callable $callback Metadata を生成した後に実行されるコールバック関数 |
| 46 | 46 | * @param array $generatedFiles Proxy ファイルパスの配列 |
| 47 | 47 | * @param string $proxiesDirectory Proxy ファイルを格納したディレクトリ |
| 48 | - * @param bool $saveMode UpdateSchema を即時実行する場合 true |
|
| 49 | 48 | * @param string $outputDir Metadata の出力先ディレクトリ |
| 50 | 49 | */ |
| 51 | 50 | public function executeCallback(callable $callback, $generatedFiles, $proxiesDirectory, $outputDir = null) |
@@ -107,7 +106,7 @@ discard block |
||
| 107 | 106 | /** |
| 108 | 107 | * ネームスペースに含まれるEntityのテーブルを削除する |
| 109 | 108 | * |
| 110 | - * @param $targetNamespace string 削除対象のネームスペース |
|
| 109 | + * @param string $targetNamespace string 削除対象のネームスペース |
|
| 111 | 110 | */ |
| 112 | 111 | public function dropTable($targetNamespace) |
| 113 | 112 | { |
@@ -18,8 +18,8 @@ |
||
| 18 | 18 | use Doctrine\ORM\Tools\SchemaTool; |
| 19 | 19 | use Eccube\Doctrine\ORM\Mapping\Driver\ReloadSafeAnnotationDriver; |
| 20 | 20 | use Eccube\Util\StringUtil; |
| 21 | -use Symfony\Component\Finder\Finder; |
|
| 22 | 21 | use Symfony\Component\Filesystem\Filesystem; |
| 22 | +use Symfony\Component\Finder\Finder; |
|
| 23 | 23 | |
| 24 | 24 | class SchemaService |
| 25 | 25 | { |
@@ -25,8 +25,8 @@ |
||
| 25 | 25 | use Eccube\Util\CacheUtil; |
| 26 | 26 | use Eccube\Util\StringUtil; |
| 27 | 27 | use Symfony\Component\DependencyInjection\ContainerInterface; |
| 28 | -use Symfony\Component\Finder\Finder; |
|
| 29 | 28 | use Symfony\Component\Filesystem\Filesystem; |
| 29 | +use Symfony\Component\Finder\Finder; |
|
| 30 | 30 | |
| 31 | 31 | class PluginService |
| 32 | 32 | { |
@@ -11,6 +11,7 @@ discard block |
||
| 11 | 11 | * file that was distributed with this source code. |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | +use Codeception\Util\Fixtures; |
|
| 14 | 15 | use Page\Admin\CsvSettingsPage; |
| 15 | 16 | use Page\Admin\DeliveryEditPage; |
| 16 | 17 | use Page\Admin\DeliveryManagePage; |
@@ -19,7 +20,6 @@ discard block |
||
| 19 | 20 | use Page\Admin\PaymentManagePage; |
| 20 | 21 | use Page\Admin\ShopSettingPage; |
| 21 | 22 | use Page\Admin\TaxManagePage; |
| 22 | -use Codeception\Util\Fixtures; |
|
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | 25 | * @group admin |
@@ -111,7 +111,6 @@ |
||
| 111 | 111 | /** |
| 112 | 112 | * Doctrineのキャッシュを削除します. |
| 113 | 113 | * |
| 114 | - * @param null $env |
|
| 115 | 114 | * |
| 116 | 115 | * @return string |
| 117 | 116 | * |
@@ -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 Request|null |
@@ -445,9 +444,9 @@ discard block |
||
| 445 | 444 | } |
| 446 | 445 | |
| 447 | 446 | /** |
| 448 | - * @param $dateTime |
|
| 447 | + * @param \DateTime $dateTime |
|
| 449 | 448 | * |
| 450 | - * @return array|mixed |
|
| 449 | + * @return null|Request |
|
| 451 | 450 | * |
| 452 | 451 | * @throws \Doctrine\ORM\NonUniqueResultException |
| 453 | 452 | */ |
@@ -483,9 +482,9 @@ discard block |
||
| 483 | 482 | } |
| 484 | 483 | |
| 485 | 484 | /** |
| 486 | - * @param $dateTime |
|
| 485 | + * @param \DateTime $dateTime |
|
| 487 | 486 | * |
| 488 | - * @return array|mixed |
|
| 487 | + * @return null|Request |
|
| 489 | 488 | * |
| 490 | 489 | * @throws \Doctrine\ORM\NonUniqueResultException |
| 491 | 490 | */ |
@@ -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 | */ |
@@ -1761,7 +1761,7 @@ |
||
| 1761 | 1761 | /** |
| 1762 | 1762 | * Set orderStatus. |
| 1763 | 1763 | * |
| 1764 | - * @param \Eccube\Entity\Master\OrderStatus|object|null $orderStatus |
|
| 1764 | + * @param null|Master\OrderStatus $orderStatus |
|
| 1765 | 1765 | * |
| 1766 | 1766 | * @return Order |
| 1767 | 1767 | */ |