EC-CUBE / ec-cube

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

Spacing +3 added lines, -3 removed lines

@@ -171,7 +171,7 @@ 
                 // ファイル生成・更新
                 $tplDir = $this->appConfig['block_realdir'];
 
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
 
                 $fs = new Filesystem();
                 $blockData = $form->get('block_html')->getData();
@@ -179,7 +179,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);
                     }
@@ -236,7 +236,7 @@ 
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
         if ($Block->isDeletable()) {
             $tplDir = $this->appConfig['block_realdir'];
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
             $fs = new Filesystem();
             if ($fs->exists($file)) {
                 $fs->remove($file);

src/Eccube/DI/AutoWiring/RepositoryDefinition.php

Doc Comments +3 added lines, -3 removed lines

@@ -32,9 +32,9 @@
 
     /**
      * RepositoryDefinition constructor.
-     * @param $id
-     * @param $refClass
-     * @param $entityClass
+     * @param string $id
+     * @param \ReflectionClass $refClass
+     * @param string $entityClass
      */
     public function __construct($id, $refClass, $entityClass)
     {

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/Service/Composer/OutputParser.php

Doc Comments +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 
     /**
      * @param $rowArray
-     * @param $key
+     * @param string $key
      * @return array
      */
     private static function parseArrayInfoOutput($rowArray, $key)

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
         $installedLogs = array_filter(
             array_map(
-                function ($line) {
+                function($line) {
                     $matches = array();
                     preg_match('/^  - Installing (.*?) \((.*?)\) .*/', $line, $matches);
 
@@ -62,7 +62,7 @@ 
     public static function parseInfo($output)
     {
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
-        $infoLogs = array_filter(array_map(function ($line) {
+        $infoLogs = array_filter(array_map(function($line) {
             $matches = array();
             preg_match('/^(name|descrip.|keywords|versions|type|license|source|dist|names)\s*:\s*(.*)$/', $line, $matches);
 
@@ -86,7 +86,7 @@ 
     public static function parseConfig($output)
     {
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
-        $rowArray = array_filter($rowArray, function ($line) {
+        $rowArray = array_filter($rowArray, function($line) {
             return !preg_match('/^<warning>.*/', $line);
         });
 
@@ -102,7 +102,7 @@ 
     public static function parseList($output)
     {
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
-        $rawConfig = array_map(function ($line) {
+        $rawConfig = array_map(function($line) {
             $matches = array();
             preg_match('/^\[(.*?)\]\s?(.*)$/', $line, $matches);
 
@@ -159,7 +159,7 @@ 
     public static function parseComposerVersion($output)
     {
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
-        $rowArray = array_filter($rowArray, function ($line) {
+        $rowArray = array_filter($rowArray, function($line) {
             return preg_match('/^Composer */', $line);
         });
         return array_shift($rowArray);

src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php

Unused Use Statements -6 removed lines

@@ -27,12 +27,6 @@
 use Eccube\Annotation\Inject;
 use Eccube\Entity\BaseInfo;
 use Eccube\Entity\ItemHolderInterface;
-use Eccube\Entity\Master\OrderItemType;
-use Eccube\Entity\Master\TaxDisplayType;
-use Eccube\Entity\Master\TaxType;
-use Eccube\Entity\Order;
-use Eccube\Entity\OrderItem;
-use Eccube\Entity\Shipping;
 use Eccube\Service\PurchaseFlow\ItemHolderProcessor;
 use Eccube\Service\PurchaseFlow\ProcessResult;
 use Eccube\Service\PurchaseFlow\PurchaseContext;

Doc Comments +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
      * @param integer $pointRate ポイント付与率(%)
      * @param integer $price 単価
      * @param integer $quantity 数量
-     * @return integer additional point
+     * @return double additional point
      */
     protected function priceToAddPoint($pointRate, $price, $quantity)
     {

src/Eccube/Service/PurchaseFlow/Processor/UsePointProcessor.php

Unused Use Statements -2 removed lines

@@ -11,11 +11,9 @@
 use Eccube\Entity\BaseInfo;
 use Eccube\Entity\Order;
 use Eccube\Entity\OrderItem;
-use Eccube\Entity\Shipping;
 use Eccube\Service\PurchaseFlow\ItemHolderProcessor;
 use Eccube\Service\PurchaseFlow\ProcessResult;
 use Eccube\Service\PurchaseFlow\PurchaseContext;
-use Eccube\Util\EntityUtil;
 
 /**
  * 使用ポイント値引明細追加.

src/Eccube/Repository/DeliveryRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
     /**
      * @deprecated 呼び出し元で制御する
-     * @param $id
+     * @param integer $id
      * @return Delivery|null|object
      */
     public function findOrCreate($id)

src/Eccube/Repository/NewsRepository.php

Indentation +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
      */
     public function delete($News)
     {
-       $this->createQueryBuilder('n')
+        $this->createQueryBuilder('n')
             ->update()
             ->set('n.sort_no', 'n.sort_no - 1')
             ->where('n.sort_no > :sort_no')

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