EC-CUBE / ec-cube

src/Eccube/Service/TaxRuleService.php

Doc Comments +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
      * @param  int|null|\Eccube\Entity\ProductClass   $productClass 商品規格
      * @param  int|null|\Eccube\Entity\Master\Pref    $pref         都道府県
      * @param  int|null|\Eccube\Entity\Master\Country $country      国
-     * @return int
+     * @return double
      */
     public function getPriceIncTax($price, $product = null, $productClass = null, $pref = null, $country = null)
     {
@@ -92,8 +92,8 @@ 
     /**
      * 課税規則に応じて端数処理を行う
      *
-     * @param  float|integer $value    端数処理を行う数値
-     * @param  integer       $calcRule 課税規則
+     * @param  integer $value    端数処理を行う数値
+     * @param integer $RoundingType
      * @return double        端数処理後の数値
      */
     public function roundByRoundingType($value, $RoundingType)

src/Eccube/Repository/PageRepository.php

Spacing +1 added lines, -1 removed lines

@@ -257,7 +257,7 @@
         }
 
         foreach ($readPaths as $readPath) {
-            $filePath = $readPath . '/' . $fileName . '.twig';
+            $filePath = $readPath.'/'.$fileName.'.twig';
             $fs = new Filesystem();
             if ($fs->exists($filePath)) {
                 return array(

src/Eccube/Service/Calculator/OrderItemCollection.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     public function hasProductByName($productName)
     {
         $OrderItems = $this->filter(
-            function (ItemInterface $OrderItem) use ($productName) {
+            function(ItemInterface $OrderItem) use ($productName) {
                 /* @var OrderItem $OrderItem */
                 return $OrderItem->getProductName() == $productName;
             });

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 $OrderItem) {
+            function(ItemInterface $OrderItem) {
                 return $OrderItem->isProduct();
             });
     }
@@ -39,7 +39,7 @@ 
     public function getDeliveryFees()
     {
         return $this->filter(
-            function (ItemInterface $OrderItem) {
+            function(ItemInterface $OrderItem) {
                 return $OrderItem->isDeliveryFee();
             });
     }
@@ -47,7 +47,7 @@ 
     public function getCharges()
     {
         return $this->filter(
-            function (ItemInterface $OrderItem) {
+            function(ItemInterface $OrderItem) {
                 return $OrderItem->isCharge();
             });
     }
@@ -55,7 +55,7 @@ 
     public function getDiscounts()
     {
         return $this->filter(
-            function (ItemInterface $OrderItem) {
+            function(ItemInterface $OrderItem) {
                 return $OrderItem->isDiscount();
             });
     }
@@ -68,7 +68,7 @@ 
     public function hasProductByName($productName)
     {
         $OrderItems = $this->filter(
-            function (ItemInterface $OrderItem) use ($productName) {
+            function(ItemInterface $OrderItem) use ($productName) {
                 /* @var OrderItem $OrderItem */
                 return $OrderItem->getProductName() == $productName;
             });
@@ -85,7 +85,7 @@ 
      */
     public function hasItemByOrderItemType($OrderItemType)
     {
-        $filteredItems = $this->filter(function (ItemInterface $OrderItem) use ($OrderItemType) {
+        $filteredItems = $this->filter(function(ItemInterface $OrderItem) use ($OrderItemType) {
             /* @var OrderItem $OrderItem */
             return $OrderItem->getOrderItemType() && $OrderItem->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/Form/Type/ShippingMultipleType.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         $app = $this->app;
 
         $builder
-            ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) {
+            ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) {
                 /** @var \Eccube\Entity\OrderItem $data */
                 $data = $event->getData();
                 /** @var \Symfony\Component\Form\Form $form */

src/Eccube/Form/Type/Admin/OrderItemType.php

Spacing +6 added lines, -10 removed lines

@@ -178,7 +178,7 @@ 
         $app = $this->app;
         // XXX price を priceIncTax にセットし直す
         // OrderItem::getTotalPrice でもやっているので、どこか一箇所にまとめたい
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($app) {
                 /** @var \Eccube\Entity\OrderItem $OrderItem */
                 $OrderItem = $event->getData();
                 $TaxDisplayType = $OrderItem->getTaxDisplayType();
@@ -196,7 +196,7 @@ 
 
                 $event->setData($OrderItem);
         });
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
             // モーダルからのPOST時に、金額等をセットする.
             if ('modal' === $this->requestStack->getCurrentRequest()->get('modal')) {
                 $data = $event->getData();
@@ -266,17 +266,13 @@ 
                                 $data['product_name'] = $Product->getName();
                                 $data['product_code'] = $ProductClass->getCode();
                                 $data['class_name1'] = $ProductClass->hasClassCategory1() ?
-                                    $ProductClass->getClassCategory1()->getClassName() :
-                                    null;
+                                    $ProductClass->getClassCategory1()->getClassName() : null;
                                 $data['class_name2'] = $ProductClass->hasClassCategory2() ?
-                                    $ProductClass->getClassCategory2()->getClassName() :
-                                    null;
+                                    $ProductClass->getClassCategory2()->getClassName() : null;
                                 $data['class_category_name1'] = $ProductClass->hasClassCategory1() ?
-                                    $ProductClass->getClassCategory1()->getName() :
-                                    null;
+                                    $ProductClass->getClassCategory1()->getName() : null;
                                 $data['class_category_name2'] = $ProductClass->hasClassCategory2() ?
-                                    $ProductClass->getClassCategory2()->getName() :
-                                    null;
+                                    $ProductClass->getClassCategory2()->getName() : null;
                                 $data['price'] = $ProductClass->getPrice02();
                                 $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];
                                 $data['tax_type'] = TaxType::TAXATION;

src/Eccube/Form/Type/Admin/PageType.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
                 'label' => false,
                 'class' => 'Eccube\Entity\Page',
                 'choice_label' => 'name',
-                'query_builder' => function (EntityRepository $er) {
+                'query_builder' => function(EntityRepository $er) {
                     return $er
                         ->createQueryBuilder('l')
                         ->where('l.id <> 0')

src/Eccube/Service/PluginService.php

Unused Use Statements -1 removed lines

@@ -31,7 +31,6 @@
 use Eccube\Common\Constant;
 use Eccube\Entity\Plugin;
 use Eccube\Exception\PluginException;
-use Eccube\Plugin\ConfigManager;
 use Eccube\Plugin\ConfigManager as PluginConfigManager;
 use Eccube\Repository\PluginEventHandlerRepository;
 use Eccube\Repository\PluginRepository;

Doc Comments +22 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
      *
      * @param string $path   path to tar.gz/zip plugin file
      * @param int    $source
-     * @return mixed
+     * @return boolean
      * @throws PluginException
      * @throws \Exception
      */
@@ -179,6 +179,10 @@ 
     }
 
     // インストール事後処理
+
+    /**
+     * @param integer $source
+     */
     public function postInstall($config, $event, $source)
     {
         // Proxyのクラスをロードせずにスキーマを更新するために、
@@ -225,6 +229,10 @@ 
         }
     }
 
+    /**
+     * @param string $archive
+     * @param string $dir
+     */
     public function unpackPluginArchive($archive, $dir)
     {
         $extension = pathinfo($archive, PATHINFO_EXTENSION);
@@ -284,6 +292,9 @@ 
         }
     }
 
+    /**
+     * @param string $yml
+     */
     public function readYml($yml)
     {
         if (file_exists($yml)) {
@@ -301,6 +312,9 @@ 
         // ディレクトリ名などに使われれるので厳しめ
     }
 
+    /**
+     * @param string $path
+     */
     public function deleteFile($path)
     {
         $f = new Filesystem();
@@ -320,6 +334,9 @@ 
         return $this->appConfig['plugin_realdir'].'/'.$name;
     }
 
+    /**
+     * @param string $d
+     */
     public function createPluginDir($d)
     {
         $b = @mkdir($d);
@@ -377,6 +394,9 @@ 
         return $p;
     }
 
+    /**
+     * @param string $method
+     */
     public function callPluginManagerMethod($meta, $method)
     {
         $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager';
@@ -873,7 +893,7 @@ 
      * [プラグインコード]/Resource/assets
      * 配下に置かれているファイルが所定の位置へコピーされる
      *
-     * @param $pluginBaseDir
+     * @param string $pluginBaseDir
      * @param $pluginCode
      */
     public function copyAssets($pluginBaseDir, $pluginCode)

Spacing +3 added lines, -3 removed lines

@@ -181,7 +181,7 @@ 
     {
         // Proxyのクラスをロードせずにスキーマを更新するために、
         // インストール時には一時的なディレクトリにProxyを生成する
-        $tmpProxyOutputDir = sys_get_temp_dir() . '/proxy_' . StringUtil::random(12);
+        $tmpProxyOutputDir = sys_get_temp_dir().'/proxy_'.StringUtil::random(12);
         @mkdir($tmpProxyOutputDir);
 
         try {
@@ -247,7 +247,7 @@ 
             if (!empty($config_cache)) {
                 $meta = $config_cache;
             } else {
-                $meta = $this->readYml($dir . '/config.yml');
+                $meta = $this->readYml($dir.'/config.yml');
             }
         } catch (\Symfony\Component\Yaml\Exception\ParseException $e) {
             throw new PluginException($e->getMessage(), $e->getCode(), $e);
@@ -856,7 +856,7 @@ 
     {
         $result = array_keys($packages);
         if ($getVersion) {
-            $result = array_map(function ($package, $version) {
+            $result = array_map(function($package, $version) {
                 return $package.':'.$version;
             }, array_keys($packages), array_values($packages));
         }

src/Eccube/Controller/Install/InstallController.php

Doc Comments +3 added lines

@@ -420,6 +420,9 @@
         $session->set('eccube.session.install', $data);
     }
 
+    /**
+     * @param InstallApplication $app
+     */
     private function checkModules($app)
     {
         foreach ($this->requiredModules as $module) {

Spacing +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
 
                 // ロードバランサ, プロキシサーバ
                 if (!empty($config['trusted_proxies_connection_only'])) {
-                    $sessionData['trusted_proxies_connection_only'] = (bool)$config['trusted_proxies_connection_only'];
+                    $sessionData['trusted_proxies_connection_only'] = (bool) $config['trusted_proxies_connection_only'];
                 }
                 if (!empty($config['trusted_proxies'])) {
                     $sessionData['trusted_proxies'] = StringUtil::convertLineFeed(implode("\n",