EC-CUBE / ec-cube

src/Eccube/Controller/Admin/Product/ProductClassController.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
                     $class2Valied = $this->isValiedCategory($ClassName2);
 
                     // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示
-                    if($class1Valied && $class2Valied){
+                    if ($class1Valied && $class2Valied) {
                         $hasClassCategoryFlg = true;
                     }
 

src/Eccube/Controller/Admin/AdminController.php

Spacing +3 added lines, -3 removed lines

@@ -65,12 +65,12 @@ 
     {
         // install.phpのチェック.
         if (isset($app['config']['eccube_install']) && $app['config']['eccube_install'] == 1) {
-            $file = $app['config']['root_dir'] . '/html/install.php';
+            $file = $app['config']['root_dir'].'/html/install.php';
             if (file_exists($file)) {
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'html/install.php'));
                 $app->addWarning($message, 'admin');
             }
-            $fileOnRoot = $app['config']['root_dir'] . '/install.php';
+            $fileOnRoot = $app['config']['root_dir'].'/install.php';
             if (file_exists($fileOnRoot)) {
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php'));
                 $app->addWarning($message, 'admin');
@@ -311,7 +311,7 @@ 
                     t1.status
                 ORDER BY
                     t1.status';
-        $rsm = new ResultSetMapping();;
+        $rsm = new ResultSetMapping(); ;
         $rsm->addScalarResult('status', 'status');
         $rsm->addScalarResult('count', 'count');
         $query = $em->createNativeQuery($sql, $rsm);

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

Spacing +5 added lines, -9 removed lines

@@ -110,7 +110,7 @@ 
                 )));
 
         $app = $this->app;
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
             // モーダルからのPOST時に、金額等をセットする.
             if ('modal' === $app['request']->get('modal')) {
                 $data = $event->getData();
@@ -127,17 +127,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['tax_rule'] = $TaxRule->getCalcRule()->getId();
                     $data['price'] = $ProductClass->getPrice02();
                     $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];

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

Spacing +5 added lines, -9 removed lines

@@ -110,7 +110,7 @@ 
                 )));
 
         $app = $this->app;
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
             // モーダルからのPOST時に、金額等をセットする.
             if ('modal' === $app['request']->get('modal')) {
                 $data = $event->getData();
@@ -127,17 +127,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['tax_rule'] = $TaxRule->getCalcRule()->getId();
                     $data['price'] = $ProductClass->getPrice02();
                     $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];

src/Eccube/Controller/Admin/Setting/System/MasterdataController.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
                 $entityName = str_replace('-', '\\', $data['masterdata_name']);
                 $entity = new $entityName();
                 $rank = 0;
-                $ids = array_map(function ($v) {return $v['id'];}, $data['data']);
+                $ids = array_map(function($v) {return $v['id']; }, $data['data']);
                 foreach ($data['data'] as $key => $value) {
                     if ($value['id'] !== null && $value['name'] !== null) {
                         $entity->setId($value['id']);

src/Eccube/Service/CsvImportService.php

Spacing +5 added lines, -5 removed lines

@@ -117,9 +117,9 @@ 
 
         $this->file = $file;
         $this->file->setFlags(
-            \SplFileObject::READ_CSV |
-            \SplFileObject::SKIP_EMPTY |
-            \SplFileObject::READ_AHEAD |
+            \SplFileObject::READ_CSV|
+            \SplFileObject::SKIP_EMPTY|
+            \SplFileObject::READ_AHEAD|
             \SplFileObject::DROP_NEW_LINE
         );
         $this->file->setCsvControl(
@@ -362,7 +362,7 @@ 
             if ($count > 1) {
                 $incrementedHeaders[] = $header;
                 for ($i = 1; $i < $count; $i++) {
-                    $incrementedHeaders[] = $header . $i;
+                    $incrementedHeaders[] = $header.$i;
                 }
             } else {
                 $incrementedHeaders[] = $header;
@@ -413,7 +413,7 @@ 
     protected function convertEncodingRows($row) {
         if ('\\' === DIRECTORY_SEPARATOR && PHP_VERSION_ID >= 70000) {
             foreach ($row as &$col) {
-                $col = mb_convert_encoding($col , 'UTF-8', 'SJIS-win');
+                $col = mb_convert_encoding($col, 'UTF-8', 'SJIS-win');
             }
         }
         return $row;

src/Eccube/ServiceProvider/EccubeServiceProvider.php

Spacing +59 added lines, -59 removed lines

@@ -41,28 +41,28 @@ 
     public function register(BaseApplication $app)
     {
         // Service
-        $app['eccube.service.system'] = $app->share(function () use ($app) {
+        $app['eccube.service.system'] = $app->share(function() use ($app) {
             return new \Eccube\Service\SystemService($app);
         });
-        $app['view'] = $app->share(function () use ($app) {
+        $app['view'] = $app->share(function() use ($app) {
             return $app['twig'];
         });
-        $app['eccube.service.cart'] = $app->share(function () use ($app) {
+        $app['eccube.service.cart'] = $app->share(function() use ($app) {
             return new \Eccube\Service\CartService($app);
         });
-        $app['eccube.service.order'] = $app->share(function () use ($app) {
+        $app['eccube.service.order'] = $app->share(function() use ($app) {
             return new \Eccube\Service\OrderService($app);
         });
-        $app['eccube.service.tax_rule'] = $app->share(function () use ($app) {
+        $app['eccube.service.tax_rule'] = $app->share(function() use ($app) {
             return new \Eccube\Service\TaxRuleService($app['eccube.repository.tax_rule']);
         });
-        $app['eccube.service.plugin'] = $app->share(function () use ($app) {
+        $app['eccube.service.plugin'] = $app->share(function() use ($app) {
             return new \Eccube\Service\PluginService($app);
         });
-        $app['eccube.service.mail'] = $app->share(function () use ($app) {
+        $app['eccube.service.mail'] = $app->share(function() use ($app) {
             return new \Eccube\Service\MailService($app);
         });
-        $app['eccube.service.csv.export'] = $app->share(function () use ($app) {
+        $app['eccube.service.csv.export'] = $app->share(function() use ($app) {
             $csvService = new \Eccube\Service\CsvExportService();
             $csvService->setEntityManager($app['orm.em']);
             $csvService->setConfig($app['config']);
@@ -74,173 +74,173 @@ 
 
             return $csvService;
         });
-        $app['eccube.service.shopping'] = $app->share(function () use ($app) {
+        $app['eccube.service.shopping'] = $app->share(function() use ($app) {
             return new \Eccube\Service\ShoppingService($app, $app['eccube.service.cart'], $app['eccube.service.order']);
         });
 
         // Repository
-        $app['eccube.repository.master.authority'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.authority'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Authority');
         });
-        $app['eccube.repository.master.tag'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.tag'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Tag');
         });
-        $app['eccube.repository.master.pref'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.pref'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Pref');
         });
-        $app['eccube.repository.master.sex'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.sex'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Sex');
         });
-        $app['eccube.repository.master.disp'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.disp'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Disp');
         });
-        $app['eccube.repository.master.product_type'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.product_type'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductType');
         });
-        $app['eccube.repository.master.page_max'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.page_max'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\PageMax');
         });
-        $app['eccube.repository.master.order_status'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.order_status'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus');
         });
-        $app['eccube.repository.master.device_type'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.device_type'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\DeviceType');
         });
-        $app['eccube.repository.master.csv_type'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.csv_type'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\CsvType');
         });
 
-        $app['eccube.repository.delivery'] = $app->share(function () use ($app) {
+        $app['eccube.repository.delivery'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Delivery');
         });
-        $app['eccube.repository.delivery_date'] = $app->share(function () use ($app) {
+        $app['eccube.repository.delivery_date'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryDate');
         });
-        $app['eccube.repository.delivery_fee'] = $app->share(function () use ($app) {
+        $app['eccube.repository.delivery_fee'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryFee');
         });
-        $app['eccube.repository.delivery_time'] = $app->share(function () use ($app) {
+        $app['eccube.repository.delivery_time'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryTime');
         });
-        $app['eccube.repository.payment'] = $app->share(function () use ($app) {
+        $app['eccube.repository.payment'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Payment');
         });
-        $app['eccube.repository.payment_option'] = $app->share(function () use ($app) {
+        $app['eccube.repository.payment_option'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\PaymentOption');
         });
-        $app['eccube.repository.category'] = $app->share(function () use ($app) {
+        $app['eccube.repository.category'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Category');
         });
-        $app['eccube.repository.customer'] = $app->share(function () use ($app) {
+        $app['eccube.repository.customer'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Customer');
         });
-        $app['eccube.repository.news'] = $app->share(function () use ($app) {
+        $app['eccube.repository.news'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\News');
         });
-        $app['eccube.repository.mail_history'] = $app->share(function () use ($app) {
+        $app['eccube.repository.mail_history'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\MailHistory');
         });
-        $app['eccube.repository.member'] = $app->share(function () use ($app) {
+        $app['eccube.repository.member'] = $app->share(function() use ($app) {
             $memberRepository = $app['orm.em']->getRepository('Eccube\Entity\Member');
             $memberRepository->setEncoderFactorty($app['security.encoder_factory']);
             return $memberRepository;
         });
-        $app['eccube.repository.order'] = $app->share(function () use ($app) {
+        $app['eccube.repository.order'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Order');
         });
-        $app['eccube.repository.product'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product'] = $app->share(function() use ($app) {
             $productRepository = $app['orm.em']->getRepository('Eccube\Entity\Product');
             return $productRepository;
         });
-        $app['eccube.repository.product_image'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product_image'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductImage');
         });
-        $app['eccube.repository.product_class'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product_class'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductClass');
         });
-        $app['eccube.repository.product_stock'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product_stock'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductStock');
         });
-        $app['eccube.repository.product_tag'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product_tag'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductTag');
         });
-        $app['eccube.repository.class_name'] = $app->share(function () use ($app) {
+        $app['eccube.repository.class_name'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ClassName');
         });
-        $app['eccube.repository.class_category'] = $app->share(function () use ($app) {
+        $app['eccube.repository.class_category'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ClassCategory');
         });
-        $app['eccube.repository.customer_favorite_product'] = $app->share(function () use ($app) {
+        $app['eccube.repository.customer_favorite_product'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\CustomerFavoriteProduct');
         });
-        $app['eccube.repository.base_info'] = $app->share(function () use ($app) {
+        $app['eccube.repository.base_info'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\BaseInfo');
         });
-        $app['eccube.repository.tax_rule'] = $app->share(function () use ($app) {
+        $app['eccube.repository.tax_rule'] = $app->share(function() use ($app) {
             $taxRuleRepository = $app['orm.em']->getRepository('Eccube\Entity\TaxRule');
             $taxRuleRepository->setApplication($app);
 
             return $taxRuleRepository;
         });
-        $app['eccube.repository.page_layout'] = $app->share(function () use ($app) {
+        $app['eccube.repository.page_layout'] = $app->share(function() use ($app) {
             $pageLayoutRepository = $app['orm.em']->getRepository('Eccube\Entity\PageLayout');
             $pageLayoutRepository->setApplication($app);
 
             return $pageLayoutRepository;
         });
-        $app['eccube.repository.block'] = $app->share(function () use ($app) {
+        $app['eccube.repository.block'] = $app->share(function() use ($app) {
             $blockRepository = $app['orm.em']->getRepository('Eccube\Entity\Block');
             $blockRepository->setApplication($app);
 
             return $blockRepository;
         });
-        $app['eccube.repository.order'] = $app->share(function () use ($app) {
+        $app['eccube.repository.order'] = $app->share(function() use ($app) {
             $orderRepository = $app['orm.em']->getRepository('Eccube\Entity\Order');
             $orderRepository->setApplication($app);
 
             return $orderRepository;
         });
-        $app['eccube.repository.customer_address'] = $app->share(function () use ($app) {
+        $app['eccube.repository.customer_address'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\CustomerAddress');
         });
-        $app['eccube.repository.shipping'] = $app->share(function () use ($app) {
+        $app['eccube.repository.shipping'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Shipping');
         });
-        $app['eccube.repository.customer_status'] = $app->share(function () use ($app) {
+        $app['eccube.repository.customer_status'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\CustomerStatus');
         });
-        $app['eccube.repository.order_status'] = $app->share(function () use ($app) {
+        $app['eccube.repository.order_status'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus');
         });
-        $app['eccube.repository.mail_template'] = $app->share(function () use ($app) {
+        $app['eccube.repository.mail_template'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\MailTemplate');
         });
-        $app['eccube.repository.csv'] = $app->share(function () use ($app) {
+        $app['eccube.repository.csv'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Csv');
         });
-        $app['eccube.repository.template'] = $app->share(function () use ($app) {
+        $app['eccube.repository.template'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Template');
         });
-        $app['eccube.repository.authority_role'] = $app->share(function () use ($app) {
+        $app['eccube.repository.authority_role'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\AuthorityRole');
         });
 
-        $app['paginator'] = $app->protect(function () {
+        $app['paginator'] = $app->protect(function() {
             return new \Knp\Component\Pager\Paginator();
         });
 
-        $app['eccube.repository.help'] = $app->share(function () use ($app) {
+        $app['eccube.repository.help'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Help');
         });
-        $app['eccube.repository.plugin'] = $app->share(function () use ($app) {
+        $app['eccube.repository.plugin'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Plugin');
         });
-        $app['eccube.repository.plugin_event_handler'] = $app->share(function () use ($app) {
+        $app['eccube.repository.plugin_event_handler'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\PluginEventHandler');
         });
         // em
         if (isset($app['orm.em'])) {
-            $app['orm.em'] = $app->share($app->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
+            $app['orm.em'] = $app->share($app->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
                 // tax_rule
                 $taxRuleRepository = $em->getRepository('Eccube\Entity\TaxRule');
                 $taxRuleRepository->setApplication($app);
@@ -263,13 +263,13 @@ 
         }
 
         // Form\Type
-        $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function ($extensions) use ($app) {
+        $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function($extensions) use ($app) {
             $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension();
             $extensions[] = new \Eccube\Form\Extension\FreezeTypeExtension();
 
             return $extensions;
         }));
-        $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) {
+        $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) {
             $types[] = new \Eccube\Form\Type\NameType($app['config']);
             $types[] = new \Eccube\Form\Type\KanaType($app['config']);
             $types[] = new \Eccube\Form\Type\TelType($app['config']);

src/Eccube/Doctrine/ORM/Query/Extract.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
         if ($driver == 'pdo_sqlite') {
             return sprintf("CAST(STRFTIME('%s', %s) AS INTEGER)", $this->formats[$this->field], $this->source->dispatch($sqlWalker));
         } else {
-            return sprintf('EXTRACT(%s FROM %s %s)', $this->field, (string)$this->type, $this->source->dispatch($sqlWalker));
+            return sprintf('EXTRACT(%s FROM %s %s)', $this->field, (string) $this->type, $this->source->dispatch($sqlWalker));
         }
     }
 }
\ No newline at end of file

src/Eccube/Repository/Master/OrderStatusRepository.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 
         foreach ($criteria as $col => $val) {
             $qb->andWhere($qb->expr()->notIn('o.'.$col, ':'.$col))
-                ->setParameter($col, (array)$val);
+                ->setParameter($col, (array) $val);
         }
 
         if (is_array($orderBy)) {