@@ -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 |
@@ -14,7 +14,6 @@ |
||
14 | 14 | namespace Eccube\Controller\Admin\Order; |
15 | 15 | |
16 | 16 | use Doctrine\Common\Collections\ArrayCollection; |
17 | -use Doctrine\Common\Collections\Criteria; |
|
18 | 17 | use Eccube\Controller\AbstractController; |
19 | 18 | use Eccube\Entity\Master\CustomerStatus; |
20 | 19 | use Eccube\Entity\Master\OrderItemType; |
@@ -557,7 +557,7 @@ |
||
557 | 557 | $arrOrder[$i][2] = ''; |
558 | 558 | $arrOrder[$i][3] = ''; |
559 | 559 | |
560 | - foreach($Order->getTaxFreeDiscountItems() as $Item) { |
|
560 | + foreach ($Order->getTaxFreeDiscountItems() as $Item) { |
|
561 | 561 | ++$i; |
562 | 562 | $arrOrder[$i][0] = ''; |
563 | 563 | $arrOrder[$i][1] = ''; |
@@ -240,7 +240,7 @@ |
||
240 | 240 | /** |
241 | 241 | * PDFファイルを出力する. |
242 | 242 | * |
243 | - * @return string|mixed |
|
243 | + * @return string |
|
244 | 244 | */ |
245 | 245 | public function outputPdf() |
246 | 246 | { |
@@ -111,7 +111,6 @@ |
||
111 | 111 | /** |
112 | 112 | * Doctrineのキャッシュを削除します. |
113 | 113 | * |
114 | - * @param null $env |
|
115 | 114 | * |
116 | 115 | * @return string |
117 | 116 | * |
@@ -132,7 +132,7 @@ |
||
132 | 132 | * @param string $where 追加の検索条件 |
133 | 133 | * @param string[] $parameters 追加の検索パラメーター |
134 | 134 | * |
135 | - * @return array ページ属性の配列 |
|
135 | + * @return null|\Symfony\Component\HttpFoundation\Request ページ属性の配列 |
|
136 | 136 | */ |
137 | 137 | public function getPageList($where = null, $parameters = []) |
138 | 138 | { |
@@ -13,10 +13,10 @@ |
||
13 | 13 | |
14 | 14 | namespace Eccube\Repository; |
15 | 15 | |
16 | +use Doctrine\Common\Persistence\ManagerRegistry as RegistryInterface; |
|
16 | 17 | use Doctrine\ORM\NoResultException; |
17 | 18 | use Eccube\Common\EccubeConfig; |
18 | 19 | use Eccube\Entity\Page; |
19 | -use Doctrine\Common\Persistence\ManagerRegistry as RegistryInterface; |
|
20 | 20 | use Symfony\Component\DependencyInjection\ContainerInterface; |
21 | 21 | |
22 | 22 | /** |
@@ -33,8 +33,8 @@ |
||
33 | 33 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
34 | 34 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
35 | 35 | use Symfony\Component\Form\FormInterface; |
36 | -use Symfony\Component\HttpFoundation\Response; |
|
37 | 36 | use Symfony\Component\HttpFoundation\Request; |
37 | +use Symfony\Component\HttpFoundation\Response; |
|
38 | 38 | use Symfony\Component\Routing\Annotation\Route; |
39 | 39 | use Symfony\Component\Routing\RouterInterface; |
40 | 40 | use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; |
@@ -251,7 +251,7 @@ |
||
251 | 251 | ] |
252 | 252 | ); |
253 | 253 | |
254 | - if(!is_null($qtyInCart)) { |
|
254 | + if (!is_null($qtyInCart)) { |
|
255 | 255 | |
256 | 256 | return [ |
257 | 257 | 'qtyInCart' => $qtyInCart, |
@@ -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 | { |
@@ -245,6 +245,9 @@ |
||
245 | 245 | $this->io->success('EC-CUBE installation successful.'); |
246 | 246 | } |
247 | 247 | |
248 | + /** |
|
249 | + * @param string $databaseUrl |
|
250 | + */ |
|
248 | 251 | protected function getDatabaseName($databaseUrl) |
249 | 252 | { |
250 | 253 | if (0 === strpos($databaseUrl, 'sqlite')) { |
@@ -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); |