@@ -108,7 +108,7 @@ |
||
108 | 108 | )); |
109 | 109 | $addCartForm = $builder->getForm(); |
110 | 110 | |
111 | - if ($request->getMethod() === 'POST' && (string)$Product->getId() === $request->get('product_id')) { |
|
111 | + if ($request->getMethod() === 'POST' && (string) $Product->getId() === $request->get('product_id')) { |
|
112 | 112 | $addCartForm->handleRequest($request); |
113 | 113 | |
114 | 114 | if ($addCartForm->isValid()) { |
@@ -71,7 +71,7 @@ |
||
71 | 71 | // 会員削除 |
72 | 72 | $email = $Customer->getEmail(); |
73 | 73 | // メールアドレスにダミーをセット |
74 | - $Customer->setEmail(Str::random(60) . '@dummy.dummy'); |
|
74 | + $Customer->setEmail(Str::random(60).'@dummy.dummy'); |
|
75 | 75 | $Customer->setDelFlg(Constant::ENABLED); |
76 | 76 | |
77 | 77 | $app['orm.em']->flush(); |
@@ -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 | } |
@@ -55,7 +55,7 @@ |
||
55 | 55 | $paths[] = $app['config']['user_data_realdir']; |
56 | 56 | $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths)); |
57 | 57 | |
58 | - $file = $PageLayout->getFileName() . '.twig'; |
|
58 | + $file = $PageLayout->getFileName().'.twig'; |
|
59 | 59 | |
60 | 60 | $event = new EventArgs( |
61 | 61 | array( |
@@ -119,7 +119,7 @@ |
||
119 | 119 | $num = $app['eccube.repository.product_class']->createQueryBuilder('pc') |
120 | 120 | ->select('count(pc.id)') |
121 | 121 | ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id') |
122 | - ->setParameter('id',$id) |
|
122 | + ->setParameter('id', $id) |
|
123 | 123 | ->getQuery() |
124 | 124 | ->getSingleScalarResult(); |
125 | 125 | if ($num > 0) { |
@@ -138,7 +138,7 @@ |
||
138 | 138 | 'allow_add' => true, |
139 | 139 | 'allow_delete' => true, |
140 | 140 | 'data' => $ProductClasses, |
141 | - )); |
|
141 | + )); |
|
142 | 142 | |
143 | 143 | $event = new EventArgs( |
144 | 144 | array( |
@@ -106,7 +106,7 @@ |
||
106 | 106 | $class2Valied = $this->isValiedCategory($ClassName2); |
107 | 107 | |
108 | 108 | // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示 |
109 | - if($class1Valied && $class2Valied){ |
|
109 | + if ($class1Valied && $class2Valied) { |
|
110 | 110 | $hasClassCategoryFlg = true; |
111 | 111 | } |
112 | 112 |
@@ -529,6 +529,9 @@ discard block |
||
529 | 529 | /** |
530 | 530 | * 登録、更新時のエラー画面表示 |
531 | 531 | * |
532 | + * @param Application $app |
|
533 | + * @param boolean $not_product_class |
|
534 | + * @param \Symfony\Component\Form\FormInterface $classForm |
|
532 | 535 | */ |
533 | 536 | protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null) |
534 | 537 | { |
@@ -580,6 +583,7 @@ discard block |
||
580 | 583 | |
581 | 584 | /** |
582 | 585 | * 規格1と規格2を組み合わせた商品規格を作成 |
586 | + * @param Application $app |
|
583 | 587 | */ |
584 | 588 | private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null) |
585 | 589 | { |
@@ -667,6 +671,7 @@ discard block |
||
667 | 671 | * |
668 | 672 | * @param $productClassDest コピー先となる商品規格 |
669 | 673 | * @param $productClassOrig コピー元となる商品規格 |
674 | + * @param Application $app |
|
670 | 675 | */ |
671 | 676 | private function setDefualtProductClass($app, $productClassDest, $productClassOrig) { |
672 | 677 | $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate()); |
@@ -93,10 +93,10 @@ discard block |
||
93 | 93 | // ファイルアップロード |
94 | 94 | $file = $form['payment_image']->getData(); |
95 | 95 | $fs = new Filesystem(); |
96 | - if ($file && $fs->exists($app['config']['image_temp_realdir'] . '/' . $file)) { |
|
96 | + if ($file && $fs->exists($app['config']['image_temp_realdir'].'/'.$file)) { |
|
97 | 97 | $fs->rename( |
98 | - $app['config']['image_temp_realdir'] . '/' . $file, |
|
99 | - $app['config']['image_save_realdir'] . '/' . $file |
|
98 | + $app['config']['image_temp_realdir'].'/'.$file, |
|
99 | + $app['config']['image_save_realdir'].'/'.$file |
|
100 | 100 | ); |
101 | 101 | } |
102 | 102 | |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | } |
145 | 145 | |
146 | 146 | $extension = $image->guessExtension(); |
147 | - $filename = date('mdHis') . uniqid('_') . '.' . $extension; |
|
147 | + $filename = date('mdHis').uniqid('_').'.'.$extension; |
|
148 | 148 | $image->move($app['config']['image_temp_realdir'], $filename); |
149 | 149 | } |
150 | 150 | $event = new EventArgs( |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | foreach ($Payments as $Payment) { |
181 | 181 | if ($Payment->getId() != $id) { |
182 | 182 | $Payment->setRank($rank); |
183 | - $rank ++; |
|
183 | + $rank++; |
|
184 | 184 | } |
185 | 185 | } |
186 | 186 | |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | ); |
195 | 195 | $app['eccube.event.dispatcher']->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event); |
196 | 196 | |
197 | - $app->addSuccess('admin.delete.complete', 'admin') ; |
|
197 | + $app->addSuccess('admin.delete.complete', 'admin'); |
|
198 | 198 | |
199 | 199 | return $app->redirect($app->url('admin_setting_shop_payment')); |
200 | 200 | } |
@@ -126,7 +126,7 @@ |
||
126 | 126 | if (count($allowHost) > 0) { |
127 | 127 | $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost))); |
128 | 128 | } |
129 | - $form->get('force_ssl')->setData((bool)$app['config']['force_ssl']); |
|
129 | + $form->get('force_ssl')->setData((bool) $app['config']['force_ssl']); |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | return $app->render('Setting/System/security.twig', array( |
@@ -128,7 +128,7 @@ |
||
128 | 128 | $entityName = str_replace('-', '\\', $data['masterdata_name']); |
129 | 129 | $entity = new $entityName(); |
130 | 130 | $rank = 0; |
131 | - $ids = array_map(function ($v) {return $v['id'];}, $data['data']); |
|
131 | + $ids = array_map(function($v) {return $v['id']; }, $data['data']); |
|
132 | 132 | foreach ($data['data'] as $key => $value) { |
133 | 133 | if ($value['id'] !== null && $value['name'] !== null) { |
134 | 134 | $entity->setId($value['id']); |