EC-CUBE / ec-cube

src/Eccube/ServiceProvider/DiServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 {
     public function register(Container $app)
     {
-        $app['eccube.di'] = function (Container $app) {
+        $app['eccube.di'] = function(Container $app) {
             $di = new Di(
                 $app['eccube.di.dirs'],
                 $app['eccube.di.annotation_reader'],
@@ -25,7 +25,7 @@ 
             return $di;
         };
 
-        $app['eccube.di.generator'] = function (Container $app) {
+        $app['eccube.di.generator'] = function(Container $app) {
             $generator = new ProviderGenerator(
                 $app['eccube.di.generator.dir'],
                 $app['eccube.di.generator.class']

src/Eccube/ServiceProvider/CompatRepositoryProvider.php

Spacing +52 added lines, -52 removed lines

@@ -11,163 +11,163 @@
     public function register(Container $app)
     {
         // Repository
-        $app['eccube.repository.master.authority'] = function () use ($app) {
+        $app['eccube.repository.master.authority'] = function() use ($app) {
             return $app['Eccube\Repository\Master\AuthorityRepository'];
         };
-        $app['eccube.repository.master.tag'] = function () use ($app) {
+        $app['eccube.repository.master.tag'] = function() use ($app) {
             return $app['Eccube\Repository\Master\TagRepository'];
         };
-        $app['eccube.repository.master.pref'] = function () use ($app) {
+        $app['eccube.repository.master.pref'] = function() use ($app) {
             return $app['Eccube\Repository\Master\PrefRepository'];
         };
-        $app['eccube.repository.master.sex'] = function () use ($app) {
+        $app['eccube.repository.master.sex'] = function() use ($app) {
             return $app['Eccube\Repository\Master\SexRepository'];
         };
-        $app['eccube.repository.master.disp'] = function () use ($app) {
+        $app['eccube.repository.master.disp'] = function() use ($app) {
             return $app['Eccube\Repository\Master\DispRepository'];
         };
-        $app['eccube.repository.master.product_type'] = function () use ($app) {
+        $app['eccube.repository.master.product_type'] = function() use ($app) {
             return $app['Eccube\Repository\Master\ProductTypeRepository'];
         };
-        $app['eccube.repository.master.page_max'] = function () use ($app) {
+        $app['eccube.repository.master.page_max'] = function() use ($app) {
             return $app['Eccube\Repository\Master\PageMaxRepository'];
         };
-        $app['eccube.repository.master.order_status'] = function () use ($app) {
+        $app['eccube.repository.master.order_status'] = function() use ($app) {
             return $app['Eccube\Repository\Master\OrderStatusRepository'];
         };
-        $app['eccube.repository.master.product_list_max'] = function () use ($app) {
+        $app['eccube.repository.master.product_list_max'] = function() use ($app) {
             return $app['Eccube\Repository\Master\ProductListMaxRepository'];
         };
-        $app['eccube.repository.master.product_list_order_by'] = function () use ($app) {
+        $app['eccube.repository.master.product_list_order_by'] = function() use ($app) {
             return $app['Eccube\Repository\Master\ProductListOrderByRepository'];
         };
-        $app['eccube.repository.master.device_type'] = function () use ($app) {
+        $app['eccube.repository.master.device_type'] = function() use ($app) {
             return $app['Eccube\Repository\Master\DeviceTypeRepository'];
         };
-        $app['eccube.repository.master.csv_type'] = function () use ($app) {
+        $app['eccube.repository.master.csv_type'] = function() use ($app) {
             return $app['Eccube\Repository\Master\CsvTypeRepository'];
         };
-        $app['eccube.repository.master.order_item_type'] = function () use ($app) {
+        $app['eccube.repository.master.order_item_type'] = function() use ($app) {
             return $app['Eccube\Repository\Master\OrderItemTypeRepository'];
         };
-        $app['eccube.repository.base_info'] = function () use ($app) {
+        $app['eccube.repository.base_info'] = function() use ($app) {
             return $app['Eccube\Repository\BaseInfoRepository'];
         };
-        $app['eccube.repository.delivery'] = function () use ($app) {
+        $app['eccube.repository.delivery'] = function() use ($app) {
             return $app['Eccube\Repository\DeliveryRepository'];
         };
-        $app['eccube.repository.delivery_date'] = function () use ($app) {
+        $app['eccube.repository.delivery_date'] = function() use ($app) {
             return $app['Eccube\Repository\DeliveryDateRepository'];
         };
-        $app['eccube.repository.delivery_fee'] = function () use ($app) {
+        $app['eccube.repository.delivery_fee'] = function() use ($app) {
             return $app['Eccube\Repository\DeliveryFeeRepository'];
         };
-        $app['eccube.repository.delivery_time'] = function () use ($app) {
+        $app['eccube.repository.delivery_time'] = function() use ($app) {
             return $app['Eccube\Repository\DeliveryTimeRepository'];
         };
-        $app['eccube.repository.payment'] = function () use ($app) {
+        $app['eccube.repository.payment'] = function() use ($app) {
             return $app['Eccube\Repository\PaymentRepository'];
         };
-        $app['eccube.repository.payment_option'] = function () use ($app) {
+        $app['eccube.repository.payment_option'] = function() use ($app) {
             return $app['Eccube\Repository\PaymentOptionRepository'];
         };
-        $app['eccube.repository.customer'] = function () use ($app) {
+        $app['eccube.repository.customer'] = function() use ($app) {
             return $app['Eccube\Repository\CustomerRepository'];
         };
-        $app['eccube.repository.news'] = function () use ($app) {
+        $app['eccube.repository.news'] = function() use ($app) {
             return $app['Eccube\Repository\NewsRepository'];
         };
-        $app['eccube.repository.mail_history'] = function () use ($app) {
+        $app['eccube.repository.mail_history'] = function() use ($app) {
             return $app['Eccube\Repository\MailHistoryRepository'];
         };
-        $app['eccube.repository.member'] = function () use ($app) {
+        $app['eccube.repository.member'] = function() use ($app) {
             return $app['Eccube\Repository\MemberRepository'];
         };
-        $app['eccube.repository.order'] = function () use ($app) {
+        $app['eccube.repository.order'] = function() use ($app) {
             return $app['Eccube\Repository\OrderRepository'];
         };
-        $app['eccube.repository.product'] = function () use ($app) {
+        $app['eccube.repository.product'] = function() use ($app) {
             return $app['Eccube\Repository\ProductRepository'];
         };
-        $app['eccube.repository.product_image'] = function () use ($app) {
+        $app['eccube.repository.product_image'] = function() use ($app) {
             return $app['Eccube\Repository\ProductImageRepository'];
         };
-        $app['eccube.repository.product_class'] = function () use ($app) {
+        $app['eccube.repository.product_class'] = function() use ($app) {
             return $app['Eccube\Repository\ProductClassRepository'];
         };
-        $app['eccube.repository.product_stock'] = function () use ($app) {
+        $app['eccube.repository.product_stock'] = function() use ($app) {
             return $app['Eccube\Repository\ProductStockRepository'];
         };
-        $app['eccube.repository.product_tag'] = function () use ($app) {
+        $app['eccube.repository.product_tag'] = function() use ($app) {
             return $app['Eccube\Repository\ProductTagRepository'];
         };
-        $app['eccube.repository.class_name'] = function () use ($app) {
+        $app['eccube.repository.class_name'] = function() use ($app) {
             return $app['Eccube\Repository\ClassNameRepository'];
         };
-        $app['eccube.repository.class_category'] = function () use ($app) {
+        $app['eccube.repository.class_category'] = function() use ($app) {
             return $app['Eccube\Repository\ClassCategoryRepository'];
         };
-        $app['eccube.repository.customer_favorite_product'] = function () use ($app) {
+        $app['eccube.repository.customer_favorite_product'] = function() use ($app) {
             return $app['Eccube\Repository\CustomerFavoriteProductRepository'];
         };
-        $app['eccube.repository.tax_rule'] = function () use ($app) {
+        $app['eccube.repository.tax_rule'] = function() use ($app) {
             return $app['Eccube\Repository\TaxRuleRepository'];
         };
-        $app['eccube.repository.page_layout'] = function () use ($app) {
+        $app['eccube.repository.page_layout'] = function() use ($app) {
             return $app['Eccube\Repository\PageLayoutRepository'];
         };
-        $app['eccube.repository.block'] = function () use ($app) {
+        $app['eccube.repository.block'] = function() use ($app) {
             return $app['Eccube\Repository\BlockRepository'];
         };
-        $app['eccube.repository.order'] = function () use ($app) {
+        $app['eccube.repository.order'] = function() use ($app) {
             return $app['Eccube\Repository\OrderRepository'];
         };
-        $app['eccube.repository.customer_address'] = function () use ($app) {
+        $app['eccube.repository.customer_address'] = function() use ($app) {
             return $app['Eccube\Repository\CustomerAddressRepository'];
         };
-        $app['eccube.repository.shipping'] = function () use ($app) {
+        $app['eccube.repository.shipping'] = function() use ($app) {
             return $app['Eccube\Repository\ShippingRepository'];
         };
-        $app['eccube.repository.shipment_item'] = function () use ($app) {
+        $app['eccube.repository.shipment_item'] = function() use ($app) {
             return $app['Eccube\Repository\ShipmentItemRepository'];
         };
-        $app['eccube.repository.master.customer_status'] = function () use ($app) {
+        $app['eccube.repository.master.customer_status'] = function() use ($app) {
             return $app['Eccube\Repository\Master\CustomerStatusRepository'];
         };
 
-        $app['eccube.repository.mail_template'] = function () use ($app) {
+        $app['eccube.repository.mail_template'] = function() use ($app) {
             return $app['Eccube\Repository\MailTemplateRepository'];
         };
-        $app['eccube.repository.csv'] = function () use ($app) {
+        $app['eccube.repository.csv'] = function() use ($app) {
             return $app['Eccube\Repository\CsvRepository'];
         };
-        $app['eccube.repository.template'] = function () use ($app) {
+        $app['eccube.repository.template'] = function() use ($app) {
             return $app['Eccube\Repository\TemplateRepository'];
         };
-        $app['eccube.repository.authority_role'] = function () use ($app) {
+        $app['eccube.repository.authority_role'] = function() use ($app) {
             return $app['Eccube\Repository\AuthorityRoleRepository'];
         };
-        $app['eccube.repository.category'] = function () use ($app) {
+        $app['eccube.repository.category'] = function() use ($app) {
             return $app['Eccube\Repository\CategoryRepository'];
         };
-        $app['eccube.repository.help'] = function () use ($app) {
+        $app['eccube.repository.help'] = function() use ($app) {
             return $app['Eccube\Repository\HelpRepository'];
         };
-        $app['eccube.repository.plugin'] = function () use ($app) {
+        $app['eccube.repository.plugin'] = function() use ($app) {
             return $app['Eccube\Repository\PluginRepository'];
         };
-        $app['eccube.repository.plugin_event_handler'] = function () use ($app) {
+        $app['eccube.repository.plugin_event_handler'] = function() use ($app) {
             return $app['Eccube\Repository\PluginEventHandlerRepository'];
         };
-        $app['eccube.repository.layout'] = function () use ($app) {
+        $app['eccube.repository.layout'] = function() use ($app) {
             return $app['Eccube\Repository\LayoutRepository'];
         };
 
         // alias
-        $app['eccube.repository.order_status'] = function () use ($app) {
+        $app['eccube.repository.order_status'] = function() use ($app) {
             return $app['Eccube\Repository\Master\OrderStatusRepository'];
         };
-        $app['eccube.repository.customer_status'] = function () use ($app) {
+        $app['eccube.repository.customer_status'] = function() use ($app) {
             return $app['Eccube\Repository\Master\CustomerStatusRepository'];
         };
     }

eccube_install.php

Spacing +14 added lines, -15 removed lines

@@ -31,7 +31,7 @@ 
 out('EC-CUBE3 installer use database driver of ', null, false);
 
 $database_driver = 'pdo_sqlite';
-switch($argv[1]) {
+switch ($argv[1]) {
     case 'mysql':
         $database_driver = 'pdo_mysql';
         break;
@@ -166,8 +166,7 @@ 
     putenv('MAIL_PASS='.(getenv('MAIL_PASS') ? getenv('MAIL_PASS') : null));
     putenv('ADMIN_ROUTE='.(getenv('ADMIN_ROUTE') ? getenv('ADMIN_ROUTE') : 'admin'));
     putenv('ROOT_URLPATH='.(getenv('ROOT_URLPATH') ? getenv('ROOT_URLPATH') : null));
-    putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') :
-                          substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32)));
+    putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') : substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32)));
 }
 
 function getExampleVariables()
@@ -277,7 +276,7 @@ 
 {
     $app = \Eccube\Application::getInstance();
     $app['debug'] = true;
-    $app['annotations'] = function () {
+    $app['annotations'] = function() {
         return new \Doctrine\Common\Annotations\AnnotationReader();
     };
     $app->initDoctrine();
@@ -389,15 +388,15 @@ 
     foreach ($finder as $content) {
         $permission = $content->getPerms();
         // see also http://www.php.net/fileperms
-        if (!($permission & 0x0010) || !($permission & 0x0002)) {
+        if (!($permission&0x0010) || !($permission&0x0002)) {
             $realPath = $content->getRealPath();
             if ($verbose) {
                 out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false);
             }
-            $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r
-            $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w
-            $permission = !($permission & 0x0004) ? $permission += 04 : $permission;  // o+r
-            $permission = !($permission & 0x0002) ? $permission += 02 : $permission;  // o+w
+            $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r
+            $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w
+            $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r
+            $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w
             $result = chmod($realPath, $permission);
             if ($verbose) {
                 if ($result) {
@@ -428,13 +427,13 @@ 
 
 function getConfig()
 {
-    $config = array (
+    $config = array(
         'auth_magic' => getenv('AUTH_MAGIC'),
         'password_hash_algos' => 'sha256',
         'shop_name' => getenv('SHOP_NAME'),
         'force_ssl' => NULL,
         'admin_allow_host' =>
-        array (
+        array(
         ),
         'cookie_lifetime' => 0,
         'locale' => 'ja',
@@ -447,9 +446,9 @@ 
 
 function getDatabaseConfig($database_driver)
 {
-    $database = array (
+    $database = array(
         'database' =>
-        array (
+        array(
             'driver' => $database_driver,
         )
     );
@@ -476,9 +475,9 @@ 
 
 function getMailConfig()
 {
-    $mail = array (
+    $mail = array(
         'mail' =>
-        array (
+        array(
             'transport' => getenv('MAIL_BACKEND'),
             'host' => getenv('MAIL_HOST'),
             'port' => getenv('MAIL_PORT'),

src/Eccube/ServiceProvider/TwigLintServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
             );
         }
 
-        $app[TwigLintValidator::class] = function (Container $app) {
+        $app[TwigLintValidator::class] = function(Container $app) {
             return new TwigLintValidator($app['twig']);
         };
 

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

Spacing +9 added lines, -11 removed lines

@@ -252,7 +252,7 @@ 
         /**
          * 複数配送オプション有効時の画面制御を行う.
          */
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
 
             if ($this->BaseInfo->getOptionMultipleShipping() != Constant::ENABLED) {
                 return;
@@ -262,17 +262,16 @@ 
             $orderDetails = &$data['OrderDetails'];
 
             // 数量0フィルター
-            $quantityFilter = function ($v) {
+            $quantityFilter = function($v) {
                 return !(isset($v['quantity']) && preg_match('/^0+$/', trim($v['quantity'])));
             };
 
             // $shippings = &$data['Shippings'];
 
             // 数量を抽出
-            $getQuantity = function ($v) {
+            $getQuantity = function($v) {
                 return (isset($v['quantity']) && preg_match('/^\d+$/', trim($v['quantity']))) ?
-                    trim($v['quantity']) :
-                    0;
+                    trim($v['quantity']) : 0;
             };
 
             // foreach ($shippings as &$shipping) {
@@ -289,7 +288,7 @@ 
                     $orderDetail['quantity'] = 0;
 
                     // 受注詳細と同じ商品規格のみ抽出
-                    $productClassFilter = function ($v) use ($orderDetail) {
+                    $productClassFilter = function($v) use ($orderDetail) {
                         return $orderDetail['ProductClass'] === $v['ProductClass'];
                     };
 
@@ -298,10 +297,9 @@ 
                         if (!empty($shipping['ShipmentItems'])) {
 
                             // 同じ商品規格の受注詳細の価格を適用
-                            $applyPrice = function (&$v) use ($orderDetail) {
+                            $applyPrice = function(&$v) use ($orderDetail) {
                                 $v['price'] = ($v['ProductClass'] === $orderDetail['ProductClass']) ?
-                                    $orderDetail['price'] :
-                                    $v['price'];
+                                    $orderDetail['price'] : $v['price'];
                             };
                             array_walk($shipping['ShipmentItems'], $applyPrice);
 
@@ -330,7 +328,7 @@ 
         //     }
         // });
         // 選択された支払い方法の名称をエンティティにコピーする
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
             $Order = $event->getData();
             $Payment = $Order->getPayment();
             if (!is_null($Payment)) {
@@ -338,7 +336,7 @@ 
             }
         });
         // 会員受注の場合、会員の性別/職業/誕生日をエンティティにコピーする
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
             $Order = $event->getData();
             $Customer = $Order->getCustomer();
             if (!is_null($Customer)) {

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

Spacing +7 added lines, -7 removed lines

@@ -199,7 +199,7 @@ 
                 'prototype' => true,
             ))
 
-            ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+            ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
                 if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
                     $form = $event->getForm();
                     $form->add('ShipmentItems', CollectionType::class, array(
@@ -210,7 +210,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 */
@@ -229,7 +229,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);
@@ -237,7 +237,7 @@ 
                 ));
 
             })
-            ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+            ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
                 $data = $event->getData();
                 $form = $event->getForm();
                 if (!$data) {
@@ -257,14 +257,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) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
                 if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
                     $form = $event->getForm();
                     $shipmentItems = $form['ShipmentItems']->getData();
@@ -275,7 +275,7 @@ 
                     }
                 }
             })
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
                 $Shipping = $event->getData();
                 $Delivery = $Shipping->getDelivery();
                 $Shipping->setShippingDeliveryName($Delivery ? $Delivery : null);

src/Eccube/ServiceProvider/EccubeServiceProvider.php

Spacing +28 added lines, -28 removed lines

@@ -63,15 +63,15 @@ 
      */
     public function register(Container $app)
     {
-        $app[BaseInfo::class] = function () use ($app) {
+        $app[BaseInfo::class] = function() use ($app) {
             return $app[BaseInfoRepository::class]->get();
         };
 
-        $app['eccube.calculate.context'] = function () use ($app) {
+        $app['eccube.calculate.context'] = function() use ($app) {
                 return new \Eccube\Service\Calculator\CalculateContext();
         };
 
-        $app['eccube.calculate.strategies'] = function () use ($app) {
+        $app['eccube.calculate.strategies'] = function() use ($app) {
             $Collection = new \Eccube\Service\Calculator\CalculateStrategyCollection();
             $Collection->setApplication($app);
             //$Collection->setOrder($Order);
@@ -84,47 +84,47 @@ 
             $Collection->add($app['eccube.calculate.strategy.calculate_total']);
             return $Collection;
         };
-        $app['eccube.calculate.strategy.shipping'] = function () use ($app) {
+        $app['eccube.calculate.strategy.shipping'] = function() use ($app) {
                 $Strategy = new \Eccube\Service\Calculator\Strategy\ShippingStrategy();
                 $Strategy->setApplication($app);
                 return $Strategy;
         };
-        $app['eccube.calculate.strategy.charge'] = function () use ($app) {
+        $app['eccube.calculate.strategy.charge'] = function() use ($app) {
                 $Strategy = new \Eccube\Service\Calculator\Strategy\ChargeStrategy();
                 $Strategy->setApplication($app);
                 return $Strategy;
         };
 
-        $app['eccube.calculate.strategy.tax'] = function () use ($app) {
+        $app['eccube.calculate.strategy.tax'] = function() use ($app) {
                 $Strategy = new \Eccube\Service\Calculator\Strategy\TaxStrategy();
                 $Strategy->setApplication($app);
                 return $Strategy;
         };
 
-        $app['eccube.calculate.strategy.calculate_delivery_fee'] = function () use ($app) {
+        $app['eccube.calculate.strategy.calculate_delivery_fee'] = function() use ($app) {
             $Strategy = new \Eccube\Service\Calculator\Strategy\CalculateDeliveryFeeStrategy();
             $Strategy->setApplication($app);
             return $Strategy;
         };
-        $app['eccube.calculate.strategy.calculate_charge'] = function () use ($app) {
+        $app['eccube.calculate.strategy.calculate_charge'] = function() use ($app) {
             $Strategy = new \Eccube\Service\Calculator\Strategy\CalculateChargeStrategy();
             $Strategy->setApplication($app);
             return $Strategy;
         };
-        $app['eccube.calculate.strategy.calculate_total'] = function () use ($app) {
+        $app['eccube.calculate.strategy.calculate_total'] = function() use ($app) {
             $Strategy = new \Eccube\Service\Calculator\Strategy\CalculateTotalStrategy();
             $Strategy->setApplication($app);
             return $Strategy;
         };
 
-        $app['payment.method'] = $app->protect(function ($clazz, $form) use ($app) {
+        $app['payment.method'] = $app->protect(function($clazz, $form) use ($app) {
                 $PaymentMethod = new $clazz;
                 $PaymentMethod->setApplication($app);
                 $PaymentMethod->setFormType($form);
                 return $PaymentMethod;
         });
 
-        $app['payment.method.request'] = $app->protect(function ($clazz, $form, $request) use ($app) {
+        $app['payment.method.request'] = $app->protect(function($clazz, $form, $request) use ($app) {
                 $PaymentMethod = new $clazz;
                 $PaymentMethod->setApplication($app);
                 $PaymentMethod->setFormType($form);
@@ -132,7 +132,7 @@ 
                 return $PaymentMethod;
         });
 
-        $app['eccube.service.calculate'] = $app->protect(function ($Order, $Customer) use ($app) {
+        $app['eccube.service.calculate'] = $app->protect(function($Order, $Customer) use ($app) {
             $Service = new \Eccube\Service\CalculateService($Order, $Customer);
             $Context = $app['eccube.calculate.context'];
             $app['eccube.calculate.strategies']->setOrder($Order);
@@ -143,24 +143,24 @@ 
             return $Service;
         });
 
-        $app['eccube.service.payment'] = $app->protect(function ($clazz) use ($app) {
+        $app['eccube.service.payment'] = $app->protect(function($clazz) use ($app) {
             $Service = new $clazz($app['request_stack']);
 
             return $Service;
         });
 
-        $app['paginator'] = $app->protect(function () {
+        $app['paginator'] = $app->protect(function() {
             $paginator = new \Knp\Component\Pager\Paginator();
             $paginator->subscribe(new \Eccube\EventListener\PaginatorListener());
 
             return $paginator;
         });
 
-        $app['request_scope'] = function () {
+        $app['request_scope'] = function() {
             return new ParameterBag();
         };
         // TODO 使用するか検討
-        $app['eccube.twig.node.hello'] = $app->protect(function ($node, $compiler) {
+        $app['eccube.twig.node.hello'] = $app->protect(function($node, $compiler) {
             $compiler
             ->addDebugInfo($node)
             ->write("echo 'Helloooooo ' . ")
@@ -170,7 +170,7 @@ 
 
         });
         // TODO 使用するか検討
-        $app['eccube.twig.node.jiro'] = $app->protect(function ($node, $compiler) {
+        $app['eccube.twig.node.jiro'] = $app->protect(function($node, $compiler) {
             $compiler
             ->addDebugInfo($node)
             ->write("echo 'jirooooooo ' . ")
@@ -181,7 +181,7 @@ 
         });
 
         // TODO 使用するか検討
-        $app['eccube.twig.generic_node_names'] = function () use ($app) {
+        $app['eccube.twig.generic_node_names'] = function() use ($app) {
             return [
                 'hello',
                 'jiro',
@@ -190,7 +190,7 @@ 
         };
 
         // TODO 使用するか検討
-        $app['twig_parsers'] = function () use ($app) {
+        $app['twig_parsers'] = function() use ($app) {
             $GenericTokenParsers = [];
             foreach ($app['eccube.twig.generic_node_names'] as $tagName) {
                 $GenericTokenParsers[] = new \Eccube\Twig\Extension\GenericTokenParser($app, $tagName);
@@ -198,7 +198,7 @@ 
             return $GenericTokenParsers;
         };
 
-        $app['eccube.twig.block.templates'] = function () {
+        $app['eccube.twig.block.templates'] = function() {
             $templates = new ArrayCollection();
             $templates[] = 'render_block.twig';
 
@@ -206,17 +206,17 @@ 
         };
 
         $app['eccube.entity.event.dispatcher']->addEventListener(new \Acme\Entity\SoldOutEventListener());
-        $app['eccube.queries'] = function () {
+        $app['eccube.queries'] = function() {
             return new \Eccube\Doctrine\Query\Queries();
         };
         // TODO QueryCustomizerの追加方法は要検討
         $app['eccube.queries']->addCustomizer(new \Acme\Entity\AdminProductListCustomizer());
 
-        $app['eccube.purchase.context'] = $app->protect(function (ItemHolderInterface $origin = null) {
+        $app['eccube.purchase.context'] = $app->protect(function(ItemHolderInterface $origin = null) {
             return new PurchaseContext($origin);
         });
 
-        $app['eccube.purchase.flow.cart.item_processors'] = function ($app) {
+        $app['eccube.purchase.flow.cart.item_processors'] = function($app) {
             $processors = new ArrayCollection();
             $processors->add(new DeletedProductValidator());
             $processors->add(new DisplayStatusValidator());
@@ -226,7 +226,7 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.cart.holder_processors'] = function ($app) {
+        $app['eccube.purchase.flow.cart.holder_processors'] = function($app) {
             $processors = new ArrayCollection();
             $processors->add(new PaymentProcessor($app[DeliveryRepository::class]));
             $processors->add(new PaymentTotalLimitValidator($app['config']['max_total_fee']));
@@ -237,14 +237,14 @@ 
         };
 
         // example
-        $app->extend('eccube.purchase.flow.cart.item_processors', function ($processors, $app) {
+        $app->extend('eccube.purchase.flow.cart.item_processors', function($processors, $app) {
 
             $processors->add(new StockValidator());
 
             return $processors;
         });
 
-        $app['eccube.purchase.flow.cart'] = function ($app) {
+        $app['eccube.purchase.flow.cart'] = function($app) {
             $flow = new PurchaseFlow();
             $flow->setItemProcessors($app['eccube.purchase.flow.cart.item_processors']);
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.cart.holder_processors']);
@@ -252,7 +252,7 @@ 
             return $flow;
         };
 
-        $app['eccube.purchase.flow.shopping'] = function () use ($app) {
+        $app['eccube.purchase.flow.shopping'] = function() use ($app) {
             $flow = new PurchaseFlow();
             $flow->addItemProcessor(new StockValidator());
             $flow->addItemProcessor(new DisplayStatusValidator());
@@ -262,7 +262,7 @@ 
             return $flow;
         };
 
-        $app['eccube.purchase.flow.order'] = function () use ($app) {
+        $app['eccube.purchase.flow.order'] = function() use ($app) {
             $flow = new PurchaseFlow();
             $flow->addItemProcessor(new StockValidator());
             $flow->addItemHolderProcessor(new PaymentTotalLimitValidator($app['config']['max_total_fee']));

src/Eccube/Application.php

Spacing +27 added lines, -27 removed lines

@@ -173,7 +173,7 @@ 
         $this->register(new MobileDetectServiceProvider());
         $this->register(new TwigLintServiceProvider());
 
-        $this->error(function (\Exception $e, Request $request, $code) {
+        $this->error(function(\Exception $e, Request $request, $code) {
             if ($this['debug']) {
                 return;
             }
@@ -279,14 +279,14 @@ 
             return $router;
         });
 
-        $this['eccube.router.origin'] = function ($app) {
+        $this['eccube.router.origin'] = function($app) {
             $resource = __DIR__.'/Controller';
             $cachePrefix = 'Origin';
 
             return $app['eccube.router']($resource, $cachePrefix);
         };
 
-        $this['eccube.routers.plugin'] = function ($app) {
+        $this['eccube.routers.plugin'] = function($app) {
             // TODO 有効なプラグインを対象とする必要がある.
             $dirs = Finder::create()
                 ->in($app['config']['root_dir'].'/app/Plugin')
@@ -303,7 +303,7 @@ 
             return $routers;
         };
 
-        $this['eccube.router.extend'] = function ($app) {
+        $this['eccube.router.extend'] = function($app) {
             // TODO ディレクトリ名は暫定
             $resource = $app['config']['root_dir'].'/app/Acme/Controller';
             $cachePrefix = 'Extend';
@@ -313,7 +313,7 @@ 
             return $router;
         };
 
-        $this->extend('request_matcher', function ($matcher, $app) {
+        $this->extend('request_matcher', function($matcher, $app) {
             $matchers = [];
             $matchers[] = $app['eccube.router.extend'];
             foreach ($app['eccube.routers.plugin'] as $router) {
@@ -325,7 +325,7 @@ 
             return new ChainUrlMatcher($matchers, $app['request_context']);
         });
 
-        $this->extend('url_generator', function ($generator, $app) {
+        $this->extend('url_generator', function($generator, $app) {
             $generators = [];
             $generators[] = $app['eccube.router.extend'];
             foreach ($app['eccube.routers.plugin'] as $router) {
@@ -338,7 +338,7 @@ 
         });
 
         // Route CollectionにEC-CUBEで定義したルーティングを追加(debug tool barに出力するため)
-        $this->extend('routes', function ($routes, $app) {
+        $this->extend('routes', function($routes, $app) {
             $routes->addCollection($app['eccube.router.extend']->getRouteCollection());
             foreach ($app['eccube.routers.plugin'] as $router) {
                 $routes->addCollection($router->getRouteCollection());
@@ -371,7 +371,7 @@ 
             'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator',
             'locale_fallbacks' => ['ja', 'en'],
         ));
-        $this->extend('translator', function ($translator, \Silex\Application $app) {
+        $this->extend('translator', function($translator, \Silex\Application $app) {
             $translator->addLoader('php', new \Symfony\Component\Translation\Loader\PhpFileLoader());
 
             $file = __DIR__.'/Resource/locale/messages.'.$app['locale'].'.php';
@@ -414,14 +414,14 @@ 
         $this->register(new \Silex\Provider\TwigServiceProvider(), array(
             'twig.form.templates' => array('Form/form_layout.twig'),
         ));
-        $this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) {
+        $this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) {
             $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app));
             $twig->addExtension(new \Twig_Extension_StringLoader());
 
             return $twig;
         });
 
-        $this->before(function (Request $request, \Silex\Application $app) {
+        $this->before(function(Request $request, \Silex\Application $app) {
             $app['admin'] = $app['front'] = false;
             $pathinfo = rawurldecode($request->getPathInfo());
             if (strpos($pathinfo, '/'.trim($app['config']['admin_route'], '/').'/') === 0) {
@@ -437,7 +437,7 @@ 
                 }
                 $paths[] = $app['config']['template_admin_realdir'];
                 $paths[] = __DIR__.'/../../app/Plugin';
-                $cacheDir =  __DIR__.'/../../app/cache/twig/admin';
+                $cacheDir = __DIR__.'/../../app/cache/twig/admin';
             } else {
                 // モバイル端末時、smartphoneディレクトリを探索パスに追加する.
                 if ($app['mobile_detect.device_type'] == \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP) {
@@ -452,7 +452,7 @@ 
                 }
                 $paths[] = $app['config']['template_default_realdir'];
                 $paths[] = __DIR__.'/../../app/Plugin';
-                $cacheDir =  __DIR__.'/../../app/cache/twig/'.$app['config']['template_code'];
+                $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code'];
             }
             $app['twig']->setCache($app['debug'] ? null : $cacheDir);
             $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths));
@@ -470,7 +470,7 @@ 
         }, self::EARLY_EVENT);
 
         // twigのグローバル変数を定義.
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) {
             // 未ログイン時にマイページや管理画面以下にアクセスするとSubRequestで実行されるため,
             // $event->isMasterRequest()ではなく、グローバル変数が初期化済かどうかの判定を行う
             if (isset($this['twig_global_initialized']) && $this['twig_global_initialized'] === true) {
@@ -555,7 +555,7 @@ 
         // メール送信時の文字エンコード指定(デフォルトはUTF-8)
         if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) {
             if ($this['config']['mail']['charset_iso_2022_jp'] === true) {
-                \Swift::init(function () {
+                \Swift::init(function() {
                     \Swift_DependencyContainer::getInstance()
                         ->register('mime.qpheaderencoder')
                         ->asAliasOf('mime.base64headerencoder');
@@ -590,7 +590,7 @@ 
         $this->register(new \Saxulum\DoctrineOrmManagerRegistry\Provider\DoctrineOrmManagerRegistryProvider());
 
         $app = $this;
-        $this->extend('db.event_manager', function ($evm) use ($app) {
+        $this->extend('db.event_manager', function($evm) use ($app) {
             $initSubscriber = new InitSubscriber($app);
             $evm->addEventSubscriber($initSubscriber);
 
@@ -685,7 +685,7 @@ 
 
         $this->extend(
             'orm.em.config',
-            function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
+            function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
 
                 /** @var $chain \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain */
                 $chain = $config->getMetadataDriverImpl();
@@ -707,7 +707,7 @@ 
             }
         );
 
-        $this->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
+        $this->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
             // save
             $saveEventSubscriber = new \Eccube\Doctrine\EventSubscriber\SaveEventSubscriber($app);
             $em->getEventManager()->addEventSubscriber($saveEventSubscriber);
@@ -730,7 +730,7 @@ 
             // second level cacheの設定.
             $this->extend(
                 'orm.em.config',
-                function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
+                function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
                     $config->setSecondLevelCacheEnabled();
                     $cacheConfig = $config->getSecondLevelCacheConfiguration();
                     $regionConfig = $cacheConfig->getRegionsConfiguration();
@@ -819,31 +819,31 @@ 
             array('^/mypage', 'ROLE_USER', $channel),
         );
 
-        $this['eccube.password_encoder'] = function ($app) {
+        $this['eccube.password_encoder'] = function($app) {
             return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']);
         };
-        $this['security.encoder_factory'] = function ($app) {
+        $this['security.encoder_factory'] = function($app) {
             return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array(
                 'Eccube\Entity\Customer' => $app['eccube.password_encoder'],
                 'Eccube\Entity\Member' => $app['eccube.password_encoder'],
             ));
         };
-        $this['eccube.event_listner.security'] = function ($app) {
+        $this['eccube.event_listner.security'] = function($app) {
             return new \Eccube\EventListener\SecurityEventListener($app['orm.em']);
         };
 
         // Voterの設定
-        $this['authority_voter'] = function ($app) {
+        $this['authority_voter'] = function($app) {
             return new \Eccube\Security\Voter\AuthorityVoter($app);
         };
 
-        $this->extend('security.voters', function ($voters, \Silex\Application $app) {
+        $this->extend('security.voters', function($voters, \Silex\Application $app) {
             $voters[] = $app['authority_voter'];
 
             return $voters;
         });
 
-        $this['security.access_manager'] = function ($app) {
+        $this['security.access_manager'] = function($app) {
             return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous');
         };
 
@@ -857,7 +857,7 @@ 
     {
         $config = $this['config'];
         if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) {
-            $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($config) {
+            $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($config) {
                 // サブリクエストのREMOTE_ADDRも動的に設定を行う必要があるため、KernelEvents::REQUESTを使用する
                 Request::setTrustedProxies(array_merge(array($event->getRequest()->server->get('REMOTE_ADDR')), $config['trusted_proxies']));
             }, self::EARLY_EVENT);
@@ -874,7 +874,7 @@ 
         $this->register(new ServiceProvider\EccubePluginServiceProvider());
 
         // TODO Acme\ServiceProvider の初期化はここで OK?
-        if (array_key_exists('service',$this['config'])) {
+        if (array_key_exists('service', $this['config'])) {
             foreach ($this['config']['service'] as $service) {
                 $this->register(new $service);
             }
@@ -1030,7 +1030,7 @@ 
         $app = $this;
 
         // Response Event(http cache対応、event実行は一番遅く設定)
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;

src/Eccube/Controller/Install/InstallController.php

Spacing +50 added lines, -50 removed lines

@@ -53,9 +53,9 @@ 
     const SESSION_KEY = 'eccube.session.install';
     public function __construct()
     {
-        $this->config_path = __DIR__ . '/../../../../app/config/eccube';
-        $this->dist_path = __DIR__ . '/../../Resource/config';
-        $this->cache_path = __DIR__ . '/../../../../app/cache';
+        $this->config_path = __DIR__.'/../../../../app/config/eccube';
+        $this->dist_path = __DIR__.'/../../Resource/config';
+        $this->cache_path = __DIR__.'/../../../../app/cache';
     }
     private function isValid(Request $request, Form $form)
     {
@@ -95,7 +95,7 @@ 
         $this->checkModules($app);
         return $app['twig']->render('step1.twig', array(
             'form' => $form->createView(),
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     // 権限チェック
@@ -114,7 +114,7 @@ 
         }
         return $app['twig']->render('step2.twig', array(
             'protectedDirs' => $protectedDirs,
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     //    サイトの設定
@@ -125,7 +125,7 @@ 
             ->getForm();
         $sessionData = $this->getSessionData($request);
         if (empty($sessionData['shop_name'])) {
-            $config_file = $this->config_path . '/config.php';
+            $config_file = $this->config_path.'/config.php';
             $fs = new Filesystem();
             if ($fs->exists($config_file)) {
                 // すでに登録されていた場合、登録データを表示
@@ -136,10 +136,10 @@ 
                     $sessionData['email'] = $row['email01'];
                 }
                 // セキュリティの設定
-                $config_file = $this->config_path . '/path.php';
+                $config_file = $this->config_path.'/path.php';
                 $config = require $config_file;
                 $sessionData['admin_dir'] = $config['admin_route'];
-                $config_file = $this->config_path . '/config.php';
+                $config_file = $this->config_path.'/config.php';
                 $config = require $config_file;
                 $allowHost = $config['admin_allow_host'];
                 if (count($allowHost) > 0) {
@@ -148,7 +148,7 @@ 
                 $sessionData['admin_force_ssl'] = (bool) $config['force_ssl'];
                 // ロードバランサー、プロキシサーバ設定
                 if (isset($config['trusted_proxies_connection_only'])) {
-                    $sessionData['trusted_proxies_connection_only'] = (bool)$config['trusted_proxies_connection_only'];
+                    $sessionData['trusted_proxies_connection_only'] = (bool) $config['trusted_proxies_connection_only'];
                 }
                 if (isset($config['trusted_proxies'])) {
                     $trustedProxies = $config['trusted_proxies'];
@@ -157,7 +157,7 @@ 
                     }
                 }
                 // メール設定
-                $config_file = $this->config_path . '/mail.php';
+                $config_file = $this->config_path.'/mail.php';
                 $config = require $config_file;
                 $mail = $config['mail'];
                 $sessionData['mail_backend'] = $mail['transport'];
@@ -177,7 +177,7 @@ 
         }
         return $app['twig']->render('step3.twig', array(
             'form' => $form->createView(),
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     //    データベースの設定
@@ -188,7 +188,7 @@ 
             ->getForm();
         $sessionData = $this->getSessionData($request);
         if (empty($sessionData['database'])) {
-            $config_file = $this->config_path . '/database.php';
+            $config_file = $this->config_path.'/database.php';
             $fs = new Filesystem();
             if ($fs->exists($config_file)) {
                 // すでに登録されていた場合、登録データを表示
@@ -211,7 +211,7 @@ 
         }
         return $app['twig']->render('step4.twig', array(
             'form' => $form->createView(),
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     //    データベースの初期化
@@ -250,7 +250,7 @@ 
                 $host = $request->getSchemeAndHttpHost();
                 $basePath = $request->getBasePath();
                 $params = array(
-                    'http_url' => $host . $basePath,
+                    'http_url' => $host.$basePath,
                     'shop_name' => $sessionData['shop_name'],
                 );
                 $this->sendAppData($params);
@@ -261,15 +261,15 @@ 
         }
         return $app['twig']->render('step5.twig', array(
             'form' => $form->createView(),
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     //    インストール完了
     public function complete(InstallApplication $app, Request $request)
     {
-        $config_yml = $this->config_path . '/config.php';
+        $config_yml = $this->config_path.'/config.php';
         $config = require $config_yml;
-        $config_path = $this->config_path . '/path.php';
+        $config_path = $this->config_path.'/path.php';
         $path_yml = require $config_path;
         $config = array_replace_recursive($path_yml, $config);
         if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) {
@@ -279,10 +279,10 @@ 
         }
         $host = $request->getSchemeAndHttpHost();
         $basePath = $request->getBasePath();
-        $adminUrl = $host . $basePath . '/' . $config['admin_dir'];
+        $adminUrl = $host.$basePath.'/'.$config['admin_dir'];
         return $app['twig']->render('complete.twig', array(
             'admin_url' => $adminUrl,
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     private function resetNatTimer()
@@ -296,11 +296,11 @@ 
     {
         foreach ($this->required_modules as $module) {
             if (!extension_loaded($module)) {
-                $app->addDanger('[必須] ' . $module . ' 拡張モジュールが有効になっていません。', 'install');
+                $app->addDanger('[必須] '.$module.' 拡張モジュールが有効になっていません。', 'install');
             }
         }
         if (!extension_loaded('pdo_mysql') && !extension_loaded('pdo_pgsql')) {
-            $app->addDanger('[必須] ' . 'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install');
+            $app->addDanger('[必須] '.'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install');
         }
         foreach ($this->recommended_module as $module) {
             if (!extension_loaded($module)) {
@@ -325,7 +325,7 @@ 
             if (!function_exists('apache_get_modules')) {
                 $app->addWarning('mod_rewrite が有効になっているか不明です。', 'install');
             } elseif (!in_array('mod_rewrite', apache_get_modules())) {
-                $app->addDanger('[必須] ' . 'mod_rewriteを有効にしてください。', 'install');
+                $app->addDanger('[必須] '.'mod_rewriteを有効にしてください。', 'install');
             }
         } elseif (isset($_SERVER['SERVER_SOFTWARE']) && strpos('Microsoft-IIS', $_SERVER['SERVER_SOFTWARE']) !== false) {
             // iis
@@ -335,7 +335,7 @@ 
     }
     private function setPDO()
     {
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         $config = require $config_file;
         try {
             $this->PDO = \Doctrine\DBAL\DriverManager::getConnection($config['database'], new \Doctrine\DBAL\Configuration());
@@ -362,7 +362,7 @@ 
     private function getEntityManager()
     {
         if (!isset($this->app['orm.em'])) {
-            $config_file = $this->config_path . '/database.php';
+            $config_file = $this->config_path.'/database.php';
             $database = require $config_file;
             $this->app->register(new \Silex\Provider\DoctrineServiceProvider(), array(
                 'db.options' => $database['database']
@@ -372,7 +372,7 @@ 
                     'type' => 'annotation',
                     'namespace' => 'Eccube\Entity',
                     'path' => array(
-                        __DIR__ . '/../../Entity',
+                        __DIR__.'/../../Entity',
                     ),
                     'use_simple_annotation_reader' => false,
                 ),
@@ -404,7 +404,7 @@ 
                 }
             }
             $this->app->register(new \Dflydev\Provider\DoctrineOrm\DoctrineOrmServiceProvider(), array(
-                'orm.proxies_dir' => __DIR__ . '/../../app/cache/doctrine',
+                'orm.proxies_dir' => __DIR__.'/../../app/cache/doctrine',
                 'orm.em.options' => array(
                     'mappings' => $ormMappings
                 )
@@ -433,10 +433,10 @@ 
     private function insert()
     {
         $this->resetNatTimer();
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         $database = require $config_file;
         $config['database'] = $database['database'];
-        $config_file = $this->config_path . '/config.php';
+        $config_file = $this->config_path.'/config.php';
         $baseConfig = require $config_file;
         $config['config'] = $baseConfig;
         $this->PDO->beginTransaction();
@@ -485,10 +485,10 @@ 
     private function update()
     {
         $this->resetNatTimer();
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         $database = require $config_file;
         $config['database'] = $database['database'];
-        $config_file = $this->config_path . '/config.php';
+        $config_file = $this->config_path.'/config.php';
         $baseConfig = require $config_file;
         $config['config'] = $baseConfig;
         $this->PDO->beginTransaction();
@@ -539,7 +539,7 @@ 
         $app->boot();
         $config = new Configuration($app['db']);
         $config->setMigrationsNamespace('DoctrineMigrations');
-        $migrationDir = __DIR__ . '/../../Resource/doctrine/migration';
+        $migrationDir = __DIR__.'/../../Resource/doctrine/migration';
         $config->setMigrationsDirectory($migrationDir);
         $config->registerMigrationsFromDirectory($migrationDir);
         $migration = new Migration($config);
@@ -565,7 +565,7 @@ 
     private function getProtectedDirs()
     {
         $protectedDirs = array();
-        $base = __DIR__ . '/../../../..';
+        $base = __DIR__.'/../../../..';
         $dirs = array(
             '/html',
             '/app',
@@ -577,7 +577,7 @@ 
             '/app/Plugin',
         );
         foreach ($dirs as $dir) {
-            if (!is_writable($base . $dir)) {
+            if (!is_writable($base.$dir)) {
                 $protectedDirs[] = $dir;
             }
         }
@@ -586,7 +586,7 @@ 
     private function createConfigYamlFile($data, $auth = true)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/config.php';
+        $config_file = $this->config_path.'/config.php';
         if ($fs->exists($config_file)) {
             $config = require $config_file;
             $fs->remove($config_file);
@@ -619,7 +619,7 @@ 
             $adminTrustedProxies = array('127.0.0.1/8', '::1');
         }
 
-        $config = require $this->dist_path . '/config.php';
+        $config = require $this->dist_path.'/config.php';
         $config['eccube_install'] = 0;
         $config['auth_magic'] = $auth_magic;
         $config['shop_name'] = $data['shop_name'];
@@ -643,7 +643,7 @@ 
 
     private function addInstallStatus()
     {
-        $config_file = $this->config_path . '/config.php';
+        $config_file = $this->config_path.'/config.php';
         $config = require $config_file;
         $config['eccube_install'] = 1;
 
@@ -654,7 +654,7 @@ 
     private function createDatabaseYamlFile($data)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -675,7 +675,7 @@ 
                     break;
             }
 
-            $config = $this->dist_path . '/database.php';
+            $config = $this->dist_path.'/database.php';
             $config['database']['driver'] = $data['db_driver'];
             $config['database']['host'] = $data['database_host'];
             $config['database']['dbname'] = $data['database_name'];
@@ -684,9 +684,9 @@ 
             $config['database']['password'] = $data['database_password'];
 
         } else {
-            $config = $this->dist_path . '/database_sqlite3.php';
+            $config = $this->dist_path.'/database_sqlite3.php';
             $config['database']['driver'] = 'pdo_sqlite';
-            $config['database']['path'] = realpath($this->config_path . '/eccube.db');
+            $config['database']['path'] = realpath($this->config_path.'/eccube.db');
         }
 
         $this->createPhp($config_file, $config);
@@ -696,7 +696,7 @@ 
     private function createMailYamlFile($data)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/mail.php';
+        $config_file = $this->config_path.'/mail.php';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -715,7 +715,7 @@ 
     private function createPathYamlFile($data, Request $request)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/path.php';
+        $config_file = $this->config_path.'/path.php';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -724,11 +724,11 @@ 
         $USER_DATA_ROUTE = 'user_data';
         $ROOT_DIR = '%ROOT_DIR%';
         $ROOT_URLPATH = $request->getBasePath();
-        $ROOT_PUBLIC_URLPATH = $ROOT_URLPATH . RELATIVE_PUBLIC_DIR_PATH;
+        $ROOT_PUBLIC_URLPATH = $ROOT_URLPATH.RELATIVE_PUBLIC_DIR_PATH;
         $target = array('${ADMIN_ROUTE}', '${TEMPLATE_CODE}', '${USER_DATA_ROUTE}', '${ROOT_DIR}', '${ROOT_URLPATH}', '${ROOT_PUBLIC_URLPATH}');
         $replace = array($ADMIN_ROUTE, $TEMPLATE_CODE, $USER_DATA_ROUTE, $ROOT_DIR, $ROOT_URLPATH, $ROOT_PUBLIC_URLPATH);
 
-        $config = require $this->dist_path . '/path.php';
+        $config = require $this->dist_path.'/path.php';
 
         $this->createPhp($config_file, $config);
 
@@ -736,7 +736,7 @@ 
     }
     private function sendAppData($params)
     {
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         $db_config = require $config_file;
         $this->setPDO();
         $stmt = $this->PDO->query('select version() as v');
@@ -745,7 +745,7 @@ 
             $version = $row['v'];
         }
         if ($db_config['database']['driver'] === 'pdo_mysql') {
-            $db_ver = 'MySQL:' . $version;
+            $db_ver = 'MySQL:'.$version;
         } else {
             $db_ver = $version;
         }
@@ -761,7 +761,7 @@ 
         );
         $header = array(
             'Content-Type: application/x-www-form-urlencoded',
-            'Content-Length: ' . strlen($data),
+            'Content-Length: '.strlen($data),
         );
         $context = stream_context_create(
             array(
@@ -786,7 +786,7 @@ 
     public function migration(InstallApplication $app, Request $request)
     {
         return $app['twig']->render('migration.twig', array(
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     /**
@@ -812,7 +812,7 @@ 
             return $app['twig']->render('migration_plugin.twig', array(
                 'Plugins' => $Plugins,
                 'version' => Constant::VERSION,
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
             ));
         }
     }
@@ -832,7 +832,7 @@ 
         $config_app->boot();
         \Eccube\Util\Cache::clear($config_app, true);
         return $app['twig']->render('migration_end.twig', array(
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
 }
\ No newline at end of file