@@ -28,7 +28,6 @@ |
||
| 28 | 28 | use Eccube\Entity\Master\DeviceType; |
| 29 | 29 | use Eccube\Util\Str; |
| 30 | 30 | use Symfony\Component\Filesystem\Filesystem; |
| 31 | -use Symfony\Component\Finder\Finder; |
|
| 32 | 31 | use Symfony\Component\Form\FormError; |
| 33 | 32 | use Symfony\Component\HttpFoundation\Request; |
| 34 | 33 | use Symfony\Component\HttpFoundation\Response; |
@@ -113,13 +113,13 @@ discard block |
||
| 113 | 113 | // ファイル生成・更新 |
| 114 | 114 | $tplDir = $app['config']['block_realdir']; |
| 115 | 115 | |
| 116 | - $filePath = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
| 116 | + $filePath = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
| 117 | 117 | |
| 118 | 118 | $fs = new Filesystem(); |
| 119 | 119 | $fs->dumpFile($filePath, $form->get('block_html')->getData()); |
| 120 | 120 | // 更新でファイル名を変更した場合、以前のファイルを削除 |
| 121 | 121 | if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) { |
| 122 | - $oldFilePath = $tplDir . $previous_filename; |
|
| 122 | + $oldFilePath = $tplDir.$previous_filename; |
|
| 123 | 123 | if ($fs->exists($oldFilePath)) { |
| 124 | 124 | $fs->remove($oldFilePath); |
| 125 | 125 | } |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る |
| 172 | 172 | if ($Block->getDeletableFlg() > 0) { |
| 173 | 173 | $tplDir = $app['config']['block_realdir']; |
| 174 | - $file = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
| 174 | + $file = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
| 175 | 175 | $fs = new Filesystem(); |
| 176 | 176 | if ($fs->exists($file)) { |
| 177 | 177 | $fs->remove($file); |
@@ -36,6 +36,9 @@ |
||
| 36 | 36 | { |
| 37 | 37 | protected $app; |
| 38 | 38 | |
| 39 | + /** |
|
| 40 | + * @param \Silex\Application $app |
|
| 41 | + */ |
|
| 39 | 42 | public function __construct($app) |
| 40 | 43 | { |
| 41 | 44 | $this->app = $app; |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | '\Eccube\Entity\Customer' |
| 235 | 235 | ))); |
| 236 | 236 | |
| 237 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($BaseInfo) { |
|
| 237 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($BaseInfo) { |
|
| 238 | 238 | |
| 239 | 239 | if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
| 240 | 240 | |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | } |
| 275 | 275 | |
| 276 | 276 | }); |
| 277 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 277 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 278 | 278 | $form = $event->getForm(); |
| 279 | 279 | $orderDetails = $form['OrderDetails']->getData(); |
| 280 | 280 | if (empty($orderDetails) || count($orderDetails) < 1) { |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | ))); |
| 92 | 92 | |
| 93 | 93 | $app = $this->app; |
| 94 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
| 94 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
| 95 | 95 | // モーダルからのPOST時に、金額等をセットする. |
| 96 | 96 | if ('modal' === $app['request']->get('modal')) { |
| 97 | 97 | $data = $event->getData(); |
@@ -38,14 +38,14 @@ |
||
| 38 | 38 | */ |
| 39 | 39 | public function buildForm(FormBuilderInterface $builder, array $options) |
| 40 | 40 | { |
| 41 | - $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
| 41 | + $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) { |
|
| 42 | 42 | $options = $event->getForm()->getConfig()->getOptions(); |
| 43 | 43 | if (!$event->getData()) { |
| 44 | 44 | $data = current(array_keys($options['choice_list']->getValues())); |
| 45 | 45 | $event->setData($data); |
| 46 | 46 | } |
| 47 | 47 | }); |
| 48 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
| 48 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
| 49 | 49 | $options = $event->getForm()->getConfig()->getOptions(); |
| 50 | 50 | $values = $options['choice_list']->getValues(); |
| 51 | 51 | if (!in_array($event->getData(), $values)) { |
@@ -38,14 +38,14 @@ |
||
| 38 | 38 | */ |
| 39 | 39 | public function buildForm(FormBuilderInterface $builder, array $options) |
| 40 | 40 | { |
| 41 | - $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
| 41 | + $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) { |
|
| 42 | 42 | $options = $event->getForm()->getConfig()->getOptions(); |
| 43 | 43 | if (!$event->getData()) { |
| 44 | 44 | $data = current(array_keys($options['choice_list']->getValues())); |
| 45 | 45 | $event->setData($data); |
| 46 | 46 | } |
| 47 | 47 | }); |
| 48 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
| 48 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
| 49 | 49 | $options = $event->getForm()->getConfig()->getOptions(); |
| 50 | 50 | $values = $options['choice_list']->getValues(); |
| 51 | 51 | if (!in_array($event->getData(), $values)) { |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | $builder->add('category_id', 'entity', array( |
| 43 | 43 | 'class' => 'Eccube\Entity\Category', |
| 44 | 44 | 'property' => 'NameWithLevel', |
| 45 | - 'query_builder' => function (EntityRepository $er) { |
|
| 45 | + 'query_builder' => function(EntityRepository $er) { |
|
| 46 | 46 | return $er |
| 47 | 47 | ->createQueryBuilder('c') |
| 48 | 48 | ->orderBy('c.rank', 'DESC'); |
@@ -257,7 +257,7 @@ |
||
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | foreach ($readPaths as $readPath) { |
| 260 | - $filePath = $readPath . '/' . $fileName . '.twig'; |
|
| 260 | + $filePath = $readPath.'/'.$fileName.'.twig'; |
|
| 261 | 261 | $fs = new Filesystem(); |
| 262 | 262 | if ($fs->exists($filePath)) { |
| 263 | 263 | return array( |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | 'label' => '拒否URL', |
| 60 | 60 | 'required' => false, |
| 61 | 61 | )) |
| 62 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 62 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 63 | 63 | $form = $event->getForm(); |
| 64 | 64 | |
| 65 | 65 | $Authority = $form['Authority']->getData(); |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | |
| 37 | 37 | public function __construct(Application $app) |
| 38 | 38 | { |
| 39 | - $this->app = $app; |
|
| 39 | + $this->app = $app; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | public function supportsAttribute($attribute) |