@@ -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 |
@@ -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 | { |
@@ -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 |
@@ -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 | { |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | namespace Eccube\Controller\Admin\Content; |
| 15 | 15 | |
| 16 | 16 | use Eccube\Controller\AbstractController; |
| 17 | -use Eccube\Form\Type\Admin\MainEditType; |
|
| 18 | 17 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 19 | 18 | use Symfony\Component\Filesystem\Exception\IOException; |
| 20 | 19 | use Symfony\Component\Filesystem\Filesystem; |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | namespace Eccube\Controller\Admin\Content; |
| 15 | 15 | |
| 16 | 16 | use Eccube\Controller\AbstractController; |
| 17 | -use Eccube\Form\Type\Admin\MainEditType; |
|
| 18 | 17 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 19 | 18 | use Symfony\Component\Filesystem\Exception\IOException; |
| 20 | 19 | use Symfony\Component\Filesystem\Filesystem; |