EC-CUBE / ec-cube

src/Eccube/Service/Calculator/Strategy/CalculateDeliveryFeeStrategy.php

Unused Use Statements -4 removed lines

@@ -2,13 +2,9 @@
 namespace Eccube\Service\Calculator\Strategy;
 
 use Eccube\Application;
-use Eccube\Entity\Master\OrderItemType;
-use Eccube\Entity\Master\TaxType;
-use Eccube\Entity\Master\TaxDisplayType;
 use Eccube\Entity\Order;
 use Eccube\Entity\PurchaseInterface;
 use Eccube\Entity\ShipmentItem;
-use Eccube\Entity\Shipping;
 use Eccube\Repository\Master\OrderItemTypeRepository;
 use Eccube\Service\Calculator\ShipmentItemCollection;
 

app/Plugin/PurchaseProcessors/ServiceProvider/PurchaseProcessorsServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     {
         $app->extend(
             'eccube.purchase.flow.cart.item_processors',
-            function (ArrayCollection $processors, Container $app) {
+            function(ArrayCollection $processors, Container $app) {
                 $processors[] = new EmptyProcessor();
                 $processors[] = new ValidatableEmptyProcessor();
                 return $processors;

app/Plugin/FormExtension/ServiceProvider/FormExtensionServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     {
         $app->extend(
             'form.type.extensions',
-            function ($extensions) {
+            function($extensions) {
                 $extensions[] = new EntryTypeExtension();
 
                 return $extensions;

src/Eccube/Service/PurchaseFlow/PurchaseFlow.php

Spacing +6 added lines, -6 removed lines

@@ -104,7 +104,7 @@ 
      */
     protected function calculateTotal(ItemHolderInterface $itemHolder)
     {
-        $total = $itemHolder->getItems()->reduce(function ($sum, ItemInterface $item) {
+        $total = $itemHolder->getItems()->reduce(function($sum, ItemInterface $item) {
             $sum += $item->getPriceIncTax() * $item->getQuantity();
 
             return $sum;
@@ -121,7 +121,7 @@ 
     {
         $total = $itemHolder->getItems()
             ->getProductClasses()
-            ->reduce(function ($sum, ItemInterface $item) {
+            ->reduce(function($sum, ItemInterface $item) {
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
 
                 return $sum;
@@ -140,7 +140,7 @@ 
     {
         $total = $itemHolder->getItems()
             ->getDeliveryFees()
-            ->reduce(function ($sum, ItemInterface $item) {
+            ->reduce(function($sum, ItemInterface $item) {
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
 
                 return $sum;
@@ -155,7 +155,7 @@ 
     {
         $total = $itemHolder->getItems()
             ->getDiscounts()
-            ->reduce(function ($sum, ItemInterface $item) {
+            ->reduce(function($sum, ItemInterface $item) {
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
 
                 return $sum;
@@ -171,7 +171,7 @@ 
     {
         $total = $itemHolder->getItems()
             ->getCharges()
-            ->reduce(function ($sum, ItemInterface $item) {
+            ->reduce(function($sum, ItemInterface $item) {
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
 
                 return $sum;
@@ -185,7 +185,7 @@ 
     protected function calculateTax(ItemHolderInterface $itemHolder)
     {
         $total = $itemHolder->getItems()
-            ->reduce(function ($sum, ItemInterface $item) {
+            ->reduce(function($sum, ItemInterface $item) {
                 $sum += ($item->getPriceIncTax() - $item->getPrice()) * $item->getQuantity();
 
                 return $sum;

src/Eccube/Service/PurchaseFlow/ItemCollection.php

Spacing +7 added lines, -7 removed lines

@@ -31,7 +31,7 @@ 
     public function getProductClasses()
     {
         return $this->filter(
-            function (ItemInterface $ShipmentItem) {
+            function(ItemInterface $ShipmentItem) {
                 return $ShipmentItem->isProduct();
             });
     }
@@ -39,7 +39,7 @@ 
     public function getDeliveryFees()
     {
         return $this->filter(
-            function (ItemInterface $ShipmentItem) {
+            function(ItemInterface $ShipmentItem) {
                 return $ShipmentItem->isDeliveryFee();
             });
     }
@@ -47,7 +47,7 @@ 
     public function getCharges()
     {
         return $this->filter(
-            function (ItemInterface $ShipmentItem) {
+            function(ItemInterface $ShipmentItem) {
                 return $ShipmentItem->isCharge();
             });
     }
@@ -55,7 +55,7 @@ 
     public function getDiscounts()
     {
         return $this->filter(
-            function (ItemInterface $ShipmentItem) {
+            function(ItemInterface $ShipmentItem) {
                 return $ShipmentItem->isDiscount();
             });
     }
@@ -68,7 +68,7 @@ 
     public function hasProductByName($productName)
     {
         $ShipmentItems = $this->filter(
-            function (ItemInterface $ShipmentItem) use ($productName) {
+            function(ItemInterface $ShipmentItem) use ($productName) {
                 /* @var ShipmentItem $ShipmentItem */
                 return $ShipmentItem->getProductName() == $productName;
             });
@@ -85,7 +85,7 @@ 
      */
     public function hasItemByOrderItemType($OrderItemType)
     {
-        $filteredItems = $this->filter(function (ItemInterface $ShipmentItem) use ($OrderItemType) {
+        $filteredItems = $this->filter(function(ItemInterface $ShipmentItem) use ($OrderItemType) {
             /* @var ShipmentItem $ShipmentItem */
             return $ShipmentItem->getOrderItemType() && $ShipmentItem->getOrderItemType()->getId() == $OrderItemType->getId();
         });
@@ -101,7 +101,7 @@ 
     public function sort()
     {
         $Items = $this->toArray();
-        usort($Items, function (ItemInterface $a, ItemInterface $b) {
+        usort($Items, function(ItemInterface $a, ItemInterface $b) {
             if ($a->getOrderItemType() === $b->getOrderItemType()) {
                 return ($a->getId() < $b->getId()) ? -1 : 1;
             } elseif ($a->isProduct()) {

src/Eccube/Service/PurchaseFlow/PurchaseFlowResult.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
      */
     public function getErrors()
     {
-        return array_filter($this->processResults, function (ProcessResult $processResult) {
+        return array_filter($this->processResults, function(ProcessResult $processResult) {
             return $processResult->isError();
         });
     }
@@ -63,7 +63,7 @@ 
      */
     public function getWarning()
     {
-        return array_filter($this->processResults, function (ProcessResult $processResult) {
+        return array_filter($this->processResults, function(ProcessResult $processResult) {
             return $processResult->isWarning();
         });
     }

src/Eccube/Controller/AbstractController.php

Doc Comments +6 added lines

@@ -59,11 +59,17 @@
      */
     protected $formFactory;
 
+    /**
+     * @param \Eccube\Application $app
+     */
     protected function getSecurity($app)
     {
         return $this->tokenStorage;
     }
 
+    /**
+     * @param \Eccube\Application $app
+     */
     protected function isTokenValid($app)
     {
         $csrf = $this->csrfTokenManager;

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

Unused Use Statements -1 removed lines

@@ -41,7 +41,6 @@
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\Finder\Finder;
 use Symfony\Component\Form\FormFactory;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

Spacing +3 added lines, -3 removed lines

@@ -174,7 +174,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();
@@ -182,7 +182,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);
                     }
@@ -239,7 +239,7 @@ 
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
         if ($Block->getDeletableFlg() > 0) {
             $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/Controller/Admin/Content/FileController.php

Doc Comments +11 added lines

@@ -270,6 +270,10 @@ 
         return $str;
     }
 
+    /**
+     * @param string $topDir
+     * @param Request $request
+     */
     private function getTree($topDir, $request)
     {
         $finder = Finder::create()->in($topDir)
@@ -307,6 +311,10 @@ 
         return $tree;
     }
 
+    /**
+     * @param Application $app
+     * @param string $nowDir
+     */
     private function getFileList($app, $nowDir)
     {
         $topDir = $this->appConfig['user_data_realdir'];
@@ -366,6 +374,9 @@ 
         return (strpos($targetDir, $topDir) === 0);
     }
 
+    /**
+     * @return string
+     */
     private function convertStrFromServer($target)
     {
         if ($this->encode == self::SJIS) {

Spacing +5 added lines, -5 removed lines

@@ -64,7 +64,7 @@ 
     private $error = null;
     private $encode = '';
 
-    public function __construct(){
+    public function __construct() {
         $this->encode = self::UTF;
         if ('\\' === DIRECTORY_SEPARATOR) {
             $this->encode = self::SJIS;
@@ -113,7 +113,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(),
@@ -174,7 +174,7 @@ 
                 $nowDir = $this->checkDir($request->get('now_dir'), $topDir)
                     ? $this->normalizePath($request->get('now_dir'))
                     : $topDir;
-                $fs->mkdir($nowDir . '/' . $filename);
+                $fs->mkdir($nowDir.'/'.$filename);
             }
         }
     }
@@ -259,7 +259,7 @@ 
     {
         $str = "arrTree = new Array();\n";
         foreach ($tree as $key => $val) {
-            $str .= 'arrTree[' . $key . "] = new Array(" . $key . ", '" . $val['type'] . "', '" . $val['path'] . "', " . $val['rank'] . ',';
+            $str .= 'arrTree['.$key."] = new Array(".$key.", '".$val['type']."', '".$val['path']."', ".$val['rank'].',';
             if ($val['open']) {
                 $str .= "true);\n";
             } else {
@@ -310,7 +310,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);