EC-CUBE / ec-cube

src/Eccube/DI/AutoWiring/RepositoryDefinition.php

Spacing +3 added lines, -3 removed lines

@@ -58,9 +58,9 @@
 
         // 同じパッケージのEntityがあれば返す
         if (count($partsOfFqcn) > 2) {
-            $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn)-2));
-            $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) -1]);
-            $result = $parentNamespace . '\\Entity\\' . $entityName;
+            $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn) - 2));
+            $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) - 1]);
+            $result = $parentNamespace.'\\Entity\\'.$entityName;
             if (class_exists($result)) {
                 return $result;
             }

src/Eccube/ServiceProvider/PurchaseFlowServiceProvider.php

Spacing +12 added lines, -12 removed lines

@@ -17,11 +17,11 @@ 
 {
     public function register(Container $app)
     {
-        $app['eccube.purchase.context'] = $app->protect(function (ItemHolderInterface $origin = null, Customer $user = null) {
+        $app['eccube.purchase.context'] = $app->protect(function(ItemHolderInterface $origin = null, Customer $user = null) {
             return new PurchaseContext($origin, $user);
         });
 
-        $app['eccube.purchase.flow.cart.item_processors'] = function (Container $app) {
+        $app['eccube.purchase.flow.cart.item_processors'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\DisplayStatusValidator();
             $processors[] = new Processor\SaleLimitValidator();
@@ -31,7 +31,7 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.cart.holder_processors'] = function (Container $app) {
+        $app['eccube.purchase.flow.cart.holder_processors'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\PaymentProcessor($app[DeliveryRepository::class]);
             $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']);
@@ -41,7 +41,7 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.cart'] = function (Container $app) {
+        $app['eccube.purchase.flow.cart'] = function(Container $app) {
             $flow = new PurchaseFlow();
             $flow->setItemProcessors($app['eccube.purchase.flow.cart.item_processors']);
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.cart.holder_processors']);
@@ -49,7 +49,7 @@ 
             return $flow;
         };
 
-        $app['eccube.purchase.flow.shopping.item_processors'] = function (Container $app) {
+        $app['eccube.purchase.flow.shopping.item_processors'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\StockValidator();
             $processors[] = new Processor\DisplayStatusValidator();
@@ -57,7 +57,7 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.shopping.holder_processors'] = function (Container $app) {
+        $app['eccube.purchase.flow.shopping.holder_processors'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']);
             $processors[] = new Processor\DeliveryFeeProcessor($app['orm.em']);
@@ -71,7 +71,7 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.shopping.purchase'] = function (Container $app) {
+        $app['eccube.purchase.flow.shopping.purchase'] = function(Container $app) {
             $processors = new ArrayCollection();
             if ($app[BaseInfo::class]->isOptionPoint()) {
                 $processors[] = new Processor\UsePointToCustomerPurchaseProcessor();
@@ -80,7 +80,7 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.shopping'] = function (Container $app) {
+        $app['eccube.purchase.flow.shopping'] = function(Container $app) {
             $flow = new PurchaseFlow();
             $flow->setItemProcessors($app['eccube.purchase.flow.shopping.item_processors']);
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.shopping.holder_processors']);
@@ -89,14 +89,14 @@ 
             return $flow;
         };
 
-        $app['eccube.purchase.flow.order.item_processors'] = function (Container $app) {
+        $app['eccube.purchase.flow.order.item_processors'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\StockValidator();
 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.order.holder_processors'] = function (Container $app) {
+        $app['eccube.purchase.flow.order.holder_processors'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']);
             $processors[] = new Processor\UpdateDatePurchaseProcessor($app['config']);
@@ -109,14 +109,14 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.order.purchase'] = function (Container $app) {
+        $app['eccube.purchase.flow.order.purchase'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\AdminOrderRegisterPurchaseProcessor($app);
 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.order'] = function (Container $app) {
+        $app['eccube.purchase.flow.order'] = function(Container $app) {
             $flow = new PurchaseFlow();
             $flow->setItemProcessors($app['eccube.purchase.flow.order.item_processors']);
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.order.holder_processors']);

src/Eccube/Service/MailService.php

Spacing +9 added lines, -9 removed lines

@@ -79,7 +79,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -120,7 +120,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録が完了しました。')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録が完了しました。')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -162,7 +162,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 退会手続きのご完了')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 退会手続きのご完了')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($email))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -205,7 +205,7 @@ 
 
         // 問い合わせ者にメール送信
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] お問い合わせを受け付けました。')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] お問い合わせを受け付けました。')
             ->setFrom(array($this->BaseInfo->getEmail02() => $this->BaseInfo->getShopName()))
             ->setTo(array($formData['email']))
             ->setBcc($this->BaseInfo->getEmail02())
@@ -262,7 +262,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $MailTemplate->getMailSubject())
+            ->setSubject('['.$this->BaseInfo->getShopName().'] '.$MailTemplate->getMailSubject())
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Order->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -306,7 +306,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認')
             ->setFrom(array($this->BaseInfo->getEmail03() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -350,7 +350,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $formData['mail_subject'])
+            ->setSubject('['.$this->BaseInfo->getShopName().'] '.$formData['mail_subject'])
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Order->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -391,7 +391,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のご確認')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のご確認')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -432,7 +432,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のお知らせ')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のお知らせ')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())

src/Eccube/Service/ShoppingService.php

Spacing +1 added lines, -1 removed lines

@@ -952,7 +952,7 @@
 
         // 配送日数が設定されている
         if ($deliveryDurationFlag) {
-            $period = new \DatePeriod (
+            $period = new \DatePeriod(
                 new \DateTime($minDate.' day'),
                 new \DateInterval('P1D'),
                 new \DateTime($minDate + $this->appConfig['deliv_date_end_max'].' day')

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

Spacing +4 added lines, -4 removed lines

@@ -67,7 +67,7 @@ 
         // 配送業者のプルダウンを生成
         $builder->addEventListener(
             FormEvents::PRE_SET_DATA,
-            function (FormEvent $event) {
+            function(FormEvent $event) {
                 /* @var Shipping $Shipping */
                 $Shipping = $event->getData();
                 if (is_null($Shipping) || !$Shipping->getId()) {
@@ -109,7 +109,7 @@ 
         // お届け日のプルダウンを生成
         $builder->addEventListener(
             FormEvents::PRE_SET_DATA,
-            function (FormEvent $event) {
+            function(FormEvent $event) {
                 $Shipping = $event->getData();
                 if (is_null($Shipping) || !$Shipping->getId()) {
                     return;
@@ -147,7 +147,7 @@ 
 
                 // 配送日数が設定されている
                 if ($deliveryDurationFlag) {
-                    $period = new \DatePeriod (
+                    $period = new \DatePeriod(
                         new \DateTime($minDate.' day'),
                         new \DateInterval('P1D'),
                         new \DateTime($minDate + $this->appConfig['deliv_date_end_max'].' day')
@@ -175,7 +175,7 @@ 
         // お届け時間のプルダウンを生成
         $builder->addEventListener(
             FormEvents::PRE_SET_DATA,
-            function (FormEvent $event) {
+            function(FormEvent $event) {
                 $Shipping = $event->getData();
                 if (is_null($Shipping) || !$Shipping->getId()) {
                     return;

src/Eccube/Form/Type/MasterType.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
     private $error = null;
     private $encode = '';
 
-    public function __construct(){
+    public function __construct() {
         $this->encode = self::UTF;
         if ('\\' === DIRECTORY_SEPARATOR) {
             $this->encode = self::SJIS;
@@ -111,7 +111,7 @@ 
         $arrFileList = $this->getFileList($app, $nowDir);
 
         $javascript = $this->getJsArrayList($tree);
-        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '" . $nowDir . "', 'tree_select_file', 'tree_status', 'move');";
+        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '".$nowDir."', 'tree_select_file', 'tree_status', 'move');";
 
         return [
             'form' => $form->createView(),
@@ -172,7 +172,7 @@ 
                 $nowDir = $this->checkDir($request->get('now_dir'), $topDir)
                     ? $this->normalizePath($request->get('now_dir'))
                     : $topDir;
-                $fs->mkdir($nowDir . '/' . $filename);
+                $fs->mkdir($nowDir.'/'.$filename);
             }
         }
     }
@@ -257,7 +257,7 @@ 
     {
         $str = "arrTree = new Array();\n";
         foreach ($tree as $key => $val) {
-            $str .= 'arrTree[' . $key . "] = new Array(" . $key . ", '" . $val['type'] . "', '" . $val['path'] . "', " . $val['sort_no'] . ',';
+            $str .= 'arrTree['.$key."] = new Array(".$key.", '".$val['type']."', '".$val['path']."', ".$val['sort_no'].',';
             if ($val['open']) {
                 $str .= "true);\n";
             } else {
@@ -308,7 +308,7 @@ 
     private function getFileList($app, $nowDir)
     {
         $topDir = $this->appConfig['user_data_realdir'];
-        $filter = function (\SplFileInfo $file) use ($topDir) {
+        $filter = function(\SplFileInfo $file) use ($topDir) {
             $acceptPath = realpath($topDir);
             $targetPath = $file->getRealPath();
             return (strpos($targetPath, $acceptPath) === 0);

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

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
                 $entity = new $entityName();
                 $sortNo = 0;
                 $ids = array_map(
-                    function ($v) {
+                    function($v) {
                         return $v['id'];
                     },
                     $data['data']

src/Eccube/Command/CacheClearCommand.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 
         $this->app = $this->getSilexApplication();
         
-        \Eccube\Util\CacheUtil::clear($this->app,$input->getOption('all'));
+        \Eccube\Util\CacheUtil::clear($this->app, $input->getOption('all'));
         $output->writeln(sprintf("%s <info>success</info>", 'cache:clear'));
 
     }