EC-CUBE / ec-cube

src/Eccube/Log/Monolog/Helper/LogHelper.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
         $webProcessor = new WebProcessor();
         $uidProcessor = new UidProcessor(8);
 
-        $FingerCrossedHandler->pushProcessor(function ($record) use ($app, $uidProcessor, $webProcessor) {
+        $FingerCrossedHandler->pushProcessor(function($record) use ($app, $uidProcessor, $webProcessor) {
             // ログフォーマットに出力する値を独自に設定
 
             $record['level_name'] = sprintf("%-5s", $record['level_name']);

src/Eccube/ServiceProvider/EccubeServiceProvider.php

Spacing +59 added lines, -59 removed lines

@@ -41,28 +41,28 @@ 
     public function register(BaseApplication $app)
     {
         // Service
-        $app['eccube.service.system'] = $app->share(function () use ($app) {
+        $app['eccube.service.system'] = $app->share(function() use ($app) {
             return new \Eccube\Service\SystemService($app);
         });
-        $app['view'] = $app->share(function () use ($app) {
+        $app['view'] = $app->share(function() use ($app) {
             return $app['twig'];
         });
-        $app['eccube.service.cart'] = $app->share(function () use ($app) {
+        $app['eccube.service.cart'] = $app->share(function() use ($app) {
             return new \Eccube\Service\CartService($app);
         });
-        $app['eccube.service.order'] = $app->share(function () use ($app) {
+        $app['eccube.service.order'] = $app->share(function() use ($app) {
             return new \Eccube\Service\OrderService($app);
         });
-        $app['eccube.service.tax_rule'] = $app->share(function () use ($app) {
+        $app['eccube.service.tax_rule'] = $app->share(function() use ($app) {
             return new \Eccube\Service\TaxRuleService($app['eccube.repository.tax_rule']);
         });
-        $app['eccube.service.plugin'] = $app->share(function () use ($app) {
+        $app['eccube.service.plugin'] = $app->share(function() use ($app) {
             return new \Eccube\Service\PluginService($app);
         });
-        $app['eccube.service.mail'] = $app->share(function () use ($app) {
+        $app['eccube.service.mail'] = $app->share(function() use ($app) {
             return new \Eccube\Service\MailService($app);
         });
-        $app['eccube.service.csv.export'] = $app->share(function () use ($app) {
+        $app['eccube.service.csv.export'] = $app->share(function() use ($app) {
             $csvService = new \Eccube\Service\CsvExportService();
             $csvService->setEntityManager($app['orm.em']);
             $csvService->setConfig($app['config']);
@@ -74,184 +74,184 @@ 
 
             return $csvService;
         });
-        $app['eccube.service.shopping'] = $app->share(function () use ($app) {
+        $app['eccube.service.shopping'] = $app->share(function() use ($app) {
             return new \Eccube\Service\ShoppingService($app, $app['eccube.service.cart'], $app['eccube.service.order']);
         });
 
         // Repository
-        $app['eccube.repository.master.authority'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.authority'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Authority');
         });
-        $app['eccube.repository.master.tag'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.tag'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Tag');
         });
-        $app['eccube.repository.master.pref'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.pref'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Pref');
         });
-        $app['eccube.repository.master.sex'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.sex'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Sex');
         });
-        $app['eccube.repository.master.disp'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.disp'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Disp');
         });
-        $app['eccube.repository.master.product_type'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.product_type'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductType');
         });
-        $app['eccube.repository.master.page_max'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.page_max'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\PageMax');
         });
-        $app['eccube.repository.master.order_status'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.order_status'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus');
         });
-        $app['eccube.repository.master.device_type'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.device_type'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\DeviceType');
         });
-        $app['eccube.repository.master.csv_type'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.csv_type'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\CsvType');
         });
 
-        $app['eccube.repository.delivery'] = $app->share(function () use ($app) {
+        $app['eccube.repository.delivery'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Delivery');
         });
-        $app['eccube.repository.delivery_date'] = $app->share(function () use ($app) {
+        $app['eccube.repository.delivery_date'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryDate');
         });
-        $app['eccube.repository.delivery_fee'] = $app->share(function () use ($app) {
+        $app['eccube.repository.delivery_fee'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryFee');
         });
-        $app['eccube.repository.delivery_time'] = $app->share(function () use ($app) {
+        $app['eccube.repository.delivery_time'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryTime');
         });
-        $app['eccube.repository.payment'] = $app->share(function () use ($app) {
+        $app['eccube.repository.payment'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Payment');
         });
-        $app['eccube.repository.payment_option'] = $app->share(function () use ($app) {
+        $app['eccube.repository.payment_option'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\PaymentOption');
         });
-        $app['eccube.repository.category'] = $app->share(function () use ($app) {
+        $app['eccube.repository.category'] = $app->share(function() use ($app) {
             $CategoryRepository = $app['orm.em']->getRepository('Eccube\Entity\Category');
             $CategoryRepository->setApplication($app);
 
             return $CategoryRepository;
         });
-        $app['eccube.repository.customer'] = $app->share(function () use ($app) {
+        $app['eccube.repository.customer'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Customer');
         });
-        $app['eccube.repository.news'] = $app->share(function () use ($app) {
+        $app['eccube.repository.news'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\News');
         });
-        $app['eccube.repository.mail_history'] = $app->share(function () use ($app) {
+        $app['eccube.repository.mail_history'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\MailHistory');
         });
-        $app['eccube.repository.member'] = $app->share(function () use ($app) {
+        $app['eccube.repository.member'] = $app->share(function() use ($app) {
             $memberRepository = $app['orm.em']->getRepository('Eccube\Entity\Member');
             $memberRepository->setEncoderFactorty($app['security.encoder_factory']);
             return $memberRepository;
         });
-        $app['eccube.repository.order'] = $app->share(function () use ($app) {
+        $app['eccube.repository.order'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Order');
         });
-        $app['eccube.repository.product'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product'] = $app->share(function() use ($app) {
             $productRepository = $app['orm.em']->getRepository('Eccube\Entity\Product');
             $productRepository->setApplication($app);
 
             return $productRepository;
         });
-        $app['eccube.repository.product_image'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product_image'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductImage');
         });
-        $app['eccube.repository.product_class'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product_class'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductClass');
         });
-        $app['eccube.repository.product_stock'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product_stock'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductStock');
         });
-        $app['eccube.repository.product_tag'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product_tag'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductTag');
         });
-        $app['eccube.repository.class_name'] = $app->share(function () use ($app) {
+        $app['eccube.repository.class_name'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ClassName');
         });
-        $app['eccube.repository.class_category'] = $app->share(function () use ($app) {
+        $app['eccube.repository.class_category'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ClassCategory');
         });
-        $app['eccube.repository.customer_favorite_product'] = $app->share(function () use ($app) {
+        $app['eccube.repository.customer_favorite_product'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\CustomerFavoriteProduct');
         });
-        $app['eccube.repository.base_info'] = $app->share(function () use ($app) {
+        $app['eccube.repository.base_info'] = $app->share(function() use ($app) {
             $BaseInfoRepository = $app['orm.em']->getRepository('Eccube\Entity\BaseInfo');
             $BaseInfoRepository->setApplication($app);
 
             return $BaseInfoRepository;
         });
-        $app['eccube.repository.tax_rule'] = $app->share(function () use ($app) {
+        $app['eccube.repository.tax_rule'] = $app->share(function() use ($app) {
             $taxRuleRepository = $app['orm.em']->getRepository('Eccube\Entity\TaxRule');
             $taxRuleRepository->setApplication($app);
 
             return $taxRuleRepository;
         });
-        $app['eccube.repository.page_layout'] = $app->share(function () use ($app) {
+        $app['eccube.repository.page_layout'] = $app->share(function() use ($app) {
             $pageLayoutRepository = $app['orm.em']->getRepository('Eccube\Entity\PageLayout');
             $pageLayoutRepository->setApplication($app);
 
             return $pageLayoutRepository;
         });
-        $app['eccube.repository.block'] = $app->share(function () use ($app) {
+        $app['eccube.repository.block'] = $app->share(function() use ($app) {
             $blockRepository = $app['orm.em']->getRepository('Eccube\Entity\Block');
             $blockRepository->setApplication($app);
 
             return $blockRepository;
         });
-        $app['eccube.repository.order'] = $app->share(function () use ($app) {
+        $app['eccube.repository.order'] = $app->share(function() use ($app) {
             $orderRepository = $app['orm.em']->getRepository('Eccube\Entity\Order');
             $orderRepository->setApplication($app);
 
             return $orderRepository;
         });
-        $app['eccube.repository.customer_address'] = $app->share(function () use ($app) {
+        $app['eccube.repository.customer_address'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\CustomerAddress');
         });
-        $app['eccube.repository.shipping'] = $app->share(function () use ($app) {
+        $app['eccube.repository.shipping'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Shipping');
         });
-        $app['eccube.repository.customer_status'] = $app->share(function () use ($app) {
+        $app['eccube.repository.customer_status'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\CustomerStatus');
         });
-        $app['eccube.repository.order_status'] = $app->share(function () use ($app) {
+        $app['eccube.repository.order_status'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus');
         });
-        $app['eccube.repository.mail_template'] = $app->share(function () use ($app) {
+        $app['eccube.repository.mail_template'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\MailTemplate');
         });
-        $app['eccube.repository.csv'] = $app->share(function () use ($app) {
+        $app['eccube.repository.csv'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Csv');
         });
-        $app['eccube.repository.template'] = $app->share(function () use ($app) {
+        $app['eccube.repository.template'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Template');
         });
-        $app['eccube.repository.authority_role'] = $app->share(function () use ($app) {
+        $app['eccube.repository.authority_role'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\AuthorityRole');
         });
 
-        $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['eccube.repository.help'] = $app->share(function () use ($app) {
+        $app['eccube.repository.help'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Help');
         });
-        $app['eccube.repository.plugin'] = $app->share(function () use ($app) {
+        $app['eccube.repository.plugin'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Plugin');
         });
-        $app['eccube.repository.plugin_event_handler'] = $app->share(function () use ($app) {
+        $app['eccube.repository.plugin_event_handler'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\PluginEventHandler');
         });
         // em
         if (isset($app['orm.em'])) {
-            $app['orm.em'] = $app->share($app->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
+            $app['orm.em'] = $app->share($app->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
                 // tax_rule
                 $taxRuleRepository = $em->getRepository('Eccube\Entity\TaxRule');
                 $taxRuleRepository->setApplication($app);
@@ -278,13 +278,13 @@ 
         }
 
         // Form\Type
-        $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function ($extensions) use ($app) {
+        $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function($extensions) use ($app) {
             $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension();
             $extensions[] = new \Eccube\Form\Extension\FreezeTypeExtension();
 
             return $extensions;
         }));
-        $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) {
+        $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) {
             $types[] = new \Eccube\Form\Type\NameType($app['config']);
             $types[] = new \Eccube\Form\Type\KanaType($app['config']);
             $types[] = new \Eccube\Form\Type\TelType($app['config']);

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

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
             return $log;
         }
 
-        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) {
+        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) {
             // 上限に達した場合、処理を抜ける
             if (count($log) >= $formData['line_max']) {
                 break;

src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php

Spacing +6 added lines, -6 removed lines

@@ -93,10 +93,10 @@ 
                 // ファイルアップロード
                 $file = $form['payment_image']->getData();
                 $fs = new Filesystem();
-                if ($file && $fs->exists($app['config']['image_temp_realdir'] . '/' . $file)) {
+                if ($file && $fs->exists($app['config']['image_temp_realdir'].'/'.$file)) {
                     $fs->rename(
-                        $app['config']['image_temp_realdir'] . '/' . $file,
-                        $app['config']['image_save_realdir'] . '/' . $file
+                        $app['config']['image_temp_realdir'].'/'.$file,
+                        $app['config']['image_save_realdir'].'/'.$file
                     );
                 }
 
@@ -144,7 +144,7 @@ 
             }
 
             $extension = $image->guessExtension();
-            $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+            $filename = date('mdHis').uniqid('_').'.'.$extension;
             $image->move($app['config']['image_temp_realdir'], $filename);
         }
         $event = new EventArgs(
@@ -180,7 +180,7 @@ 
         foreach ($Payments as $Payment) {
             if ($Payment->getId() != $id) {
                 $Payment->setRank($rank);
-                $rank ++;
+                $rank++;
             }
         }
 
@@ -194,7 +194,7 @@ 
         );
         $app['eccube.event.dispatcher']->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event);
 
-        $app->addSuccess('admin.delete.complete', 'admin') ;
+        $app->addSuccess('admin.delete.complete', 'admin');
 
         return $app->redirect($app->url('admin_setting_shop_payment'));
     }

src/Eccube/Controller/Admin/Content/BlockController.php

Spacing +3 added lines, -3 removed lines

@@ -114,7 +114,7 @@ 
                 // ファイル生成・更新
                 $tplDir = $app['config']['block_realdir'];
 
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
 
                 $fs = new Filesystem();
                 $blockData = $form->get('block_html')->getData();
@@ -122,7 +122,7 @@ 
                 $fs->dumpFile($filePath, $blockData);
                 // 更新でファイル名を変更した場合、以前のファイルを削除
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
-                    $oldFilePath = $tplDir . '/' . $previous_filename . '.twig';
+                    $oldFilePath = $tplDir.'/'.$previous_filename.'.twig';
                     if ($fs->exists($oldFilePath)) {
                         $fs->remove($oldFilePath);
                     }
@@ -175,7 +175,7 @@ 
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
         if ($Block->getDeletableFlg() > 0) {
             $tplDir = $app['config']['block_realdir'];
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
             $fs = new Filesystem();
             if ($fs->exists($file)) {
                 $fs->remove($file);

src/Eccube/Controller/Mypage/DeliveryController.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
         // 遷移が正しくない場合、デフォルトであるマイページの配送先追加の画面を設定する
         if (!in_array($parentPage, $allowdParents)) {
             // @deprecated 使用されていないコード
-            $parentPage  = $app->url('mypage_delivery');
+            $parentPage = $app->url('mypage_delivery');
         }
 
         $builder = $app['form.factory']

src/Eccube/Controller/UserDataController.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
         $paths[] = $app['config']['user_data_realdir'];
         $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths));
 
-        $file = $PageLayout->getFileName() . '.twig';
+        $file = $PageLayout->getFileName().'.twig';
 
         $event = new EventArgs(
             array(

src/Eccube/Controller/ForgotController.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
                 // リセットキーの発行・有効期限の設定
                 $Customer
                     ->setResetKey($app['eccube.repository.customer']->getUniqueResetKey($app))
-                    ->setResetExpire(new \DateTime('+' . $app['config']['customer_reset_expire'] .' min'));
+                    ->setResetExpire(new \DateTime('+'.$app['config']['customer_reset_expire'].' min'));
 
                 // リセットキーを更新
                 $app['orm.em']->persist($Customer);
@@ -87,7 +87,7 @@ 
 
                 // ログ出力
                 $app['monolog']->addInfo(
-                    'send reset password mail to:'  . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
+                    'send reset password mail to:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
                 );
             } else {
                 log_warning('Un active customer try send reset password email: ', array('Enter email' => $form->get('login_email')->getData()));
@@ -169,7 +169,7 @@ 
 
             // ログ出力
             $app['monolog']->addInfo(
-                'reset password complete:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
+                'reset password complete:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
             );
         } else {
             throw new HttpException\AccessDeniedHttpException('不正なアクセスです。');

src/Eccube/Repository/ProductRepository.php

Spacing +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
                 $key = sprintf('keyword%s', $index);
                 $qb
                     ->andWhere(sprintf('NORMALIZE(p.name) LIKE NORMALIZE(:%s) OR NORMALIZE(p.search_word) LIKE NORMALIZE(:%s)', $key, $key))
-                    ->setParameter($key, '%' . $keyword . '%');
+                    ->setParameter($key, '%'.$keyword.'%');
             }
         }
 
@@ -176,7 +176,7 @@ 
             $qb
                 ->andWhere('p.id = :id OR p.name LIKE :likeid OR pc.code LIKE :likeid')
                 ->setParameter('id', $id)
-                ->setParameter('likeid', '%' . $searchData['id'] . '%');
+                ->setParameter('likeid', '%'.$searchData['id'].'%');
         }
 
         // code