EC-CUBE / ec-cube

src/Eccube/Form/Type/Admin/ShipmentItemType.php

Spacing +5 added lines, -9 removed lines

@@ -96,7 +96,7 @@ 
                 )));
 
         $app = $this->app;
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
             // モーダルからのPOST時に、金額等をセットする.
             if ('modal' === $app['request_stack']->getCurrentRequest()->get('modal')) {
                 $data = $event->getData();
@@ -111,17 +111,13 @@ 
                     $data['product_name'] = $Product->getName();
                     $data['product_code'] = $ProductClass->getCode();
                     $data['class_name1'] = $ProductClass->hasClassCategory1() ?
-                        $ProductClass->getClassCategory1()->getClassName() :
-                        null;
+                        $ProductClass->getClassCategory1()->getClassName() : null;
                     $data['class_name2'] = $ProductClass->hasClassCategory2() ?
-                        $ProductClass->getClassCategory2()->getClassName() :
-                        null;
+                        $ProductClass->getClassCategory2()->getClassName() : null;
                     $data['class_category_name1'] = $ProductClass->hasClassCategory1() ?
-                        $ProductClass->getClassCategory1()->getName() :
-                        null;
+                        $ProductClass->getClassCategory1()->getName() : null;
                     $data['class_category_name2'] = $ProductClass->hasClassCategory2() ?
-                        $ProductClass->getClassCategory2()->getName() :
-                        null;
+                        $ProductClass->getClassCategory2()->getName() : null;
                     $data['price'] = $ProductClass->getPrice02();
                     $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];
                     $event->setData($data);

src/Eccube/Form/Type/ShippingMultipleItemType.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
                     new Assert\Regex(array('pattern' => '/^\d+$/')),
                 ),
             ))
-            ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($app) {
+            ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($app) {
                 $form = $event->getForm();
 
                 if ($app->isGranted('IS_AUTHENTICATED_FULLY')) {
@@ -75,7 +75,7 @@ 
                     $form->add('customer_address', EntityType::class, array(
                         'class' => 'Eccube\Entity\CustomerAddress',
                         'choice_label' => 'shippingMultipleDefaultName',
-                        'query_builder' => function (EntityRepository $er) use ($Customer) {
+                        'query_builder' => function(EntityRepository $er) use ($Customer) {
                             return $er->createQueryBuilder('ca')
                                 ->where('ca.Customer = :Customer')
                                 ->orderBy("ca.id", "ASC")
@@ -107,7 +107,7 @@ 
                     }
                 }
             })
-            ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
+            ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) {
                 /** @var \Eccube\Entity\Shipping $data */
                 $data = $event->getData();
                 /** @var \Symfony\Component\Form\Form $form */

src/Eccube/Controller/AbstractController.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         @trigger_error('The '.__METHOD__.' method is deprecated.', E_USER_DEPRECATED);
 
         $form = $app['form.factory']
-            ->createBuilder($app['eccube.form.type.' . $type], $app['eccube.entity.' . $type])
+            ->createBuilder($app['eccube.form.type.'.$type], $app['eccube.entity.'.$type])
             ->getForm();
         $form->handleRequest($app['request_stack']->getCurrentRequest());
 

src/Eccube/Form/Type/Master/ProductListMaxType.php

Spacing +2 added lines, -2 removed lines

@@ -38,14 +38,14 @@
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
             $options = $event->getForm()->getConfig()->getOptions();
             if (!$event->getData()) {
                 $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues()));
                 $event->setData($data);
             }
         });
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
             $options = $event->getForm()->getConfig()->getOptions();
             $values = $options['choice_loader']->loadChoiceList()->getValues();
             if (!in_array($event->getData(), $values)) {

src/Eccube/Form/Type/Master/ProductListOrderByType.php

Spacing +2 added lines, -2 removed lines

@@ -38,14 +38,14 @@
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-         $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+         $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
              $options = $event->getForm()->getConfig()->getOptions();
              if (!$event->getData()) {
                  $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues()));
                  $event->setData($data);
              }
          });
-         $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+         $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
              $options = $event->getForm()->getConfig()->getOptions();
              $values = $options['choice_loader']->loadChoiceList()->getValues();
              if (!in_array($event->getData(), $values)) {

src/Eccube/Form/Type/MasterType.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
             'expanded' => false,
             'required' => false,
             'placeholder' => false,
-            'query_builder' => function (EntityRepository $er) {
+            'query_builder' => function(EntityRepository $er) {
                 return $er->createQueryBuilder('m')
                     ->orderBy('m.rank', 'ASC');
             },

src/Eccube/Form/Type/Master/PageMaxType.php

Spacing +2 added lines, -2 removed lines

@@ -38,14 +38,14 @@
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
             $options = $event->getForm()->getConfig()->getOptions();
             if (!$event->getData()) {
                 $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues()));
                 $event->setData($data);
             }
         });
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
             $options = $event->getForm()->getConfig()->getOptions();
             $values = $options['choice_loader']->loadChoiceList()->getValues();
             if (!in_array($event->getData(), $values)) {

src/Eccube/Routing/EccubeRouter.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
     public function setRequireHttps($requireHttps)
     {
-        $this->requireHttps = (bool)$requireHttps;
+        $this->requireHttps = (bool) $requireHttps;
     }
 
     public function setAdminPrefix($adminPrefix)

src/Eccube/Controller/Admin/Product/ProductController.php

Spacing +14 added lines, -14 removed lines

@@ -203,7 +203,7 @@ 
                     }
 
                     $extension = $image->getClientOriginalExtension();
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     $image->move($app['config']['image_temp_realdir'], $filename);
                     $files[] = $filename;
                 }
@@ -279,7 +279,7 @@ 
         $form = $builder->getForm();
 
         if (!$has_class) {
-            $ProductClass->setStockUnlimited((boolean)$ProductClass->getStockUnlimited());
+            $ProductClass->setStockUnlimited((boolean) $ProductClass->getStockUnlimited());
             $form['class']->setData($ProductClass);
         }
 
@@ -365,8 +365,8 @@ 
                 $Categories = $form->get('Category')->getData();
                 $categoriesIdList = array();
                 foreach ($Categories as $Category) {
-                    foreach($Category->getPath() as $ParentCategory){
-                        if (!isset($categoriesIdList[$ParentCategory->getId()])){
+                    foreach ($Category->getPath() as $ParentCategory) {
+                        if (!isset($categoriesIdList[$ParentCategory->getId()])) {
                             $ProductCategory = $this->createProductCategory($Product, $ParentCategory, $count);
                             $app['orm.em']->persist($ProductCategory);
                             $count++;
@@ -375,7 +375,7 @@ 
                             $categoriesIdList[$ParentCategory->getId()] = true;
                         }
                     }
-                    if (!isset($categoriesIdList[$Category->getId()])){
+                    if (!isset($categoriesIdList[$Category->getId()])) {
                         $ProductCategory = $this->createProductCategory($Product, $Category, $count);
                         $app['orm.em']->persist($ProductCategory);
                         $count++;
@@ -397,7 +397,7 @@ 
                     $app['orm.em']->persist($ProductImage);
 
                     // 移動
-                    $file = new File($app['config']['image_temp_realdir'] . '/' . $add_image);
+                    $file = new File($app['config']['image_temp_realdir'].'/'.$add_image);
                     $file->move($app['config']['image_save_realdir']);
                 }
 
@@ -417,7 +417,7 @@ 
 
                     // 削除
                     $fs = new Filesystem();
-                    $fs->remove($app['config']['image_save_realdir'] . '/' . $delete_image);
+                    $fs->remove($app['config']['image_save_realdir'].'/'.$delete_image);
                 }
                 $app['orm.em']->persist($Product);
                 $app['orm.em']->flush();
@@ -577,7 +577,7 @@ 
                 foreach ($deleteImages as $deleteImage) {
                     try {
                         $fs = new Filesystem();
-                        $fs->remove($app['config']['image_save_realdir'] . '/' . $deleteImage);
+                        $fs->remove($app['config']['image_save_realdir'].'/'.$deleteImage);
                     } catch (\Exception $e) {
                         // エラーが発生しても無視する
                     }
@@ -647,10 +647,10 @@ 
 
                     // 画像ファイルを新規作成
                     $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION);
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     try {
                         $fs = new Filesystem();
-                        $fs->copy($app['config']['image_save_realdir'] . '/' . $Image->getFileName(), $app['config']['image_save_realdir'] . '/' . $filename);
+                        $fs->copy($app['config']['image_save_realdir'].'/'.$Image->getFileName(), $app['config']['image_save_realdir'].'/'.$filename);
                     } catch (\Exception $e) {
                         // エラーが発生しても無視する
                     }
@@ -725,7 +725,7 @@ 
         $em->getConfiguration()->setSQLLogger(null);
 
         $response = new StreamedResponse();
-        $response->setCallback(function () use ($app, $request) {
+        $response->setCallback(function() use ($app, $request) {
 
             // CSV種別を元に初期化.
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_PRODUCT);
@@ -765,7 +765,7 @@ 
             // データ行の出力.
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
 
-            $app['eccube.service.csv.export']->exportData(function ($entity, CsvExportService $csvService) use ($app, $request) {
+            $app['eccube.service.csv.export']->exportData(function($entity, CsvExportService $csvService) use ($app, $request) {
                 $Csvs = $csvService->getCsvs();
 
                 /** @var $Product \Eccube\Entity\Product */
@@ -808,9 +808,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'product_' . $now->format('YmdHis') . '.csv';
+        $filename = 'product_'.$now->format('YmdHis').'.csv';
         $response->headers->set('Content-Type', 'application/octet-stream');
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
         $response->send();
 
         log_info('商品CSV出力ファイル名', array($filename));