@@ -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()) { |
@@ -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()) |
@@ -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()); |
@@ -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( |
@@ -21,7 +21,7 @@ |
||
21 | 21 | |
22 | 22 | // path.ymlの更新 |
23 | 23 | $app = Application::getInstance(); |
24 | - $file = $app['config']['root_dir'] . '/app/config/eccube/path.yml'; |
|
24 | + $file = $app['config']['root_dir'].'/app/config/eccube/path.yml'; |
|
25 | 25 | $config = Yaml::parse(file_get_contents($file)); |
26 | 26 | |
27 | 27 | if (!array_key_exists('public_path', $config)) { |
@@ -58,7 +58,7 @@ |
||
58 | 58 | } |
59 | 59 | if ($dir == 'doctrine') { |
60 | 60 | // doctrineが指定された場合は, cache driver経由で削除. |
61 | - $config = $app['orm.em']->getConfiguration(); |
|
61 | + $config = $app['orm.em']->getConfiguration(); |
|
62 | 62 | $this->deleteDoctrineCache($config->getMetadataCacheImpl()); |
63 | 63 | $this->deleteDoctrineCache($config->getQueryCacheImpl()); |
64 | 64 | $this->deleteDoctrineCache($config->getResultCacheImpl()); |
@@ -65,12 +65,12 @@ discard block |
||
65 | 65 | { |
66 | 66 | // install.phpのチェック. |
67 | 67 | if (isset($app['config']['eccube_install']) && $app['config']['eccube_install'] == 1) { |
68 | - $file = $app['config']['root_dir'] . '/html/install.php'; |
|
68 | + $file = $app['config']['root_dir'].'/html/install.php'; |
|
69 | 69 | if (file_exists($file)) { |
70 | 70 | $message = $app->trans('admin.install.warning', array('installphpPath' => 'html/install.php')); |
71 | 71 | $app->addWarning($message, 'admin'); |
72 | 72 | } |
73 | - $fileOnRoot = $app['config']['root_dir'] . '/install.php'; |
|
73 | + $fileOnRoot = $app['config']['root_dir'].'/install.php'; |
|
74 | 74 | if (file_exists($fileOnRoot)) { |
75 | 75 | $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php')); |
76 | 76 | $app->addWarning($message, 'admin'); |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | t1.status |
312 | 312 | ORDER BY |
313 | 313 | t1.status'; |
314 | - $rsm = new ResultSetMapping();; |
|
314 | + $rsm = new ResultSetMapping(); ; |
|
315 | 315 | $rsm->addScalarResult('status', 'status'); |
316 | 316 | $rsm->addScalarResult('count', 'count'); |
317 | 317 | $query = $em->createNativeQuery($sql, $rsm); |
@@ -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']); |
@@ -108,7 +108,7 @@ |
||
108 | 108 | if ($driver == 'pdo_sqlite') { |
109 | 109 | return sprintf("CAST(STRFTIME('%s', %s) AS INTEGER)", $this->formats[$this->field], $this->source->dispatch($sqlWalker)); |
110 | 110 | } else { |
111 | - return sprintf('EXTRACT(%s FROM %s %s)', $this->field, (string)$this->type, $this->source->dispatch($sqlWalker)); |
|
111 | + return sprintf('EXTRACT(%s FROM %s %s)', $this->field, (string) $this->type, $this->source->dispatch($sqlWalker)); |
|
112 | 112 | } |
113 | 113 | } |
114 | 114 | } |
115 | 115 | \ No newline at end of file |