@@ -14,14 +14,14 @@ discard block |
||
| 14 | 14 | { |
| 15 | 15 | public function register(Container $app) |
| 16 | 16 | { |
| 17 | - $app['payment.method'] = $app->protect(function ($clazz, $form) use ($app) { |
|
| 17 | + $app['payment.method'] = $app->protect(function($clazz, $form) use ($app) { |
|
| 18 | 18 | $PaymentMethod = new $clazz; |
| 19 | 19 | $PaymentMethod->setApplication($app); |
| 20 | 20 | $PaymentMethod->setFormType($form); |
| 21 | 21 | return $PaymentMethod; |
| 22 | 22 | }); |
| 23 | 23 | |
| 24 | - $app['payment.method.request'] = $app->protect(function ($clazz, $form, $request) use ($app) { |
|
| 24 | + $app['payment.method.request'] = $app->protect(function($clazz, $form, $request) use ($app) { |
|
| 25 | 25 | $PaymentMethod = new $clazz; |
| 26 | 26 | $PaymentMethod->setApplication($app); |
| 27 | 27 | $PaymentMethod->setFormType($form); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | return $PaymentMethod; |
| 30 | 30 | }); |
| 31 | 31 | |
| 32 | - $app['eccube.service.payment'] = $app->protect(function ($clazz) use ($app) { |
|
| 32 | + $app['eccube.service.payment'] = $app->protect(function($clazz) use ($app) { |
|
| 33 | 33 | $Service = new $clazz($app['request_stack']); |
| 34 | 34 | |
| 35 | 35 | return $Service; |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | { |
| 14 | 14 | public function register(Container $app) |
| 15 | 15 | { |
| 16 | - $app['eccube.listener.forward_only'] = function (Container $app) { |
|
| 16 | + $app['eccube.listener.forward_only'] = function(Container $app) { |
|
| 17 | 17 | return new ForwardOnlyListener(); |
| 18 | 18 | }; |
| 19 | 19 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php return [ |
| 2 | - 'session_handler' => |
|
| 3 | - [ |
|
| 2 | + 'session_handler' => |
|
| 3 | + [ |
|
| 4 | 4 | // PHP/PHP拡張のセッションハンドラを利用する場合, trueに設定します。 |
| 5 | 5 | 'enabled' => false, |
| 6 | 6 | |
@@ -15,5 +15,5 @@ discard block |
||
| 15 | 15 | // redisの設定例 |
| 16 | 16 | //'save_handler' => 'redis', |
| 17 | 17 | //'save_path' => '127.0.0.1:6379', |
| 18 | - ], |
|
| 18 | + ], |
|
| 19 | 19 | ]; |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | 'label' => '手数料', |
| 88 | 88 | )) |
| 89 | 89 | ->add('fixed', HiddenType::class) |
| 90 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { |
|
| 90 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) { |
|
| 91 | 91 | $form = $event->getForm(); |
| 92 | 92 | $ruleMax = $form['rule_max']->getData(); |
| 93 | 93 | $ruleMin = $form['rule_min']->getData(); |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | // ファイル生成・更新 |
| 172 | 172 | $tplDir = $this->appConfig['block_realdir']; |
| 173 | 173 | |
| 174 | - $filePath = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
| 174 | + $filePath = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
| 175 | 175 | |
| 176 | 176 | $fs = new Filesystem(); |
| 177 | 177 | $blockData = $form->get('block_html')->getData(); |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | $fs->dumpFile($filePath, $blockData); |
| 180 | 180 | // 更新でファイル名を変更した場合、以前のファイルを削除 |
| 181 | 181 | if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) { |
| 182 | - $oldFilePath = $tplDir . '/' . $previous_filename . '.twig'; |
|
| 182 | + $oldFilePath = $tplDir.'/'.$previous_filename.'.twig'; |
|
| 183 | 183 | if ($fs->exists($oldFilePath)) { |
| 184 | 184 | $fs->remove($oldFilePath); |
| 185 | 185 | } |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る |
| 237 | 237 | if ($Block->isDeletable()) { |
| 238 | 238 | $tplDir = $this->appConfig['block_realdir']; |
| 239 | - $file = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
| 239 | + $file = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
| 240 | 240 | $fs = new Filesystem(); |
| 241 | 241 | if ($fs->exists($file)) { |
| 242 | 242 | $fs->remove($file); |
@@ -32,9 +32,9 @@ |
||
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * RepositoryDefinition constructor. |
| 35 | - * @param $id |
|
| 36 | - * @param $refClass |
|
| 37 | - * @param $entityClass |
|
| 35 | + * @param string $id |
|
| 36 | + * @param \ReflectionClass $refClass |
|
| 37 | + * @param string $entityClass |
|
| 38 | 38 | */ |
| 39 | 39 | public function __construct($id, $refClass, $entityClass) |
| 40 | 40 | { |
@@ -58,9 +58,9 @@ |
||
| 58 | 58 | |
| 59 | 59 | // 同じパッケージのEntityがあれば返す |
| 60 | 60 | if (count($partsOfFqcn) > 2) { |
| 61 | - $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn)-2)); |
|
| 62 | - $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) -1]); |
|
| 63 | - $result = $parentNamespace . '\\Entity\\' . $entityName; |
|
| 61 | + $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn) - 2)); |
|
| 62 | + $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) - 1]); |
|
| 63 | + $result = $parentNamespace.'\\Entity\\'.$entityName; |
|
| 64 | 64 | if (class_exists($result)) { |
| 65 | 65 | return $result; |
| 66 | 66 | } |
@@ -127,7 +127,7 @@ |
||
| 127 | 127 | |
| 128 | 128 | /** |
| 129 | 129 | * @param $rowArray |
| 130 | - * @param $key |
|
| 130 | + * @param string $key |
|
| 131 | 131 | * @return array |
| 132 | 132 | */ |
| 133 | 133 | private static function parseArrayInfoOutput($rowArray, $key) |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
| 40 | 40 | $installedLogs = array_filter( |
| 41 | 41 | array_map( |
| 42 | - function ($line) { |
|
| 42 | + function($line) { |
|
| 43 | 43 | $matches = array(); |
| 44 | 44 | preg_match('/^ - Installing (.*?) \((.*?)\) .*/', $line, $matches); |
| 45 | 45 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | public static function parseInfo($output) |
| 63 | 63 | { |
| 64 | 64 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
| 65 | - $infoLogs = array_filter(array_map(function ($line) { |
|
| 65 | + $infoLogs = array_filter(array_map(function($line) { |
|
| 66 | 66 | $matches = array(); |
| 67 | 67 | preg_match('/^(name|descrip.|keywords|versions|type|license|source|dist|names)\s*:\s*(.*)$/', $line, $matches); |
| 68 | 68 | |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | public static function parseConfig($output) |
| 87 | 87 | { |
| 88 | 88 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
| 89 | - $rowArray = array_filter($rowArray, function ($line) { |
|
| 89 | + $rowArray = array_filter($rowArray, function($line) { |
|
| 90 | 90 | return !preg_match('/^<warning>.*/', $line); |
| 91 | 91 | }); |
| 92 | 92 | |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | public static function parseList($output) |
| 103 | 103 | { |
| 104 | 104 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
| 105 | - $rawConfig = array_map(function ($line) { |
|
| 105 | + $rawConfig = array_map(function($line) { |
|
| 106 | 106 | $matches = array(); |
| 107 | 107 | preg_match('/^\[(.*?)\]\s?(.*)$/', $line, $matches); |
| 108 | 108 | |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | public static function parseComposerVersion($output) |
| 160 | 160 | { |
| 161 | 161 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
| 162 | - $rowArray = array_filter($rowArray, function ($line) { |
|
| 162 | + $rowArray = array_filter($rowArray, function($line) { |
|
| 163 | 163 | return preg_match('/^Composer */', $line); |
| 164 | 164 | }); |
| 165 | 165 | return array_shift($rowArray); |
@@ -27,12 +27,6 @@ |
||
| 27 | 27 | use Eccube\Annotation\Inject; |
| 28 | 28 | use Eccube\Entity\BaseInfo; |
| 29 | 29 | use Eccube\Entity\ItemHolderInterface; |
| 30 | -use Eccube\Entity\Master\OrderItemType; |
|
| 31 | -use Eccube\Entity\Master\TaxDisplayType; |
|
| 32 | -use Eccube\Entity\Master\TaxType; |
|
| 33 | -use Eccube\Entity\Order; |
|
| 34 | -use Eccube\Entity\OrderItem; |
|
| 35 | -use Eccube\Entity\Shipping; |
|
| 36 | 30 | use Eccube\Service\PurchaseFlow\ItemHolderProcessor; |
| 37 | 31 | use Eccube\Service\PurchaseFlow\ProcessResult; |
| 38 | 32 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | * @param integer $pointRate ポイント付与率(%) |
| 92 | 92 | * @param integer $price 単価 |
| 93 | 93 | * @param integer $quantity 数量 |
| 94 | - * @return integer additional point |
|
| 94 | + * @return double additional point |
|
| 95 | 95 | */ |
| 96 | 96 | protected function priceToAddPoint($pointRate, $price, $quantity) |
| 97 | 97 | { |
@@ -11,11 +11,9 @@ |
||
| 11 | 11 | use Eccube\Entity\BaseInfo; |
| 12 | 12 | use Eccube\Entity\Order; |
| 13 | 13 | use Eccube\Entity\OrderItem; |
| 14 | -use Eccube\Entity\Shipping; |
|
| 15 | 14 | use Eccube\Service\PurchaseFlow\ItemHolderProcessor; |
| 16 | 15 | use Eccube\Service\PurchaseFlow\ProcessResult; |
| 17 | 16 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
| 18 | -use Eccube\Util\EntityUtil; |
|
| 19 | 17 | |
| 20 | 18 | /** |
| 21 | 19 | * 使用ポイント値引明細追加. |