@@ -13,18 +13,18 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Service\PurchaseFlow\Processor; |
| 15 | 15 | |
| 16 | -use Eccube\Service\PurchaseFlow\ItemHolderPreprocessor; |
|
| 17 | 16 | use Eccube\Entity\ItemHolderInterface; |
| 18 | -use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 19 | -use Eccube\Entity\OrderItem; |
|
| 20 | -use Eccube\Repository\Master\OrderItemTypeRepository; |
|
| 21 | -use Eccube\Repository\Master\TaxDisplayTypeRepository; |
|
| 22 | 17 | use Eccube\Entity\Master\OrderItemType; |
| 23 | 18 | use Eccube\Entity\Master\TaxDisplayType; |
| 19 | +use Eccube\Entity\Master\TaxType; |
|
| 24 | 20 | use Eccube\Entity\Order; |
| 21 | +use Eccube\Entity\OrderItem; |
|
| 25 | 22 | use Eccube\Entity\Payment; |
| 23 | +use Eccube\Repository\Master\OrderItemTypeRepository; |
|
| 24 | +use Eccube\Repository\Master\TaxDisplayTypeRepository; |
|
| 26 | 25 | use Eccube\Repository\Master\TaxTypeRepository; |
| 27 | -use Eccube\Entity\Master\TaxType; |
|
| 26 | +use Eccube\Service\PurchaseFlow\ItemHolderPreprocessor; |
|
| 27 | +use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
| 28 | 28 | |
| 29 | 29 | class PaymentChargePreprocessor implements ItemHolderPreprocessor |
| 30 | 30 | { |
@@ -102,7 +102,6 @@ |
||
| 102 | 102 | * Doctrineのキャッシュを削除します. |
| 103 | 103 | * APP_ENV=prodの場合のみ実行されます. |
| 104 | 104 | * |
| 105 | - * @param null $env |
|
| 106 | 105 | * @return string |
| 107 | 106 | * @throws \Exception |
| 108 | 107 | */ |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | $BaseInfo = $this->find($id); |
| 45 | 45 | |
| 46 | 46 | if (null === $BaseInfo) { |
| 47 | - throw new \Exception('BaseInfo not found. id = '. $id); |
|
| 47 | + throw new \Exception('BaseInfo not found. id = '.$id); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | return $this->find($id); |
@@ -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 | |
@@ -64,12 +64,12 @@ |
||
| 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) { |
@@ -14,8 +14,8 @@ |
||
| 14 | 14 | namespace Eccube\Plugin; |
| 15 | 15 | |
| 16 | 16 | use Doctrine\DBAL\Connection; |
| 17 | -use Doctrine\DBAL\Migrations\Migration; |
|
| 18 | 17 | use Doctrine\DBAL\Migrations\Configuration\Configuration; |
| 18 | +use Doctrine\DBAL\Migrations\Migration; |
|
| 19 | 19 | use Symfony\Component\DependencyInjection\ContainerInterface; |
| 20 | 20 | |
| 21 | 21 | abstract class AbstractPluginManager |
@@ -22,11 +22,11 @@ |
||
| 22 | 22 | use Eccube\Exception\PluginException; |
| 23 | 23 | use Eccube\Repository\PluginRepository; |
| 24 | 24 | use Eccube\Service\Composer\ComposerServiceInterface; |
| 25 | +use Eccube\Service\SystemService; |
|
| 25 | 26 | use Eccube\Util\CacheUtil; |
| 26 | 27 | use Eccube\Util\StringUtil; |
| 27 | 28 | use Symfony\Component\DependencyInjection\ContainerInterface; |
| 28 | 29 | use Symfony\Component\Filesystem\Filesystem; |
| 29 | -use Eccube\Service\SystemService; |
|
| 30 | 30 | |
| 31 | 31 | class PluginService |
| 32 | 32 | { |
@@ -14,11 +14,11 @@ |
||
| 14 | 14 | namespace Eccube\Service; |
| 15 | 15 | |
| 16 | 16 | use Doctrine\ORM\EntityManagerInterface; |
| 17 | +use Symfony\Component\DependencyInjection\ContainerInterface; |
|
| 17 | 18 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
| 18 | 19 | use Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector; |
| 19 | -use Symfony\Component\DependencyInjection\ContainerInterface; |
|
| 20 | -use Symfony\Component\HttpKernel\KernelEvents; |
|
| 21 | 20 | use Symfony\Component\HttpKernel\Event\PostResponseEvent; |
| 21 | +use Symfony\Component\HttpKernel\KernelEvents; |
|
| 22 | 22 | |
| 23 | 23 | class SystemService implements EventSubscriberInterface |
| 24 | 24 | { |
@@ -346,7 +346,7 @@ |
||
| 346 | 346 | * Get currency symbol |
| 347 | 347 | * |
| 348 | 348 | * @param null $currency |
| 349 | - * @return bool|string |
|
| 349 | + * @return string|null |
|
| 350 | 350 | */ |
| 351 | 351 | public function getCurrencySymbol($currency = null) |
| 352 | 352 | { |
@@ -93,7 +93,7 @@ |
||
| 93 | 93 | PluginApiService $pluginApiService, |
| 94 | 94 | ComposerServiceInterface $composerService, |
| 95 | 95 | SystemService $systemService |
| 96 | - ){ |
|
| 96 | + ) { |
|
| 97 | 97 | $this->pluginRepository = $pluginRepository; |
| 98 | 98 | $this->pluginService = $pluginService; |
| 99 | 99 | $this->BaseInfo = $baseInfoRepository->get(); |