@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | |
50 | 50 | return $phpinfo; |
51 | 51 | |
52 | - break; |
|
52 | + break; |
|
53 | 53 | default: |
54 | 54 | break; |
55 | 55 | } |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | )); |
62 | 62 | } |
63 | 63 | |
64 | - public function getSystemInfo(Application $app) |
|
65 | - { |
|
64 | + public function getSystemInfo(Application $app) |
|
65 | + { |
|
66 | 66 | $system = $app['eccube.service.system']; |
67 | 67 | $server = $app['request']; |
68 | 68 | |
@@ -78,5 +78,5 @@ discard block |
||
78 | 78 | $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent')); |
79 | 79 | |
80 | 80 | return $arrSystemInfo; |
81 | - } |
|
81 | + } |
|
82 | 82 | } |
@@ -67,13 +67,13 @@ |
||
67 | 67 | $server = $app['request']; |
68 | 68 | |
69 | 69 | $arrSystemInfo = array( |
70 | - array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
71 | - array('title' => 'サーバーOS', 'value' => php_uname()), |
|
72 | - array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
73 | - array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")), |
|
70 | + array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
71 | + array('title' => 'サーバーOS', 'value' => php_uname()), |
|
72 | + array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
73 | + array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")), |
|
74 | 74 | ); |
75 | 75 | |
76 | - $value = phpversion() . ' (' . implode(', ', get_loaded_extensions()) . ')'; |
|
76 | + $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')'; |
|
77 | 77 | $arrSystemInfo[] = array('title' => 'PHP', 'value' => $value); |
78 | 78 | $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent')); |
79 | 79 |
@@ -38,7 +38,7 @@ |
||
38 | 38 | |
39 | 39 | if ($app['eccube.layout']) { |
40 | 40 | foreach ($app['eccube.layout']->getBlocPositions() as $blocPositions) { |
41 | - if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::" . $position)) { |
|
41 | + if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::".$position)) { |
|
42 | 42 | $blocks[] = $blocPositions->getBloc(); |
43 | 43 | } |
44 | 44 | } |
@@ -88,7 +88,7 @@ |
||
88 | 88 | ->setCompanyName($Customer->getCompanyName()) |
89 | 89 | ->setZip01($Customer->getZip01()) |
90 | 90 | ->setZip02($Customer->getZip02()) |
91 | - ->setZipcode($Customer->getZip01() . $Customer->getZip02()) |
|
91 | + ->setZipcode($Customer->getZip01().$Customer->getZip02()) |
|
92 | 92 | ->setPref($Customer->getPref()) |
93 | 93 | ->setAddr01($Customer->getAddr01()) |
94 | 94 | ->setAddr02($Customer->getAddr02()) |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | * Complete |
137 | 137 | * |
138 | 138 | * @param Application $app |
139 | - * @return mixed |
|
139 | + * @return \Symfony\Component\HttpFoundation\Response |
|
140 | 140 | */ |
141 | 141 | public function complete(Application $app) |
142 | 142 | { |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | * 会員のアクティベート(本会員化)を行う |
149 | 149 | * |
150 | 150 | * @param Application $app |
151 | - * @return mixed |
|
151 | + * @return \Symfony\Component\HttpFoundation\Response |
|
152 | 152 | */ |
153 | 153 | public function activate(Application $app, Request $request, $secret_key) |
154 | 154 | { |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | // リセットキーの発行・有効期限の設定 |
53 | 53 | $Customer |
54 | 54 | ->setResetKey($app['eccube.repository.customer']->getUniqueResetKey($app)) |
55 | - ->setResetExpire(new \DateTime('+' . $app['config']['customer_reset_expire'] .' min')); |
|
55 | + ->setResetExpire(new \DateTime('+'.$app['config']['customer_reset_expire'].' min')); |
|
56 | 56 | |
57 | 57 | // リセットキーを更新 |
58 | 58 | $app['orm.em']->persist($Customer); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | |
67 | 67 | // ログ出力 |
68 | 68 | $app['monolog']->addInfo( |
69 | - 'send reset password mail to:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}" |
|
69 | + 'send reset password mail to:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}" |
|
70 | 70 | ); |
71 | 71 | } |
72 | 72 | |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | |
123 | 123 | // ログ出力 |
124 | 124 | $app['monolog']->addInfo( |
125 | - 'reset password complete:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}" |
|
125 | + 'reset password complete:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}" |
|
126 | 126 | ); |
127 | 127 | |
128 | 128 | } else { |
@@ -52,7 +52,7 @@ |
||
52 | 52 | $paths[] = $app['config']['user_data_realdir']; |
53 | 53 | $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths)); |
54 | 54 | |
55 | - $file = $PageLayout->getFileName() . '.twig'; |
|
55 | + $file = $PageLayout->getFileName().'.twig'; |
|
56 | 56 | |
57 | 57 | return $app['twig']->render($file); |
58 | 58 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) |
33 | 33 | { |
34 | 34 | if ($targetEntity->reflClass->getName() === 'Eccube\Entity\ProductClass') { |
35 | - return $targetTableAlias . '.stock >= 1 OR ' . $targetTableAlias . '.stock_unlimited = 1'; |
|
35 | + return $targetTableAlias.'.stock >= 1 OR '.$targetTableAlias.'.stock_unlimited = 1'; |
|
36 | 36 | } else { |
37 | 37 | return ""; |
38 | 38 | } |
@@ -33,12 +33,12 @@ |
||
33 | 33 | { |
34 | 34 | // 決済処理中/購入処理中を除く. |
35 | 35 | if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Order') { |
36 | - return $targetTableAlias . '.status <> 7 AND ' . $targetTableAlias . '.status <> 8'; |
|
36 | + return $targetTableAlias.'.status <> 7 AND '.$targetTableAlias.'.status <> 8'; |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | // 決済処理中/購入処理中を除く. |
40 | 40 | if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Master\OrderStatus') { |
41 | - return $targetTableAlias . '.id <> 7 AND ' . $targetTableAlias . '.id <> 8'; |
|
41 | + return $targetTableAlias.'.id <> 7 AND '.$targetTableAlias.'.id <> 8'; |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | return ''; |
@@ -46,7 +46,7 @@ |
||
46 | 46 | public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) |
47 | 47 | { |
48 | 48 | if ($targetEntity->hasField('del_flg') && !in_array($targetEntity->getName(), $this->getExcludes())) { |
49 | - return $targetTableAlias . '.del_flg = 0'; |
|
49 | + return $targetTableAlias.'.del_flg = 0'; |
|
50 | 50 | } else { |
51 | 51 | return ""; |
52 | 52 | } |
@@ -113,7 +113,7 @@ |
||
113 | 113 | } |
114 | 114 | } |
115 | 115 | |
116 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) { |
|
116 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) { |
|
117 | 117 | $data = $event->getData(); |
118 | 118 | $form = $event->getForm(); |
119 | 119 | if ($Product->getClassName2()) { |