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/Form/Type/Admin/OrderType.php

Spacing +3 added lines, -3 removed lines

@@ -238,7 +238,7 @@ 
                 'class' => 'Eccube\Entity\Master\OrderStatus',
                 'choice_label' => 'name',
                 'placeholder' => '選択してください',
-                'query_builder' => function ($er) {
+                'query_builder' => function($er) {
                     return $er->createQueryBuilder('o')
                         ->orderBy('o.rank', 'ASC');
                 },
@@ -274,7 +274,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)) {
@@ -282,7 +282,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/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/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.product_status'] = function () use ($app) {
+        $app['eccube.repository.master.product_status'] = function() use ($app) {
             return $app['Eccube\Repository\Master\ProductStatusRepository'];
         };
-        $app['eccube.repository.master.sale_type'] = function () use ($app) {
+        $app['eccube.repository.master.sale_type'] = function() use ($app) {
             return $app['Eccube\Repository\Master\SaleTypeRepository'];
         };
-        $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'] = function () use ($app) {
+        $app['eccube.repository.page'] = function() use ($app) {
             return $app['Eccube\Repository\PageRepository'];
         };
-        $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.order_item'] = function () use ($app) {
+        $app['eccube.repository.order_item'] = function() use ($app) {
             return $app['Eccube\Repository\OrderItemRepository'];
         };
-        $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'];
         };
     }

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']);