EC-CUBE / ec-cube

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

Spacing +7 added lines, -7 removed lines

@@ -149,7 +149,7 @@ 
                 'format' => 'yyyy-MM-dd',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($BaseInfo) {
+            ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($BaseInfo) {
                 if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
                     $form = $event->getForm();
                     $form->add('ShipmentItems', CollectionType::class, array(
@@ -160,7 +160,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 */
@@ -179,7 +179,7 @@ 
                     'choice_label' => 'delivery_time',
                     'placeholder' => '指定なし',
                     'required' => false,
-                    'query_builder' => function (EntityRepository $er) use($Delivery) {
+                    'query_builder' => function(EntityRepository $er) use($Delivery) {
                         return $er->createQueryBuilder('dt')
                             ->where('dt.Delivery = :Delivery')
                             ->setParameter('Delivery', $Delivery);
@@ -187,7 +187,7 @@ 
                 ));
 
             })
-            ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+            ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
                 $data = $event->getData();
                 $form = $event->getForm();
                 if (!$data) {
@@ -207,14 +207,14 @@ 
                     'choice_label' => 'delivery_time',
                     'placeholder' => '指定なし',
                     'required' => false,
-                    'query_builder' => function (EntityRepository $er) use($Delivery) {
+                    'query_builder' => function(EntityRepository $er) use($Delivery) {
                         return $er->createQueryBuilder('dt')
                             ->where('dt.Delivery = :Delivery')
                             ->setParameter('Delivery', $Delivery);
                     },
                 ));
             })
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) {
                 if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
                     $form = $event->getForm();
                     $shipmentItems = $form['ShipmentItems']->getData();
@@ -225,7 +225,7 @@ 
                     }
                 }
             })
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) {
                 $Shipping = $event->getData();
                 $Delivery = $Shipping->getDelivery();
                 $Shipping->setShippingDeliveryName($Delivery ? $Delivery : null);

app/Eccube/Controller/AController.php

Unused Use Statements -5 removed lines

@@ -2,14 +2,9 @@
 namespace Eccube2\Controller;
 
 use Eccube\Application;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\ParameterBag;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 
 /**
  * @Route("/test")

src/Eccube/Controller/ShoppingController.php

Unused Use Statements -2 removed lines

@@ -43,9 +43,7 @@
 use Symfony\Component\Validator\Constraints as Assert;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 
 /**
  * @Route("/shopping")

Spacing +1 added lines, -1 removed lines

@@ -1336,7 +1336,7 @@
                 // ステータス履歴も保持しておく？ 在庫引き当ての仕様もセットで。
                 if ($dispatcher instanceof Response
                     && ($dispatcher->isRedirection() || $dispatcher->getContent())) { // $paymentMethod->apply() が Response を返した場合は画面遷移
-                    return $dispatcher;                // 画面遷移したいパターンが複数ある場合はどうする？ 引数で制御？
+                    return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする？ 引数で制御？
                 }
                 $PaymentResult = $paymentService->doCheckout($paymentMethod); // 決済実行
                 if (!$PaymentResult->isSuccess()) {

src/Eccube/ServiceProvider/DebugServiceProvider.php

Unused Use Statements -2 removed lines

@@ -24,12 +24,10 @@
 
 namespace Eccube\ServiceProvider;
 
-use Eccube\Common\Constant;
 use Eccube\DataCollector\EccubeDataCollector;
 use Silex\Application;
 use Silex\Api\BootableProviderInterface;
 use Symfony\Bridge\Twig\Extension\DumpExtension;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
 use Symfony\Component\HttpKernel\EventListener\DumpListener;
 use Symfony\Component\VarDumper\Cloner\VarCloner;

Spacing +12 added lines, -12 removed lines

@@ -71,7 +71,7 @@ 
 {
     public function register(Container $app)
     {
-        $app['var_dumper.cloner'] = function ($app) {
+        $app['var_dumper.cloner'] = function($app) {
             $cloner = new VarCloner();
 
             if (isset($app['debug.max_items'])) {
@@ -85,37 +85,37 @@ 
             return $cloner;
         };
 
-        $app->extend('data_collector.templates', function ($templates) {
+        $app->extend('data_collector.templates', function($templates) {
             return array_merge($templates, array(array('dump', '@Debug/Profiler/dump.html.twig')));
         });
 
-        $app['data_collector.dump'] = function ($app) {
+        $app['data_collector.dump'] = function($app) {
             return new DumpDataCollector($app['stopwatch'], $app['code.file_link_format']);
         };
 
-        $app->extend('data_collectors', function ($collectors, $app) {
-            $collectors['dump'] = function ($app) {
+        $app->extend('data_collectors', function($collectors, $app) {
+            $collectors['dump'] = function($app) {
                 return $app['data_collector.dump'];
             };
 
-            $collectors['eccube'] = function ($app) {
+            $collectors['eccube'] = function($app) {
                 return new EccubeDataCollector($app);
             };
             return $collectors;
         });
 
-        $app->extend('data_collector.templates', function ($templates, $app) {
+        $app->extend('data_collector.templates', function($templates, $app) {
                 array_unshift($templates, ['eccube', '@EccubeProfiler/eccube.html.twig']);
                 return $templates;
             }
         );
 
-        $app->extend('twig.loader.filesystem', function ($filesystem, $app) {
+        $app->extend('twig.loader.filesystem', function($filesystem, $app) {
                 return $filesystem;
             }
         );
 
-        $app->extend('twig', function ($twig, $app) {
+        $app->extend('twig', function($twig, $app) {
             if (class_exists('\Symfony\Bridge\Twig\Extension\DumpExtension')) {
                 $twig->addExtension(new DumpExtension($app['var_dumper.cloner']));
             }
@@ -123,14 +123,14 @@ 
             return $twig;
         });
 
-        $app->extend('twig.loader.filesystem', function ($loader, $app) {
+        $app->extend('twig.loader.filesystem', function($loader, $app) {
             $loader->addPath($app['debug.templates_path'], 'Debug');
             $loader->addPath(__DIR__.'/../Resource/template/toolbar', 'EccubeProfiler');
 
             return $loader;
         });
 
-        $app['debug.templates_path'] = function () {
+        $app['debug.templates_path'] = function() {
             $r = new \ReflectionClass('Symfony\Bundle\DebugBundle\DependencyInjection\Configuration');
 
             return dirname(dirname($r->getFileName())).'/Resources/views';
@@ -142,7 +142,7 @@ 
         // This code is here to lazy load the dump stack. This default
         // configuration for CLI mode is overridden in HTTP mode on
         // 'kernel.request' event
-        VarDumper::setHandler(function ($var) use ($app) {
+        VarDumper::setHandler(function($var) use ($app) {
             $dumper = new CliDumper();
             $dumper->dump($app['var_dumper.cloner']->cloneVar($var));
         });

src/Eccube/Controller/Admin/Setting/System/SystemController.php

Indentation +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
 
                 return $phpinfo;
 
-               break;
+                break;
             default:
                 break;
         }
@@ -53,8 +53,8 @@ 
         ));
     }
 
-     public function getSystemInfo(Application $app, Request $request)
-     {
+        public function getSystemInfo(Application $app, Request $request)
+        {
         $system = $app['eccube.service.system'];
 
         $arrSystemInfo = array(
@@ -69,5 +69,5 @@ 
         $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $request->headers->get('User-Agent'));
 
         return $arrSystemInfo;
-     }
+        }
 }

Spacing +5 added lines, -5 removed lines

@@ -58,13 +58,13 @@
         $system = $app['eccube.service.system'];
 
         $arrSystemInfo = array(
-            array('title' => 'EC-CUBE',     'value' => Constant::VERSION),
-            array('title' => 'サーバーOS',    'value' => php_uname()),
-            array('title' => 'DBサーバー',    'value' => $system->getDbversion()),
-            array('title' => 'WEBサーバー',   'value' => $request->server->get("SERVER_SOFTWARE")),
+            array('title' => 'EC-CUBE', 'value' => Constant::VERSION),
+            array('title' => 'サーバーOS', 'value' => php_uname()),
+            array('title' => 'DBサーバー', 'value' => $system->getDbversion()),
+            array('title' => 'WEBサーバー', 'value' => $request->server->get("SERVER_SOFTWARE")),
         );
 
-        $value = phpversion() . ' (' . implode(', ', get_loaded_extensions()) . ')';
+        $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')';
         $arrSystemInfo[] = array('title' => 'PHP', 'value' => $value);
         $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $request->headers->get('User-Agent'));
 

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 */