EC-CUBE / ec-cube

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.product_type'] = function () use ($app) {
+        $app['eccube.repository.master.product_type'] = function() use ($app) {
             return $app['Eccube\Repository\Master\ProductTypeRepository'];
         };
-        $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/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/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\OrderItem;
-use Eccube\Entity\Shipping;
 use Eccube\Repository\Master\OrderItemTypeRepository;
 use Eccube\Service\Calculator\OrderItemCollection;
 

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

Spacing +2 added lines, -2 removed lines

@@ -256,7 +256,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)) {
@@ -264,7 +264,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/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 +26 added lines

@@ -91,6 +91,10 @@ 
     const EVENT_YML = 'event.yml';
 
     // ファイル指定してのプラグインインストール
+
+    /**
+     * @param string $path
+     */
     public function install($path, $source = 0)
     {
         $pluginBaseDir = null;
@@ -139,6 +143,10 @@ 
     }
 
     // インストール事後処理
+
+    /**
+     * @param integer $source
+     */
     public function postInstall($config, $event, $source)
     {
         // Proxyのクラスをロードせずにスキーマを更新するために、
@@ -185,6 +193,9 @@ 
         }
     }
 
+    /**
+     * @param string $dir
+     */
     public function unpackPluginArchive($archive, $dir)
     {
         $extension = pathinfo($archive, PATHINFO_EXTENSION);
@@ -244,6 +255,9 @@ 
         }
     }
 
+    /**
+     * @param string $yml
+     */
     public function readYml($yml)
     {
         if (file_exists($yml)) {
@@ -261,6 +275,9 @@ 
         // ディレクトリ名などに使われれるので厳しめ
     }
 
+    /**
+     * @param string $path
+     */
     public function deleteFile($path)
     {
         $f = new Filesystem();
@@ -280,6 +297,9 @@ 
         return $this->appConfig['plugin_realdir'].'/'.$name;
     }
 
+    /**
+     * @param string $d
+     */
     public function createPluginDir($d)
     {
         $b = @mkdir($d);
@@ -337,6 +357,9 @@ 
         return $p;
     }
 
+    /**
+     * @param string $method
+     */
     public function callPluginManagerMethod($meta, $method)
     {
         $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager';
@@ -453,6 +476,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $path
+     */
     public function update(\Eccube\Entity\Plugin $plugin, $path)
     {
         $pluginBaseDir = null;

Spacing +2 added lines, -2 removed lines

@@ -143,7 +143,7 @@ 
     {
         // Proxyのクラスをロードせずにスキーマを更新するために、
         // インストール時には一時的なディレクトリにProxyを生成する
-        $tmpProxyOutputDir = sys_get_temp_dir() . '/proxy_' . Str::random(12);
+        $tmpProxyOutputDir = sys_get_temp_dir().'/proxy_'.Str::random(12);
         @mkdir($tmpProxyOutputDir);
 
         try {
@@ -209,7 +209,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);

src/Eccube/Doctrine/ORM/Mapping/Driver/ReloadSafeAnnotationDriver.php

Spacing +7 added lines, -7 removed lines

@@ -72,7 +72,7 @@ 
         }
 
         foreach ($this->paths as $path) {
-            if ( ! is_dir($path)) {
+            if (!is_dir($path)) {
                 throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
             }
 
@@ -81,14 +81,14 @@ 
                     new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS),
                     \RecursiveIteratorIterator::LEAVES_ONLY
                 ),
-                '/^.+' . preg_quote($this->fileExtension) . '$/i',
+                '/^.+'.preg_quote($this->fileExtension).'$/i',
                 \RecursiveRegexIterator::GET_MATCH
             );
 
             foreach ($iterator as $file) {
                 $sourceFile = $file[0];
 
-                if ( ! preg_match('(^phar:)i', $sourceFile)) {
+                if (!preg_match('(^phar:)i', $sourceFile)) {
                     $sourceFile = realpath($sourceFile);
                 }
 
@@ -133,15 +133,15 @@ 
                     $namespaceEndIndex = $tokens->getNextTokenOfKind($namespaceIndex, [';']);
                     $namespace = $tokens->generatePartialCode($tokens->getNextMeaningfulToken($namespaceIndex), $tokens->getPrevMeaningfulToken($namespaceEndIndex));
                     $className = $tokens[$classNameTokenIndex]->getContent();
-                    $fqcn = $namespace . '\\' . $className;
-                    if (class_exists($fqcn) && ! $this->isTransient($fqcn)) {
+                    $fqcn = $namespace.'\\'.$className;
+                    if (class_exists($fqcn) && !$this->isTransient($fqcn)) {
                         if (in_array($sourceFile, $this->newProxyFiles)) {
-                            $newClassName = $className . Str::random(12);
+                            $newClassName = $className.Str::random(12);
                             $tokens[$classNameTokenIndex] = new Token([T_STRING, $newClassName]);
                             $newFilePath = $this->outputDir."${newClassName}.php";
                             file_put_contents($newFilePath, $tokens->generateCode());
                             require_once $newFilePath;
-                            $results[] = $namespace . "\\${newClassName}";
+                            $results[] = $namespace."\\${newClassName}";
                         } else {
                             $results[] = $fqcn;
                         }

src/Eccube/Controller/Admin/Setting/Shop/DeliveryController.php

Unused Use Statements -1 removed lines

@@ -27,7 +27,6 @@
 use Doctrine\ORM\EntityManager;
 use Eccube\Annotation\Inject;
 use Eccube\Application;
-use Eccube\Common\Constant;
 use Eccube\Controller\AbstractController;
 use Eccube\Entity\Delivery;
 use Eccube\Event\EccubeEvents;