@@ -106,7 +106,7 @@ |
||
106 | 106 | )); |
107 | 107 | $addCartForm = $builder->getForm(); |
108 | 108 | |
109 | - if ($request->getMethod() === 'POST' && (string)$Product->getId() === $request->get('product_id')) { |
|
109 | + if ($request->getMethod() === 'POST' && (string) $Product->getId() === $request->get('product_id')) { |
|
110 | 110 | $addCartForm->handleRequest($request); |
111 | 111 | |
112 | 112 | if ($addCartForm->isValid()) { |
@@ -510,6 +510,8 @@ discard block |
||
510 | 510 | /** |
511 | 511 | * 登録、更新時のエラー画面表示 |
512 | 512 | * |
513 | + * @param Application $app |
|
514 | + * @param boolean $not_product_class |
|
513 | 515 | */ |
514 | 516 | protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null) |
515 | 517 | { |
@@ -559,6 +561,7 @@ discard block |
||
559 | 561 | |
560 | 562 | /** |
561 | 563 | * 規格1と規格2を組み合わせた商品規格を作成 |
564 | + * @param Application $app |
|
562 | 565 | */ |
563 | 566 | private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null) |
564 | 567 | { |
@@ -646,6 +649,7 @@ discard block |
||
646 | 649 | * |
647 | 650 | * @param $productClassDest コピー先となる商品規格 |
648 | 651 | * @param $productClassOrig コピー元となる商品規格 |
652 | + * @param Application $app |
|
649 | 653 | */ |
650 | 654 | private function setDefualtProductClass($app, $productClassDest, $productClassOrig) { |
651 | 655 | $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate()); |
@@ -687,6 +691,7 @@ discard block |
||
687 | 691 | * 商品規格を登録 |
688 | 692 | * |
689 | 693 | * @param $ProductClasses 登録される商品規格 |
694 | + * @param Application $app |
|
690 | 695 | */ |
691 | 696 | private function insertProductClass($app, $Product, $ProductClasses) { |
692 | 697 |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | foreach ($Payments as $Payment) { |
168 | 168 | if ($Payment->getId() != $id) { |
169 | 169 | $Payment->setRank($rank); |
170 | - $rank ++; |
|
170 | + $rank++; |
|
171 | 171 | } |
172 | 172 | } |
173 | 173 | |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | ); |
182 | 182 | $app['eccube.event.dispatcher']->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event); |
183 | 183 | |
184 | - $app->addSuccess('admin.delete.complete', 'admin') ; |
|
184 | + $app->addSuccess('admin.delete.complete', 'admin'); |
|
185 | 185 | |
186 | 186 | return $app->redirect($app->url('admin_setting_shop_payment')); |
187 | 187 | } |
@@ -102,7 +102,7 @@ |
||
102 | 102 | if (count($allowHost) > 0) { |
103 | 103 | $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost))); |
104 | 104 | } |
105 | - $form->get('force_ssl')->setData((bool)$app['config']['force_ssl']); |
|
105 | + $form->get('force_ssl')->setData((bool) $app['config']['force_ssl']); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | return $app->render('Setting/System/security.twig', array( |
@@ -66,10 +66,10 @@ |
||
66 | 66 | $server = $app['request']; |
67 | 67 | |
68 | 68 | $arrSystemInfo = array( |
69 | - array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
70 | - array('title' => 'サーバーOS', 'value' => php_uname()), |
|
71 | - array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
72 | - array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")), |
|
69 | + array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
70 | + array('title' => 'サーバーOS', 'value' => php_uname()), |
|
71 | + array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
72 | + array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")), |
|
73 | 73 | ); |
74 | 74 | |
75 | 75 | $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')'; |
@@ -9,12 +9,12 @@ |
||
9 | 9 | { |
10 | 10 | CONST MIGRATION_TABLE_PREFIX = 'migration_'; |
11 | 11 | |
12 | - public function migrationSchema($app,$migrationFilePath,$pluginCode,$version = null) |
|
12 | + public function migrationSchema($app, $migrationFilePath, $pluginCode, $version = null) |
|
13 | 13 | { |
14 | 14 | $config = new Configuration($app['db']); |
15 | 15 | $config->setMigrationsNamespace('DoctrineMigrations'); |
16 | 16 | $config->setMigrationsDirectory($migrationFilePath); |
17 | - $config->registerMigrationsFromDirectory($migrationFilePath ); |
|
17 | + $config->registerMigrationsFromDirectory($migrationFilePath); |
|
18 | 18 | $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode); |
19 | 19 | $migration = new Migration($config); |
20 | 20 | // null 又は 'last' を渡すと最新バージョンまでマイグレートする |
@@ -147,7 +147,7 @@ |
||
147 | 147 | |
148 | 148 | if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) { |
149 | 149 | //スペース除去 |
150 | - $clean_key_multi = preg_replace('/\s+|[ ]+/u', '',$searchData['multi']); |
|
150 | + $clean_key_multi = preg_replace('/\s+|[ ]+/u', '', $searchData['multi']); |
|
151 | 151 | if (preg_match('/^\d+$/', $clean_key_multi)) { |
152 | 152 | $qb |
153 | 153 | ->andWhere('c.id = :customer_id') |
@@ -270,7 +270,7 @@ |
||
270 | 270 | ->setParameter('order_id_start', $searchData['order_id_start']); |
271 | 271 | } |
272 | 272 | // multi |
273 | - if (isset( $searchData['multi']) && Str::isNotBlank($searchData['multi'])) { |
|
273 | + if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) { |
|
274 | 274 | $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null; |
275 | 275 | $qb |
276 | 276 | ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '. |
@@ -258,7 +258,7 @@ |
||
258 | 258 | $form = $builder->getForm(); |
259 | 259 | |
260 | 260 | if (!$has_class) { |
261 | - $ProductClass->setStockUnlimited((boolean)$ProductClass->getStockUnlimited()); |
|
261 | + $ProductClass->setStockUnlimited((boolean) $ProductClass->getStockUnlimited()); |
|
262 | 262 | $form['class']->setData($ProductClass); |
263 | 263 | } |
264 | 264 |