@@ -19,6 +19,9 @@ |
||
| 19 | 19 | { |
| 20 | 20 | protected $trait_proxies_directory; |
| 21 | 21 | |
| 22 | + /** |
|
| 23 | + * @param string $dir |
|
| 24 | + */ |
|
| 22 | 25 | public function setTraitProxiesDirectory($dir) |
| 23 | 26 | { |
| 24 | 27 | $this->trait_proxies_directory = $dir; |
@@ -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 | { |
@@ -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 | |
@@ -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 | |
@@ -284,7 +284,7 @@ |
||
| 284 | 284 | $filename = $this->convertStrToServer($file->getClientOriginalName()); |
| 285 | 285 | try { |
| 286 | 286 | $file->move($nowDir, $filename); |
| 287 | - $successCount ++; |
|
| 287 | + $successCount++; |
|
| 288 | 288 | } catch (FileException $e) { |
| 289 | 289 | $this->errors[] = ['message' => trans('admin.content.file.upload_error', [ |
| 290 | 290 | '%file_name%' => $filename, |
@@ -391,7 +391,7 @@ |
||
| 391 | 391 | 'DiscountProcessor' => $this->discountProcessors->map($callback)->toArray(), |
| 392 | 392 | 'ItemHolderPostValidator' => $this->itemHolderPostValidators->map($callback)->toArray() |
| 393 | 393 | ]; |
| 394 | - $tree = new \RecursiveTreeIterator(new \RecursiveArrayIterator($flows)); |
|
| 394 | + $tree = new \RecursiveTreeIterator(new \RecursiveArrayIterator($flows)); |
|
| 395 | 395 | $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_RIGHT, ' '); |
| 396 | 396 | $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_MID_LAST, ' '); |
| 397 | 397 | $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_MID_HAS_NEXT, '│'); |
@@ -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] = ''; |
@@ -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 | { |