@@ -67,8 +67,8 @@ |
||
67 | 67 | 'constraints' => array( |
68 | 68 | new Assert\NotBlank(array('message' => 'ファイルを選択してください。')), |
69 | 69 | new Assert\File(array( |
70 | - 'maxSize' => $this->appConfig['csv_size'] . 'M', |
|
71 | - 'maxSizeMessage' => 'CSVファイルは' . $this->appConfig['csv_size'] . 'M以下でアップロードしてください。', |
|
70 | + 'maxSize' => $this->appConfig['csv_size'].'M', |
|
71 | + 'maxSizeMessage' => 'CSVファイルは'.$this->appConfig['csv_size'].'M以下でアップロードしてください。', |
|
72 | 72 | )), |
73 | 73 | ), |
74 | 74 | )); |
@@ -166,19 +166,19 @@ |
||
166 | 166 | 'help' => 'メーラーバックエンドがSMTPかつSMTP-AUTH使用時のみ指定', |
167 | 167 | 'required' => false, |
168 | 168 | )) |
169 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { |
|
169 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) { |
|
170 | 170 | $form = $event->getForm(); |
171 | 171 | $data = $form->getData(); |
172 | 172 | |
173 | 173 | $ips = preg_split("/\R/", $data['admin_allow_hosts'], null, PREG_SPLIT_NO_EMPTY); |
174 | 174 | |
175 | - foreach($ips as $ip) { |
|
175 | + foreach ($ips as $ip) { |
|
176 | 176 | $errors = $this->validator->validate($ip, array( |
177 | 177 | new Assert\Ip(), |
178 | 178 | ) |
179 | 179 | ); |
180 | 180 | if ($errors->count() != 0) { |
181 | - $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。')); |
|
181 | + $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。')); |
|
182 | 182 | } |
183 | 183 | } |
184 | 184 | }) |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | 'label' => 'パスワード', |
107 | 107 | 'required' => false, |
108 | 108 | )) |
109 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { |
|
109 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) { |
|
110 | 110 | $form = $event->getForm(); |
111 | 111 | $data = $form->getData(); |
112 | 112 | try { |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config); |
132 | 132 | $conn->connect(); |
133 | 133 | } catch (\Exception $e) { |
134 | - $form['database']->addError(new FormError('データベースに接続できませんでした。' . $e->getMessage())); |
|
134 | + $form['database']->addError(new FormError('データベースに接続できませんでした。'.$e->getMessage())); |
|
135 | 135 | } |
136 | 136 | }); |
137 | 137 | } |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | public function validate($data, ExecutionContext $context, $param = null) |
148 | 148 | { |
149 | 149 | $parameters = $this->requestStack->getCurrentRequest()->get('install_step4'); |
150 | - if ($parameters['database'] != 'pdo_sqlite'){ |
|
150 | + if ($parameters['database'] != 'pdo_sqlite') { |
|
151 | 151 | $context->getValidator()->validate($data, array( |
152 | 152 | new Assert\NotBlank() |
153 | 153 | )); |
@@ -26,7 +26,7 @@ |
||
26 | 26 | |
27 | 27 | use Eccube\Annotation\FormType; |
28 | 28 | use \Symfony\Component\Form\AbstractType; |
29 | -use \Symfony\Component\Form\Extension\Core\Type\CheckboxType;; |
|
29 | +use \Symfony\Component\Form\Extension\Core\Type\CheckboxType; ; |
|
30 | 30 | use \Symfony\Component\Form\FormBuilderInterface; |
31 | 31 | |
32 | 32 | /** |
@@ -20,34 +20,34 @@ |
||
20 | 20 | |
21 | 21 | public function register(Container $app) |
22 | 22 | { |
23 | - $app['eccube.service.cart'] = function () use ($app) { |
|
23 | + $app['eccube.service.cart'] = function() use ($app) { |
|
24 | 24 | return $app[CartService::class]; |
25 | 25 | }; |
26 | - $app['eccube.service.order'] = function () use ($app) { |
|
26 | + $app['eccube.service.order'] = function() use ($app) { |
|
27 | 27 | return $app[OrderService::class]; |
28 | 28 | }; |
29 | - $app['eccube.service.tax_rule'] = function () use ($app) { |
|
29 | + $app['eccube.service.tax_rule'] = function() use ($app) { |
|
30 | 30 | return $app[TaxRuleService::class]; |
31 | 31 | }; |
32 | - $app['eccube.service.plugin'] = function () use ($app) { |
|
32 | + $app['eccube.service.plugin'] = function() use ($app) { |
|
33 | 33 | return $app[PluginService::class]; |
34 | 34 | }; |
35 | - $app['eccube.service.mail'] = function () use ($app) { |
|
35 | + $app['eccube.service.mail'] = function() use ($app) { |
|
36 | 36 | return $app[MailService::class]; |
37 | 37 | }; |
38 | - $app['eccube.helper.order'] = function ($app) { |
|
38 | + $app['eccube.helper.order'] = function($app) { |
|
39 | 39 | return $app[OrderHelper::class]; |
40 | 40 | }; |
41 | - $app['eccube.service.csv.export'] = function () use ($app) { |
|
41 | + $app['eccube.service.csv.export'] = function() use ($app) { |
|
42 | 42 | return $app[CsvExportService::class]; |
43 | 43 | }; |
44 | - $app['eccube.service.shopping'] = function () use ($app) { |
|
44 | + $app['eccube.service.shopping'] = function() use ($app) { |
|
45 | 45 | return $app[ShoppingService::class]; |
46 | 46 | }; |
47 | - $app['eccube.service.payment'] = function () use ($app) { |
|
47 | + $app['eccube.service.payment'] = function() use ($app) { |
|
48 | 48 | return $app[PaymentService::class]; |
49 | 49 | }; |
50 | - $app['eccube.service.system'] = function () use ($app) { |
|
50 | + $app['eccube.service.system'] = function() use ($app) { |
|
51 | 51 | return $app[SystemService::class]; |
52 | 52 | }; |
53 | 53 |
@@ -48,7 +48,6 @@ |
||
48 | 48 | /** |
49 | 49 | * SearchProductType constructor. |
50 | 50 | * |
51 | - * @param Application $app |
|
52 | 51 | */ |
53 | 52 | public function __construct() |
54 | 53 | { |
@@ -23,7 +23,7 @@ |
||
23 | 23 | ); |
24 | 24 | } |
25 | 25 | |
26 | - $app[TwigLintValidator::class] = function (Container $app) { |
|
26 | + $app[TwigLintValidator::class] = function(Container $app) { |
|
27 | 27 | return new TwigLintValidator($app['twig']); |
28 | 28 | }; |
29 | 29 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php return [ |
2 | - 'http_cache' => |
|
3 | - [ |
|
2 | + 'http_cache' => |
|
3 | + [ |
|
4 | 4 | 'enabled' => false, |
5 | 5 | 'age' => 10, |
6 | 6 | // フロントでキャッシュを適用させる画面のrouteを設定 |
@@ -17,5 +17,5 @@ discard block |
||
17 | 17 | // 'help_tradelaw', |
18 | 18 | // 'help_agreement', |
19 | 19 | ], |
20 | - ], |
|
20 | + ], |
|
21 | 21 | ]; |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Doctrine\ORM\EntityManager; |
7 | 7 | use Eccube\Annotation\Inject; |
8 | 8 | use Eccube\Annotation\Service; |
9 | -use Eccube\Common\Constant; |
|
10 | 9 | use Eccube\Entity\CartItem; |
11 | 10 | use Eccube\Entity\Customer; |
12 | 11 | use Eccube\Entity\CustomerAddress; |