@@ -231,7 +231,7 @@ |
||
231 | 231 | } |
232 | 232 | |
233 | 233 | /** |
234 | - * @param \Eccube\Entity\ProductClass|integer $ProductClass |
|
234 | + * @param string $ProductClass |
|
235 | 235 | * @param integer $quantity |
236 | 236 | * @return \Eccube\Service\CartService |
237 | 237 | * @throws CartException |
@@ -328,7 +328,6 @@ discard block |
||
328 | 328 | |
329 | 329 | /** |
330 | 330 | * @param $row |
331 | - * @param null $callback |
|
332 | 331 | */ |
333 | 332 | public function fputcsv($row) |
334 | 333 | { |
@@ -425,7 +424,6 @@ discard block |
||
425 | 424 | * XXX self::setExportQueryBuilder() をコールする前に EntityManager を取得したいので、引数で渡している |
426 | 425 | * |
427 | 426 | * @param array $searchData セッションから取得した検索条件の配列 |
428 | - * @param EntityManager $em |
|
429 | 427 | */ |
430 | 428 | protected function findDeserializeObjects(array &$searchData) |
431 | 429 | { |
@@ -26,7 +26,6 @@ |
||
26 | 26 | |
27 | 27 | use Eccube\Common\Constant; |
28 | 28 | use Eccube\Util\EntityUtil; |
29 | -use Symfony\Component\Form\FormFactory; |
|
30 | 29 | use Symfony\Component\HttpFoundation\Request; |
31 | 30 | use Doctrine\Common\Collections\ArrayCollection; |
32 | 31 |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | { |
310 | 310 | $config = $this->config; |
311 | 311 | |
312 | - return function ($value) use ($config) { |
|
312 | + return function($value) use ($config) { |
|
313 | 313 | return mb_convert_encoding( |
314 | 314 | (string) $value, $config['csv_export_encoding'], 'UTF-8' |
315 | 315 | ); |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | if ($Conditions instanceof ArrayCollection) { |
435 | 435 | $Conditions = new ArrayCollection( |
436 | 436 | array_map( |
437 | - function ($Entity) use ($em) { |
|
437 | + function($Entity) use ($em) { |
|
438 | 438 | return $em->getRepository(get_class($Entity))->find($Entity->getId()); |
439 | 439 | }, $Conditions->toArray() |
440 | 440 | ) |
@@ -23,8 +23,6 @@ |
||
23 | 23 | |
24 | 24 | namespace Eccube\Service; |
25 | 25 | |
26 | -use Eccube\Application; |
|
27 | - |
|
28 | 26 | |
29 | 27 | /** |
30 | 28 | * Copyright (C) 2012-2014 David de Boer <[email protected]> |
@@ -117,9 +117,9 @@ discard block |
||
117 | 117 | |
118 | 118 | $this->file = $file; |
119 | 119 | $this->file->setFlags( |
120 | - \SplFileObject::READ_CSV | |
|
121 | - \SplFileObject::SKIP_EMPTY | |
|
122 | - \SplFileObject::READ_AHEAD | |
|
120 | + \SplFileObject::READ_CSV| |
|
121 | + \SplFileObject::SKIP_EMPTY| |
|
122 | + \SplFileObject::READ_AHEAD| |
|
123 | 123 | \SplFileObject::DROP_NEW_LINE |
124 | 124 | ); |
125 | 125 | $this->file->setCsvControl( |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | if ($count > 1) { |
363 | 363 | $incrementedHeaders[] = $header; |
364 | 364 | for ($i = 1; $i < $count; $i++) { |
365 | - $incrementedHeaders[] = $header . $i; |
|
365 | + $incrementedHeaders[] = $header.$i; |
|
366 | 366 | } |
367 | 367 | } else { |
368 | 368 | $incrementedHeaders[] = $header; |
@@ -413,7 +413,7 @@ discard block |
||
413 | 413 | protected function convertEncodingRows($row) { |
414 | 414 | if ('\\' === DIRECTORY_SEPARATOR && PHP_VERSION_ID >= 70000) { |
415 | 415 | foreach ($row as &$col) { |
416 | - $col = mb_convert_encoding($col , 'UTF-8', 'SJIS-win'); |
|
416 | + $col = mb_convert_encoding($col, 'UTF-8', 'SJIS-win'); |
|
417 | 417 | } |
418 | 418 | } |
419 | 419 | return $row; |
@@ -152,7 +152,7 @@ |
||
152 | 152 | * 仮受注情報作成 |
153 | 153 | * |
154 | 154 | * @param $Customer |
155 | - * @param $preOrderId |
|
155 | + * @param string $preOrderId |
|
156 | 156 | * @return mixed |
157 | 157 | * @throws \Doctrine\ORM\NoResultException |
158 | 158 | * @throws \Doctrine\ORM\NonUniqueResultException |
@@ -932,7 +932,7 @@ |
||
932 | 932 | |
933 | 933 | // 配送日数が設定されている |
934 | 934 | if ($deliveryDateFlag) { |
935 | - $period = new \DatePeriod ( |
|
935 | + $period = new \DatePeriod( |
|
936 | 936 | new \DateTime($minDate.' day'), |
937 | 937 | new \DateInterval('P1D'), |
938 | 938 | new \DateTime($minDate + $this->app['config']['deliv_date_end_max'].' day') |
@@ -24,7 +24,7 @@ |
||
24 | 24 | $app['db.migrations.table_name'] = null; |
25 | 25 | $app['db.migrations.name'] = null; |
26 | 26 | |
27 | - $app['dispatcher']->addListener(ConsoleEvents::INIT, function (ConsoleEvent $event) use ($app) { |
|
27 | + $app['dispatcher']->addListener(ConsoleEvents::INIT, function(ConsoleEvent $event) use ($app) { |
|
28 | 28 | $application = $event->getApplication(); |
29 | 29 | |
30 | 30 | $helpers = array('dialog' => new DialogHelper()); |
@@ -20,32 +20,32 @@ discard block |
||
20 | 20 | */ |
21 | 21 | public function addSuccess($message, $namespace = 'front') |
22 | 22 | { |
23 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message); |
|
23 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function addError($message, $namespace = 'front') |
27 | 27 | { |
28 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message); |
|
28 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | public function addDanger($message, $namespace = 'front') |
32 | 32 | { |
33 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message); |
|
33 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public function addWarning($message, $namespace = 'front') |
37 | 37 | { |
38 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message); |
|
38 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | public function addInfo($message, $namespace = 'front') |
42 | 42 | { |
43 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message); |
|
43 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | public function addRequestError($message, $namespace = 'front') |
47 | 47 | { |
48 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message); |
|
48 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | public function clearMessage() |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | if (is_null($namespace)) { |
65 | 65 | $this['session']->getFlashBag()->set('eccube.login.target.path', $targetPath); |
66 | 66 | } else { |
67 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.login.target.path', $targetPath); |
|
67 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath); |
|
68 | 68 | } |
69 | 69 | } |
70 | 70 | |
@@ -234,14 +234,14 @@ discard block |
||
234 | 234 | $eventName = $view; |
235 | 235 | if ($this->isAdminRequest()) { |
236 | 236 | // 管理画面の場合、event名に「Admin/」を付ける |
237 | - $eventName = 'Admin/' . $view; |
|
237 | + $eventName = 'Admin/'.$view; |
|
238 | 238 | } |
239 | - $this['monolog']->debug('Template Event Name : ' . $eventName); |
|
239 | + $this['monolog']->debug('Template Event Name : '.$eventName); |
|
240 | 240 | |
241 | 241 | $this['eccube.event.dispatcher']->dispatch($eventName, $event); |
242 | 242 | |
243 | 243 | if ($response instanceof StreamedResponse) { |
244 | - $response->setCallback(function () use ($twig, $view, $parameters) { |
|
244 | + $response->setCallback(function() use ($twig, $view, $parameters) { |
|
245 | 245 | $twig->display($view, $parameters); |
246 | 246 | }); |
247 | 247 | } else { |
@@ -21,7 +21,7 @@ |
||
21 | 21 | // this up() migration is auto-generated, please modify it to your needs |
22 | 22 | $t = $schema->getTable(self::NAME); |
23 | 23 | |
24 | - if($t->hasColumn('option_delivery_fee')){ |
|
24 | + if ($t->hasColumn('option_delivery_fee')) { |
|
25 | 25 | $t->dropColumn('option_delivery_fee'); |
26 | 26 | } |
27 | 27 |
@@ -16,7 +16,7 @@ |
||
16 | 16 | public function up(Schema $schema) |
17 | 17 | { |
18 | 18 | |
19 | - if($this->connection->getDatabasePlatform()->getName() == "mysql"){ |
|
19 | + if ($this->connection->getDatabasePlatform()->getName() == "mysql") { |
|
20 | 20 | // this up() migration is auto-generated, please modify it to your needs |
21 | 21 | $this->addSql("alter table dtb_base_info collate utf8_general_ci ;"); |
22 | 22 | $this->addSql("alter table dtb_block collate utf8_general_ci ;"); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | $PageLayout = new PageLayout(); |
29 | 29 | $PageLayout->setDeviceType($DeviceType); |
30 | - $PageLayout->setName( '商品購入/お届け先の追加'); |
|
30 | + $PageLayout->setName('商品購入/お届け先の追加'); |
|
31 | 31 | $PageLayout->setUrl('shopping_shipping_edit'); |
32 | 32 | $PageLayout->setFileName('Shopping/shipping_edit'); |
33 | 33 | $PageLayout->setEditFlg(2); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | $PageLayout = new PageLayout(); |
40 | 40 | $PageLayout->setDeviceType($DeviceType); |
41 | - $PageLayout->setName( '商品購入/お届け先の複数指定(お届け先の追加)'); |
|
41 | + $PageLayout->setName('商品購入/お届け先の複数指定(お届け先の追加)'); |
|
42 | 42 | $PageLayout->setUrl('shopping_shipping_multiple_edit'); |
43 | 43 | $PageLayout->setFileName('Shopping/shipping_multiple_edit'); |
44 | 44 | $PageLayout->setEditFlg(2); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | |
50 | 50 | $PageLayout = new PageLayout(); |
51 | 51 | $PageLayout->setDeviceType($DeviceType); |
52 | - $PageLayout->setName( '商品購入/購入エラー'); |
|
52 | + $PageLayout->setName('商品購入/購入エラー'); |
|
53 | 53 | $PageLayout->setUrl('shopping_error'); |
54 | 54 | $PageLayout->setFileName('Shopping/shopping_error'); |
55 | 55 | $PageLayout->setEditFlg(2); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | $PageLayout = new PageLayout(); |
62 | 62 | $PageLayout->setDeviceType($DeviceType); |
63 | - $PageLayout->setName( 'ご利用ガイド'); |
|
63 | + $PageLayout->setName('ご利用ガイド'); |
|
64 | 64 | $PageLayout->setUrl('help_guide'); |
65 | 65 | $PageLayout->setFileName('Help/guide'); |
66 | 66 | $PageLayout->setEditFlg(2); |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | $PageLayout = new PageLayout(); |
72 | 72 | $PageLayout->setDeviceType($DeviceType); |
73 | - $PageLayout->setName( 'パスワード再発行(入力ページ)'); |
|
73 | + $PageLayout->setName('パスワード再発行(入力ページ)'); |
|
74 | 74 | $PageLayout->setUrl('forgot'); |
75 | 75 | $PageLayout->setFileName('Forgot/index'); |
76 | 76 | $PageLayout->setEditFlg(2); |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | |
81 | 81 | $PageLayout = new PageLayout(); |
82 | 82 | $PageLayout->setDeviceType($DeviceType); |
83 | - $PageLayout->setName( 'パスワード再発行(完了ページ)'); |
|
83 | + $PageLayout->setName('パスワード再発行(完了ページ)'); |
|
84 | 84 | $PageLayout->setUrl('forgot_complete'); |
85 | 85 | $PageLayout->setFileName('Forgot/complete'); |
86 | 86 | $PageLayout->setEditFlg(2); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | $PageLayout = new PageLayout(); |
93 | 93 | $PageLayout->setDeviceType($DeviceType); |
94 | - $PageLayout->setName( 'パスワード変更((完了ページ)'); |
|
94 | + $PageLayout->setName('パスワード変更((完了ページ)'); |
|
95 | 95 | $PageLayout->setUrl('forgot_reset'); |
96 | 96 | $PageLayout->setFileName('Forgot/reset'); |
97 | 97 | $PageLayout->setEditFlg(2); |