@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | * @deprecated 呼び出し元で制御する |
50 | 50 | * @param $block_id |
51 | 51 | * @param $DeviceType |
52 | - * @return array|\Eccube\Entity\Block |
|
52 | + * @return Block|null |
|
53 | 53 | */ |
54 | 54 | public function findOrCreate($block_id, $DeviceType) |
55 | 55 | { |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * ブロック一覧の取得. |
112 | 112 | * |
113 | 113 | * @param \Eccube\Entity\Master\DeviceType $DeviceType |
114 | - * @return array |
|
114 | + * @return null|\Symfony\Component\HttpFoundation\Request |
|
115 | 115 | */ |
116 | 116 | public function getList($DeviceType) |
117 | 117 | { |
@@ -197,7 +197,7 @@ |
||
197 | 197 | $this->appConfig['block_default_realdir'], |
198 | 198 | ); |
199 | 199 | foreach ($readPaths as $readPath) { |
200 | - $filePath = $readPath . '/' . $fileName . '.twig'; |
|
200 | + $filePath = $readPath.'/'.$fileName.'.twig'; |
|
201 | 201 | $fs = new Filesystem(); |
202 | 202 | if ($fs->exists($filePath)) { |
203 | 203 | return array( |
@@ -40,7 +40,7 @@ |
||
40 | 40 | |
41 | 41 | /** |
42 | 42 | * @deprecated 呼び出し元で制御する |
43 | - * @param $id |
|
43 | + * @param integer $id |
|
44 | 44 | * @return \Eccube\Entity\Delivery|null|object |
45 | 45 | */ |
46 | 46 | public function findOrCreate($id) |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | /** |
135 | 135 | * @param \Eccube\Entity\Member $Member |
136 | 136 | * |
137 | - * @return void |
|
137 | + * @return boolean |
|
138 | 138 | */ |
139 | 139 | public function up(\Eccube\Entity\Member $Member) |
140 | 140 | { |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | /** |
274 | 274 | * saltを生成する |
275 | 275 | * |
276 | - * @param $byte |
|
276 | + * @param integer $byte |
|
277 | 277 | * @return string |
278 | 278 | */ |
279 | 279 | public function createSalt($byte) |
@@ -44,7 +44,6 @@ |
||
44 | 44 | /** |
45 | 45 | * DeliveryFeeProcessor constructor. |
46 | 46 | * |
47 | - * @param Application $app |
|
48 | 47 | */ |
49 | 48 | public function __construct(BaseInfoRepository $baseInfoRepository) |
50 | 49 | { |
@@ -23,7 +23,6 @@ |
||
23 | 23 | |
24 | 24 | namespace Eccube\Service\PurchaseFlow\Processor; |
25 | 25 | |
26 | -use Eccube\Annotation\Inject; |
|
27 | 26 | use Eccube\Application; |
28 | 27 | use Eccube\Entity\ItemHolderInterface; |
29 | 28 | use Eccube\Repository\BaseInfoRepository; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Eccube\Service\PurchaseFlow\Processor; |
4 | 4 | |
5 | 5 | use Doctrine\DBAL\LockMode; |
6 | -use Eccube\Annotation\Inject; |
|
7 | 6 | use Eccube\Common\Constant; |
8 | 7 | use Eccube\Entity\ItemInterface; |
9 | 8 | use Eccube\Entity\ShipmentItem; |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | /** |
221 | 221 | * 非会員情報を取得 |
222 | 222 | * |
223 | - * @param $sesisonKey |
|
223 | + * @param string $sesisonKey |
|
224 | 224 | * @return $Customer|null |
225 | 225 | */ |
226 | 226 | public function getNonMember($sesisonKey) |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | /** |
253 | 253 | * 受注情報を作成 |
254 | 254 | * |
255 | - * @param $Customer |
|
255 | + * @param null|Customer $Customer |
|
256 | 256 | * @return \Eccube\Entity\Order |
257 | 257 | */ |
258 | 258 | public function createOrder($Customer) |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | * 仮受注情報作成 |
282 | 282 | * |
283 | 283 | * @param $Customer |
284 | - * @param $preOrderId |
|
284 | + * @param string $preOrderId |
|
285 | 285 | * @return mixed |
286 | 286 | * @throws \Doctrine\ORM\NoResultException |
287 | 287 | * @throws \Doctrine\ORM\NonUniqueResultException |
@@ -1403,7 +1403,7 @@ discard block |
||
1403 | 1403 | * 受注メール送信を行う |
1404 | 1404 | * |
1405 | 1405 | * @param Order $Order |
1406 | - * @return MailHistory |
|
1406 | + * @return null|\Symfony\Component\HttpFoundation\Request |
|
1407 | 1407 | */ |
1408 | 1408 | public function sendOrderMail(Order $Order) |
1409 | 1409 | { |
@@ -1117,7 +1117,7 @@ |
||
1117 | 1117 | |
1118 | 1118 | // 配送日数が設定されている |
1119 | 1119 | if ($deliveryDateFlag) { |
1120 | - $period = new \DatePeriod ( |
|
1120 | + $period = new \DatePeriod( |
|
1121 | 1121 | new \DateTime($minDate.' day'), |
1122 | 1122 | new \DateInterval('P1D'), |
1123 | 1123 | new \DateTime($minDate + $this->appConfig['deliv_date_end_max'].' day') |
@@ -817,7 +817,7 @@ |
||
817 | 817 | if ($dispatcher instanceof Response |
818 | 818 | && ($dispatcher->isRedirection() || $dispatcher->getContent()) |
819 | 819 | ) { // $paymentMethod->apply() が Response を返した場合は画面遷移 |
820 | - return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御? |
|
820 | + return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御? |
|
821 | 821 | } |
822 | 822 | $PaymentResult = $paymentService->doCheckout($paymentMethod); // 決済実行 |
823 | 823 | if (!$PaymentResult->isSuccess()) { |
@@ -194,7 +194,7 @@ |
||
194 | 194 | ); |
195 | 195 | $addCartForm = $builder->getForm(); |
196 | 196 | |
197 | - if ($request->getMethod() === 'POST' && (string)$Product->getId() === $request->get('product_id')) { |
|
197 | + if ($request->getMethod() === 'POST' && (string) $Product->getId() === $request->get('product_id')) { |
|
198 | 198 | $addCartForm->handleRequest($request); |
199 | 199 | |
200 | 200 | if ($addCartForm->isValid()) { |
@@ -90,7 +90,7 @@ |
||
90 | 90 | } |
91 | 91 | if ($dir == 'doctrine') { |
92 | 92 | // doctrineが指定された場合は, cache driver経由で削除. |
93 | - $config = $this->entityManager->getConfiguration(); |
|
93 | + $config = $this->entityManager->getConfiguration(); |
|
94 | 94 | $this->deleteDoctrineCache($config->getMetadataCacheImpl()); |
95 | 95 | $this->deleteDoctrineCache($config->getQueryCacheImpl()); |
96 | 96 | $this->deleteDoctrineCache($config->getResultCacheImpl()); |