@@ -25,8 +25,8 @@ |
||
| 25 | 25 | use Eccube\Util\CacheUtil; |
| 26 | 26 | use Eccube\Util\StringUtil; |
| 27 | 27 | use Symfony\Component\DependencyInjection\ContainerInterface; |
| 28 | -use Symfony\Component\Finder\Finder; |
|
| 29 | 28 | use Symfony\Component\Filesystem\Filesystem; |
| 29 | +use Symfony\Component\Finder\Finder; |
|
| 30 | 30 | |
| 31 | 31 | class PluginService |
| 32 | 32 | { |
@@ -47,7 +47,6 @@ discard block |
||
| 47 | 47 | * @param callable $callback Metadata を生成した後に実行されるコールバック関数 |
| 48 | 48 | * @param array $generatedFiles Proxy ファイルパスの配列 |
| 49 | 49 | * @param string $proxiesDirectory Proxy ファイルを格納したディレクトリ |
| 50 | - * @param bool $saveMode UpdateSchema を即時実行する場合 true |
|
| 51 | 50 | * @param string $outputDir Metadata の出力先ディレクトリ |
| 52 | 51 | */ |
| 53 | 52 | public function executeCallback(callable $callback, $generatedFiles, $proxiesDirectory, $outputDir = null) |
@@ -110,7 +109,7 @@ discard block |
||
| 110 | 109 | /** |
| 111 | 110 | * ネームスペースに含まれるEntityのテーブルを削除する |
| 112 | 111 | * |
| 113 | - * @param $targetNamespace string 削除対象のネームスペース |
|
| 112 | + * @param string $targetNamespace string 削除対象のネームスペース |
|
| 114 | 113 | */ |
| 115 | 114 | public function dropTable($targetNamespace) |
| 116 | 115 | { |
@@ -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 | { |
@@ -355,7 +355,7 @@ |
||
| 355 | 355 | * |
| 356 | 356 | * @param null $currency |
| 357 | 357 | * |
| 358 | - * @return bool|string |
|
| 358 | + * @return string|null |
|
| 359 | 359 | */ |
| 360 | 360 | public function getCurrencySymbol($currency = null) |
| 361 | 361 | { |
@@ -111,7 +111,6 @@ |
||
| 111 | 111 | /** |
| 112 | 112 | * Doctrineのキャッシュを削除します. |
| 113 | 113 | * |
| 114 | - * @param null $env |
|
| 115 | 114 | * |
| 116 | 115 | * @return string |
| 117 | 116 | * |
@@ -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, |
@@ -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, |
@@ -559,7 +559,7 @@ |
||
| 559 | 559 | $arrOrder[$i][2] = ''; |
| 560 | 560 | $arrOrder[$i][3] = ''; |
| 561 | 561 | |
| 562 | - foreach($Order->getTaxFreeDiscountItems() as $Item) { |
|
| 562 | + foreach ($Order->getTaxFreeDiscountItems() as $Item) { |
|
| 563 | 563 | ++$i; |
| 564 | 564 | $arrOrder[$i][0] = ''; |
| 565 | 565 | $arrOrder[$i][1] = ''; |
@@ -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, '│'); |