@@ -250,6 +250,9 @@ |
||
| 250 | 250 | $this->updatePluginStatus('/status/uninstalled', $Plugin); |
| 251 | 251 | } |
| 252 | 252 | |
| 253 | + /** |
|
| 254 | + * @param string $url |
|
| 255 | + */ |
|
| 253 | 256 | private function updatePluginStatus($url, Plugin $Plugin) |
| 254 | 257 | { |
| 255 | 258 | if ($Plugin->getSource()) { |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | * @param MailService $mailService |
| 57 | 57 | * @param MailHistoryRepository $mailHistoryRepository |
| 58 | 58 | * @param OrderRepository $orderRepository |
| 59 | - * @param twig $twig |
|
| 59 | + * @param Environment $twig |
|
| 60 | 60 | */ |
| 61 | 61 | public function __construct( |
| 62 | 62 | MailService $mailService, |
@@ -227,6 +227,9 @@ discard block |
||
| 227 | 227 | ]; |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | + /** |
|
| 231 | + * @param Order $Order |
|
| 232 | + */ |
|
| 230 | 233 | private function createBody($Order, $twig = 'Mail/order.twig') |
| 231 | 234 | { |
| 232 | 235 | return $this->renderView($twig, [ |
@@ -81,7 +81,7 @@ |
||
| 81 | 81 | * |
| 82 | 82 | * @throws PluginException |
| 83 | 83 | * |
| 84 | - * @param string $command |
|
| 84 | + * @param string[] $commands |
|
| 85 | 85 | */ |
| 86 | 86 | public function runCommand($commands, $output = null, $init = true) |
| 87 | 87 | { |
@@ -13,8 +13,8 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\EventListener; |
| 15 | 15 | |
| 16 | -use Doctrine\Dbal\Connection; |
|
| 17 | 16 | use Doctrine\DBAL\TransactionIsolationLevel; |
| 17 | +use Doctrine\Dbal\Connection; |
|
| 18 | 18 | use Doctrine\ORM\EntityManager; |
| 19 | 19 | use Doctrine\ORM\EntityManagerInterface; |
| 20 | 20 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
@@ -404,6 +404,9 @@ discard block |
||
| 404 | 404 | $Horizon->インストール(); |
| 405 | 405 | } |
| 406 | 406 | |
| 407 | + /** |
|
| 408 | + * @param string $fileName |
|
| 409 | + */ |
|
| 407 | 410 | private function publishPlugin($fileName) |
| 408 | 411 | { |
| 409 | 412 | copy(codecept_data_dir().'/'.'plugins/'.$fileName, codecept_root_dir().'/repos/'.$fileName); |
@@ -547,6 +550,9 @@ discard block |
||
| 547 | 550 | /** @var Store_Plugin */ |
| 548 | 551 | protected $dependency; |
| 549 | 552 | |
| 553 | + /** |
|
| 554 | + * @param string $code |
|
| 555 | + */ |
|
| 550 | 556 | public function __construct(AcceptanceTester $I, $code, Store_Plugin $dependency = null) |
| 551 | 557 | { |
| 552 | 558 | parent::__construct($I); |
@@ -679,6 +685,9 @@ discard block |
||
| 679 | 685 | return $this; |
| 680 | 686 | } |
| 681 | 687 | |
| 688 | + /** |
|
| 689 | + * @param string $fileName |
|
| 690 | + */ |
|
| 682 | 691 | protected function publishPlugin($fileName) |
| 683 | 692 | { |
| 684 | 693 | $published = copy(codecept_data_dir().'/'.'plugins/'.$fileName, codecept_root_dir().'/repos/'.$fileName); |
@@ -697,6 +706,9 @@ discard block |
||
| 697 | 706 | /** @var string */ |
| 698 | 707 | private $code; |
| 699 | 708 | |
| 709 | + /** |
|
| 710 | + * @param string $code |
|
| 711 | + */ |
|
| 700 | 712 | public function __construct(AcceptanceTester $I, $code) |
| 701 | 713 | { |
| 702 | 714 | parent::__construct($I); |
@@ -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 | |
@@ -83,7 +83,7 @@ |
||
| 83 | 83 | } elseif ($item->isProduct()) { |
| 84 | 84 | // ポイント = 単価 * ポイント付与率 * 数量 |
| 85 | 85 | $point = round($item->getPrice() * ($pointRate / 100)) * $item->getQuantity(); |
| 86 | - } elseif($item->isDiscount()) { |
|
| 86 | + } elseif ($item->isDiscount()) { |
|
| 87 | 87 | $point = round($item->getPrice() * ($pointRate / 100)) * $item->getQuantity(); |
| 88 | 88 | } |
| 89 | 89 | |
@@ -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)) { |
@@ -4,10 +4,7 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | use Doctrine\Bundle\DoctrineBundle\Command\Proxy\DoctrineCommandHelper; |
| 6 | 6 | use Doctrine\Bundle\DoctrineBundle\Command\Proxy\UpdateSchemaDoctrineCommand as BaseUpdateSchemaDoctrineCommand; |
| 7 | -use Doctrine\Common\Annotations\AnnotationReader; |
|
| 8 | -use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand; |
|
| 9 | 7 | use Doctrine\ORM\Tools\SchemaTool; |
| 10 | -use Eccube\Doctrine\ORM\Mapping\Driver\ReloadSafeAnnotationDriver; |
|
| 11 | 8 | use Eccube\Repository\PluginRepository; |
| 12 | 9 | use Eccube\Service\PluginService; |
| 13 | 10 | use Eccube\Service\SchemaService; |
@@ -16,8 +13,8 @@ discard block |
||
| 16 | 13 | use Symfony\Component\Console\Input\InputOption; |
| 17 | 14 | use Symfony\Component\Console\Output\OutputInterface; |
| 18 | 15 | use Symfony\Component\Console\Style\SymfonyStyle; |
| 19 | -use Symfony\Component\Finder\Finder; |
|
| 20 | 16 | use Symfony\Component\Filesystem\Filesystem; |
| 17 | +use Symfony\Component\Finder\Finder; |
|
| 21 | 18 | |
| 22 | 19 | /** |
| 23 | 20 | * Command to generate the SQL needed to update the database schema to match |