EC-CUBE / ec-cube

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

Spacing +3 added lines, -3 removed lines

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

Doc Comments +21 added lines, -1 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
      */
@@ -177,6 +177,10 @@ 
     }
 
     // インストール事後処理
+
+    /**
+     * @param integer $source
+     */
     public function postInstall($config, $event, $source)
     {
         // Proxyのクラスをロードせずにスキーマを更新するために、
@@ -223,6 +227,10 @@ 
         }
     }
 
+    /**
+     * @param string $archive
+     * @param string $dir
+     */
     public function unpackPluginArchive($archive, $dir)
     {
         $extension = pathinfo($archive, PATHINFO_EXTENSION);
@@ -282,6 +290,9 @@ 
         }
     }
 
+    /**
+     * @param string $yml
+     */
     public function readYml($yml)
     {
         if (file_exists($yml)) {
@@ -299,6 +310,9 @@ 
         // ディレクトリ名などに使われれるので厳しめ
     }
 
+    /**
+     * @param string $path
+     */
     public function deleteFile($path)
     {
         $f = new Filesystem();
@@ -318,6 +332,9 @@ 
         return $this->appConfig['plugin_realdir'].'/'.$name;
     }
 
+    /**
+     * @param string $d
+     */
     public function createPluginDir($d)
     {
         $b = @mkdir($d);
@@ -375,6 +392,9 @@ 
         return $p;
     }
 
+    /**
+     * @param string $method
+     */
     public function callPluginManagerMethod($meta, $method)
     {
         $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager';

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