@@ -112,6 +112,9 @@ discard block |
||
| 112 | 112 | $this->eventDispatcher = $eventDispatcher; |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | + /** |
|
| 116 | + * @param string $message |
|
| 117 | + */ |
|
| 115 | 118 | public function addSuccess($message, $namespace = 'front') |
| 116 | 119 | { |
| 117 | 120 | $this->session->getFlashBag()->add('eccube.'.$namespace.'.success', $message); |
@@ -122,6 +125,9 @@ discard block |
||
| 122 | 125 | $this->session->getFlashBag()->add('eccube.'.$namespace.'.error', $message); |
| 123 | 126 | } |
| 124 | 127 | |
| 128 | + /** |
|
| 129 | + * @param string $message |
|
| 130 | + */ |
|
| 125 | 131 | public function addDanger($message, $namespace = 'front') |
| 126 | 132 | { |
| 127 | 133 | $this->session->getFlashBag()->add('eccube.'.$namespace.'.danger', $message); |
@@ -132,6 +138,9 @@ discard block |
||
| 132 | 138 | $this->session->getFlashBag()->add('eccube.'.$namespace.'.warning', $message); |
| 133 | 139 | } |
| 134 | 140 | |
| 141 | + /** |
|
| 142 | + * @param string $message |
|
| 143 | + */ |
|
| 135 | 144 | public function addInfo($message, $namespace = 'front') |
| 136 | 145 | { |
| 137 | 146 | $this->session->getFlashBag()->add('eccube.'.$namespace.'.info', $message); |
@@ -13,7 +13,6 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Entity; |
| 15 | 15 | |
| 16 | -use Doctrine\Common\Annotations\Reader; |
|
| 17 | 16 | use Doctrine\Common\Collections\Collection; |
| 18 | 17 | use Doctrine\Common\Inflector\Inflector; |
| 19 | 18 | use Doctrine\ORM\Mapping\Id; |
@@ -37,6 +37,9 @@ discard block |
||
| 37 | 37 | $logger->error($message, $context); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | +/** |
|
| 41 | + * @param string $message |
|
| 42 | + */ |
|
| 40 | 43 | function log_warning($message, array $context = []) |
| 41 | 44 | { |
| 42 | 45 | $logger = LoggerFacade::create(); |
@@ -55,6 +58,9 @@ discard block |
||
| 55 | 58 | $logger->info($message, $context); |
| 56 | 59 | } |
| 57 | 60 | |
| 61 | +/** |
|
| 62 | + * @param string $message |
|
| 63 | + */ |
|
| 58 | 64 | function log_debug($message, array $context = []) |
| 59 | 65 | { |
| 60 | 66 | $logger = LoggerFacade::create(); |
@@ -28,7 +28,6 @@ |
||
| 28 | 28 | use Eccube\Repository\OrderRepository; |
| 29 | 29 | use Eccube\Repository\ProductRepository; |
| 30 | 30 | use Eccube\Repository\ShippingRepository; |
| 31 | -use Eccube\Util\EntityUtil; |
|
| 32 | 31 | use Eccube\Util\FormUtil; |
| 33 | 32 | use Symfony\Component\Form\FormFactoryInterface; |
| 34 | 33 | use Symfony\Component\HttpFoundation\Request; |
@@ -275,7 +275,7 @@ |
||
| 275 | 275 | * |
| 276 | 276 | * @param Request $request |
| 277 | 277 | * @param $secret_key |
| 278 | - * @return \Eccube\Entity\Cart|mixed |
|
| 278 | + * @return integer |
|
| 279 | 279 | */ |
| 280 | 280 | private function entryActivate(Request $request, $secret_key) |
| 281 | 281 | { |
@@ -21,18 +21,18 @@ |
||
| 21 | 21 | use Eccube\Repository\BaseInfoRepository; |
| 22 | 22 | use Eccube\Repository\CustomerRepository; |
| 23 | 23 | use Eccube\Repository\Master\CustomerStatusRepository; |
| 24 | +use Eccube\Service\CartService; |
|
| 24 | 25 | use Eccube\Service\MailService; |
| 25 | 26 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 26 | 27 | use Symfony\Component\HttpFoundation\Request; |
| 27 | 28 | use Symfony\Component\HttpKernel\Exception as HttpException; |
| 28 | 29 | use Symfony\Component\Routing\Annotation\Route; |
| 30 | +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
|
| 29 | 31 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
| 30 | 32 | use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; |
| 31 | 33 | use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
| 32 | 34 | use Symfony\Component\Validator\Constraints as Assert; |
| 33 | 35 | use Symfony\Component\Validator\Validator\ValidatorInterface; |
| 34 | -use Eccube\Service\CartService; |
|
| 35 | -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
|
| 36 | 36 | |
| 37 | 37 | class EntryController extends AbstractController |
| 38 | 38 | { |
@@ -13,14 +13,12 @@ |
||
| 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; |
| 21 | 21 | use Symfony\Component\HttpKernel\Event\ExceptionEvent; |
| 22 | -use Symfony\Component\HttpKernel\Event\GetResponseEvent; |
|
| 23 | -use Symfony\Component\HttpKernel\Event\PostResponseEvent; |
|
| 24 | 22 | use Symfony\Component\HttpKernel\Event\RequestEvent; |
| 25 | 23 | use Symfony\Component\HttpKernel\Event\TerminateEvent; |
| 26 | 24 | use Symfony\Component\HttpKernel\KernelEvents; |
@@ -115,7 +115,6 @@ |
||
| 115 | 115 | * @param AuthorityRoleRepository $authorityRoleRepository |
| 116 | 116 | * @param EccubeConfig $eccubeConfig |
| 117 | 117 | * @param Context $context |
| 118 | - * @param MobileDetector $mobileDetector |
|
| 119 | 118 | * @param UrlGeneratorInterface $router |
| 120 | 119 | * @param LayoutRepository $layoutRepository |
| 121 | 120 | */ |
@@ -23,11 +23,11 @@ |
||
| 23 | 23 | use Eccube\Entity\PageLayout; |
| 24 | 24 | use Eccube\Repository\AuthorityRoleRepository; |
| 25 | 25 | use Eccube\Repository\BaseInfoRepository; |
| 26 | +use Eccube\Repository\BlockPositionRepository; |
|
| 26 | 27 | use Eccube\Repository\LayoutRepository; |
| 27 | 28 | use Eccube\Repository\Master\DeviceTypeRepository; |
| 28 | -use Eccube\Repository\PageRepository; |
|
| 29 | 29 | use Eccube\Repository\PageLayoutRepository; |
| 30 | -use Eccube\Repository\BlockPositionRepository; |
|
| 30 | +use Eccube\Repository\PageRepository; |
|
| 31 | 31 | use Eccube\Request\Context; |
| 32 | 32 | // use SunCat\MobileDetectBundle\DeviceDetector\MobileDetector; |
| 33 | 33 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
@@ -23,7 +23,6 @@ |
||
| 23 | 23 | use Eccube\DependencyInjection\Compiler\PurchaseFlowPass; |
| 24 | 24 | use Eccube\DependencyInjection\Compiler\QueryCustomizerPass; |
| 25 | 25 | use Eccube\DependencyInjection\Compiler\TwigBlockPass; |
| 26 | -use Eccube\DependencyInjection\Compiler\TwigExtensionPass; |
|
| 27 | 26 | use Eccube\DependencyInjection\Compiler\WebServerDocumentRootPass; |
| 28 | 27 | use Eccube\DependencyInjection\EccubeExtension; |
| 29 | 28 | use Eccube\DependencyInjection\Facade\AnnotationReaderFacade; |
@@ -13,8 +13,8 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Repository; |
| 15 | 15 | |
| 16 | -use Eccube\Entity\BlockPosition; |
|
| 17 | 16 | use Doctrine\Common\Persistence\ManagerRegistry as RegistryInterface; |
| 17 | +use Eccube\Entity\BlockPosition; |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * BlockPositionRepository |