@@ -72,19 +72,19 @@ |
||
| 72 | 72 | 'label' => 'SSLを強制', |
| 73 | 73 | 'required' => false, |
| 74 | 74 | )) |
| 75 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) { |
|
| 75 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) { |
|
| 76 | 76 | $form = $event->getForm(); |
| 77 | 77 | $data = $form->getData(); |
| 78 | 78 | |
| 79 | 79 | $ips = preg_split("/\R/", $data['admin_allow_host'], null, PREG_SPLIT_NO_EMPTY); |
| 80 | 80 | |
| 81 | - foreach($ips as $ip) { |
|
| 81 | + foreach ($ips as $ip) { |
|
| 82 | 82 | $errors = $app['validator']->validate($ip, array( |
| 83 | 83 | new Assert\Ip(), |
| 84 | 84 | ) |
| 85 | 85 | ); |
| 86 | 86 | if ($errors->count() != 0) { |
| 87 | - $form['admin_allow_host']->addError(new FormError($ip . 'はIPv4アドレスではありません。')); |
|
| 87 | + $form['admin_allow_host']->addError(new FormError($ip.'はIPv4アドレスではありません。')); |
|
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | }) |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | ))); |
| 115 | 115 | |
| 116 | 116 | $app = $this->app; |
| 117 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
| 117 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
| 118 | 118 | // モーダルからのPOST時に、金額等をセットする. |
| 119 | 119 | if ('modal' === $app['request_stack']->getCurrentRequest()->get('modal')) { |
| 120 | 120 | $data = $event->getData(); |
@@ -131,17 +131,13 @@ discard block |
||
| 131 | 131 | $data['product_name'] = $Product->getName(); |
| 132 | 132 | $data['product_code'] = $ProductClass->getCode(); |
| 133 | 133 | $data['class_name1'] = $ProductClass->hasClassCategory1() ? |
| 134 | - $ProductClass->getClassCategory1()->getClassName() : |
|
| 135 | - null; |
|
| 134 | + $ProductClass->getClassCategory1()->getClassName() : null; |
|
| 136 | 135 | $data['class_name2'] = $ProductClass->hasClassCategory2() ? |
| 137 | - $ProductClass->getClassCategory2()->getClassName() : |
|
| 138 | - null; |
|
| 136 | + $ProductClass->getClassCategory2()->getClassName() : null; |
|
| 139 | 137 | $data['class_category_name1'] = $ProductClass->hasClassCategory1() ? |
| 140 | - $ProductClass->getClassCategory1()->getName() : |
|
| 141 | - null; |
|
| 138 | + $ProductClass->getClassCategory1()->getName() : null; |
|
| 142 | 139 | $data['class_category_name2'] = $ProductClass->hasClassCategory2() ? |
| 143 | - $ProductClass->getClassCategory2()->getName() : |
|
| 144 | - null; |
|
| 140 | + $ProductClass->getClassCategory2()->getName() : null; |
|
| 145 | 141 | $data['tax_rule'] = $TaxRule->getCalcRule()->getId(); |
| 146 | 142 | $data['price'] = $ProductClass->getPrice02(); |
| 147 | 143 | $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity']; |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $app = $this->app; |
| 50 | 50 | |
| 51 | 51 | $builder |
| 52 | - ->addEventListener(FormEvents::PRE_SET_DATA, function ($event) use ($app) { |
|
| 52 | + ->addEventListener(FormEvents::PRE_SET_DATA, function($event) use ($app) { |
|
| 53 | 53 | /** @var \Eccube\Entity\Shipping $data */ |
| 54 | 54 | $data = $event->getData(); |
| 55 | 55 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | 'placeholder' => '指定なし', |
| 103 | 103 | )); |
| 104 | 104 | }) |
| 105 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
| 105 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
| 106 | 106 | /** @var \Eccube\Entity\Shipping $data */ |
| 107 | 107 | $data = $event->getData(); |
| 108 | 108 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | }) |
| 121 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 121 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 122 | 122 | /** @var \Eccube\Entity\Shipping $data */ |
| 123 | 123 | $data = $event->getData(); |
| 124 | 124 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | $builder->setAttribute('tel02_name', $options['tel02_name']); |
| 80 | 80 | $builder->setAttribute('tel03_name', $options['tel03_name']); |
| 81 | 81 | // todo 変 |
| 82 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function ($event) use ($builder) { |
|
| 82 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function($event) use ($builder) { |
|
| 83 | 83 | $form = $event->getForm(); |
| 84 | 84 | $count = 0; |
| 85 | 85 | if ($form[$builder->getName().'01']->getData() != '') { |
@@ -147,19 +147,19 @@ |
||
| 147 | 147 | 'help' => 'メーラーバックエンドがSMTPかつSMTP-AUTH使用時のみ指定', |
| 148 | 148 | 'required' => false, |
| 149 | 149 | )) |
| 150 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) { |
|
| 150 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) { |
|
| 151 | 151 | $form = $event->getForm(); |
| 152 | 152 | $data = $form->getData(); |
| 153 | 153 | |
| 154 | 154 | $ips = preg_split("/\R/", $data['admin_allow_hosts'], null, PREG_SPLIT_NO_EMPTY); |
| 155 | 155 | |
| 156 | - foreach($ips as $ip) { |
|
| 156 | + foreach ($ips as $ip) { |
|
| 157 | 157 | $errors = $app['validator']->validate($ip, array( |
| 158 | 158 | new Assert\Ip(), |
| 159 | 159 | ) |
| 160 | 160 | ); |
| 161 | 161 | if ($errors->count() != 0) { |
| 162 | - $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。')); |
|
| 162 | + $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。')); |
|
| 163 | 163 | } |
| 164 | 164 | } |
| 165 | 165 | }) |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | 'label' => 'パスワード', |
| 95 | 95 | 'required' => false, |
| 96 | 96 | )) |
| 97 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { |
|
| 97 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) { |
|
| 98 | 98 | $form = $event->getForm(); |
| 99 | 99 | $data = $form->getData(); |
| 100 | 100 | try { |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config); |
| 120 | 120 | $conn->connect(); |
| 121 | 121 | } catch (\Exception $e) { |
| 122 | - $form['database']->addError(new FormError('データベースに接続できませんでした。' . $e->getMessage())); |
|
| 122 | + $form['database']->addError(new FormError('データベースに接続できませんでした。'.$e->getMessage())); |
|
| 123 | 123 | } |
| 124 | 124 | }); |
| 125 | 125 | } |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | public function validate($data, ExecutionContext $context, $param = null) |
| 136 | 136 | { |
| 137 | 137 | $parameters = $this->app['request_stack']->getCurrentRequest()->get('install_step4'); |
| 138 | - if ($parameters['database'] != 'pdo_sqlite'){ |
|
| 138 | + if ($parameters['database'] != 'pdo_sqlite') { |
|
| 139 | 139 | $context->getValidator()->validate($data, array( |
| 140 | 140 | new Assert\NotBlank() |
| 141 | 141 | )); |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | namespace Eccube\Form\Type\Install; |
| 26 | 26 | |
| 27 | 27 | use \Symfony\Component\Form\AbstractType; |
| 28 | -use \Symfony\Component\Form\Extension\Core\Type\CheckboxType;; |
|
| 28 | +use \Symfony\Component\Form\Extension\Core\Type\CheckboxType; ; |
|
| 29 | 29 | use \Symfony\Component\Form\FormBuilderInterface; |
| 30 | 30 | use \Symfony\Component\Validator\Constraints as Assert; |
| 31 | 31 | |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | $app['db.migrations.table_name'] = null; |
| 26 | 26 | $app['db.migrations.name'] = null; |
| 27 | 27 | |
| 28 | - $app['dispatcher']->addListener(ConsoleEvents::INIT, function (ConsoleEvent $event) use ($app) { |
|
| 28 | + $app['dispatcher']->addListener(ConsoleEvents::INIT, function(ConsoleEvent $event) use ($app) { |
|
| 29 | 29 | $application = $event->getApplication(); |
| 30 | 30 | |
| 31 | 31 | if (isset($app['orm.em'])) { |
@@ -19,32 +19,32 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | public function addSuccess($message, $namespace = 'front') |
| 21 | 21 | { |
| 22 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message); |
|
| 22 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | public function addError($message, $namespace = 'front') |
| 26 | 26 | { |
| 27 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message); |
|
| 27 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | public function addDanger($message, $namespace = 'front') |
| 31 | 31 | { |
| 32 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message); |
|
| 32 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function addWarning($message, $namespace = 'front') |
| 36 | 36 | { |
| 37 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message); |
|
| 37 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public function addInfo($message, $namespace = 'front') |
| 41 | 41 | { |
| 42 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message); |
|
| 42 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public function addRequestError($message, $namespace = 'front') |
| 46 | 46 | { |
| 47 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message); |
|
| 47 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | public function clearMessage() |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | if (is_null($namespace)) { |
| 64 | 64 | $this['session']->getFlashBag()->set('eccube.login.target.path', $targetPath); |
| 65 | 65 | } else { |
| 66 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.login.target.path', $targetPath); |
|
| 66 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath); |
|
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * @param Response $response |
| 112 | 112 | * @return Application |
| 113 | 113 | */ |
| 114 | - public function forwardChain($path, array $requestParameters = [], Response &$response = null) |
|
| 114 | + public function forwardChain($path, array $requestParameters = [], Response&$response = null) |
|
| 115 | 115 | { |
| 116 | 116 | $response = $this->forward($path, $requestParameters); |
| 117 | 117 | return $this; |