EC-CUBE / ec-cube

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

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
                 'label' => '拒否URL',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
                 $form = $event->getForm();
 
                 $Authority = $form['Authority']->getData();

src/Eccube/Security/Voter/AuthorityVoter.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 
     public function __construct(Application $app)
     {
-        $this->app     = $app;
+        $this->app = $app;
     }
 
     public function supportsAttribute($attribute)

src/Eccube/Service/CsvExportService.php

Spacing +2 added lines, -2 removed lines

@@ -307,7 +307,7 @@ 
     {
         $config = $this->config;
 
-        return function ($value) use ($config) {
+        return function($value) use ($config) {
             return mb_convert_encoding(
                 (string) $value, $config['csv_export_encoding'], 'UTF-8'
             );
@@ -431,7 +431,7 @@ 
             if ($Conditions instanceof ArrayCollection) {
                 $Conditions = new ArrayCollection(
                     array_map(
-                        function ($Entity) use ($em) {
+                        function($Entity) use ($em) {
                             return $em->getRepository(get_class($Entity))->find($Entity->getId());
                         }, $Conditions->toArray()
                     )

Doc Comments -2 removed lines

@@ -325,7 +325,6 @@ 
 
     /**
      * @param $row
-     * @param null $callback
      */
     public function fputcsv($row)
     {
@@ -424,7 +423,6 @@ 
      * XXX self::setExportQueryBuilder() をコールする前に EntityManager を取得したいので、引数で渡している
      *
      * @param array $searchData セッションから取得した検索条件の配列
-     * @param EntityManager $em
      */
     protected function findDeserializeObjects(array &$searchData)
     {

src/Eccube/Controller/Admin/Customer/CustomerEditController.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
                         ->setCompanyName($Customer->getCompanyName())
                         ->setZip01($Customer->getZip01())
                         ->setZip02($Customer->getZip02())
-                        ->setZipcode($Customer->getZip01() . $Customer->getZip02())
+                        ->setZipcode($Customer->getZip01().$Customer->getZip02())
                         ->setPref($Customer->getPref())
                         ->setAddr01($Customer->getAddr01())
                         ->setAddr02($Customer->getAddr02())

Unused Use Statements -3 removed lines

@@ -26,7 +26,6 @@ 
 use Doctrine\ORM\EntityManager;
 use Eccube\Annotation\Inject;
 use Eccube\Application;
-use Eccube\Common\Constant;
 use Eccube\Controller\AbstractController;
 use Eccube\Entity\CustomerAddress;
 use Eccube\Event\EccubeEvents;
@@ -35,12 +34,10 @@ 
 use Eccube\Repository\CustomerRepository;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Form\FormFactory;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Security\Core\Encoder\EncoderFactory;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 
 /**

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

Indentation +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
                                 'allow_add' => true,
                                 'allow_delete' => true,
                                 'data' => $ProductClasses,
-                             ));
+                                ));
 
                         $event = new EventArgs(
                             array(

Doc Comments +5 added lines

@@ -603,6 +603,9 @@ 
     /**
      * 登録、更新時のエラー画面表示
      *
+     * @param Application $app
+     * @param boolean $not_product_class
+     * @param \Symfony\Component\Form\FormInterface $classForm
      */
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
     {
@@ -654,6 +657,7 @@ 
 
     /**
      * 規格1と規格2を組み合わせた商品規格を作成
+     * @param Application $app
      */
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
     {
@@ -741,6 +745,7 @@ 
      *
      * @param $productClassDest ProductClass コピー先となる商品規格
      * @param $productClassOrig ProductClass コピー元となる商品規格
+     * @param Application $app
      */
     private function setDefaultProductClass($app, $productClassDest, $productClassOrig) {
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());

Spacing +2 added lines, -2 removed lines

@@ -192,7 +192,7 @@ 
                     $class2Valied = $this->isValiedCategory($ClassName2);
 
                     // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示
-                    if($class1Valied && $class2Valied){
+                    if ($class1Valied && $class2Valied) {
                         $hasClassCategoryFlg = true;
                     }
 
@@ -269,7 +269,7 @@ 
             $mergeProductClasses = array();
 
             // 商品税率が設定されている場合、商品税率を項目に設定
-            if ($this->BaseInfo->isOptionProductTaxRule())  {
+            if ($this->BaseInfo->isOptionProductTaxRule()) {
                 foreach ($ProductClasses as $class) {
                     if ($class->getTaxRule()) {
                         $class->setTaxRate($class->getTaxRule()->getTaxRate());

src/Eccube/Twig/Extension/EccubeExtension.php

Doc Comments +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     /**
      * Returns a list of functions to add to the existing list.
      *
-     * @return array An array of functions
+     * @return \Twig_SimpleFunction[] An array of functions
      */
     public function getFunctions()
     {
@@ -61,7 +61,7 @@ 
     /**
      * Returns a list of filters.
      *
-     * @return array
+     * @return \Twig_SimpleFilter[]
      */
     public function getFilters()
     {

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
                     if (is_callable($function)) {
                         return call_user_func_array($function, $arg_list);
                     }
-                    trigger_error('Called to an undefined function : php_'. $function, E_USER_WARNING);
+                    trigger_error('Called to an undefined function : php_'.$function, E_USER_WARNING);
 
             }, ['pre_escape' => 'html', 'is_safe' => ['html']]),
 
@@ -156,7 +156,7 @@ 
     public function getCsrfTokenForAnchor()
     {
         $token = $this->app['csrf.token_manager']->getToken(Constant::TOKEN_NAME)->getValue();
-        return 'token-for-anchor=\'' . $token . '\'';
+        return 'token-for-anchor=\''.$token.'\'';
     }
 
     /**

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;

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 namespace Eccube\Service;
 
 use Eccube\Annotation\Service;
-use Eccube\Application;
 
 
 /**

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)) {

src/Eccube/Controller/Admin/Order/EditController.php

Spacing +2 added lines, -2 removed lines

@@ -333,7 +333,7 @@ 
                 $session->set('eccube.admin.order.customer.search', $searchData);
                 $session->set('eccube.admin.order.customer.search.page_no', $page_no);
             } else {
-                $searchData = (array)$session->get('eccube.admin.order.customer.search');
+                $searchData = (array) $session->get('eccube.admin.order.customer.search');
                 if (is_null($page_no)) {
                     $page_no = intval($session->get('eccube.admin.order.customer.search.page_no'));
                 } else {
@@ -489,7 +489,7 @@ 
                 $session->set('eccube.admin.order.product.search', $searchData);
                 $session->set('eccube.admin.order.product.search.page_no', $page_no);
             } else {
-                $searchData = (array)$session->get('eccube.admin.order.product.search');
+                $searchData = (array) $session->get('eccube.admin.order.product.search');
                 if (is_null($page_no)) {
                     $page_no = intval($session->get('eccube.admin.order.product.search.page_no'));
                 } else {