EC-CUBE / ec-cube

src/Eccube/Resource/doctrine/migration/Version20151023102323.php

Spacing +7 added lines, -7 removed lines

@@ -29,7 +29,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先の追加');
+        $PageLayout->setName('商品購入/お届け先の追加');
         $PageLayout->setUrl('shopping_shipping_edit');
         $PageLayout->setFileName('Shopping/shipping_edit');
         $PageLayout->setEditFlg(2);
@@ -38,7 +38,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先の複数指定(お届け先の追加)');
+        $PageLayout->setName('商品購入/お届け先の複数指定(お届け先の追加)');
         $PageLayout->setUrl('shopping_shipping_multiple_edit');
         $PageLayout->setFileName('Shopping/shipping_multiple_edit');
         $PageLayout->setEditFlg(2);
@@ -47,7 +47,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/購入エラー');
+        $PageLayout->setName('商品購入/購入エラー');
         $PageLayout->setUrl('shopping_error');
         $PageLayout->setFileName('Shopping/shopping_error');
         $PageLayout->setEditFlg(2);
@@ -56,7 +56,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( 'ご利用ガイド');
+        $PageLayout->setName('ご利用ガイド');
         $PageLayout->setUrl('help_guide');
         $PageLayout->setFileName('Help/guide');
         $PageLayout->setEditFlg(2);
@@ -64,7 +64,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( 'パスワード再発行(入力ページ)');
+        $PageLayout->setName('パスワード再発行(入力ページ)');
         $PageLayout->setUrl('forgot');
         $PageLayout->setFileName('Forgot/index');
         $PageLayout->setEditFlg(2);
@@ -72,7 +72,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( 'パスワード再発行(完了ページ)');
+        $PageLayout->setName('パスワード再発行(完了ページ)');
         $PageLayout->setUrl('forgot_complete');
         $PageLayout->setFileName('Forgot/complete');
         $PageLayout->setEditFlg(2);
@@ -81,7 +81,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( 'パスワード変更((完了ページ)');
+        $PageLayout->setName('パスワード変更((完了ページ)');
         $PageLayout->setUrl('forgot_reset');
         $PageLayout->setFileName('Forgot/reset');
         $PageLayout->setEditFlg(2);

src/Eccube/Resource/doctrine/migration/Version20151110174227.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         $t_dtb_mail_history = $schema->getTable(self::DTB_MAIL_HISTORY);
 
         $keyName = '';
-        if($t_dtb_mail_history->hasColumn('creator_id')){
+        if ($t_dtb_mail_history->hasColumn('creator_id')) {
             $keys = $t_dtb_mail_history->getForeignKeys();
             foreach ($keys as $key) {
                 $column = $key->getColumns();

src/Eccube/Resource/doctrine/migration/Version20151116142354.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/配送方法選択');
+        $PageLayout->setName('商品購入/配送方法選択');
         $PageLayout->setUrl('shopping_delivery');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);
@@ -37,7 +37,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/支払方法選択');
+        $PageLayout->setName('商品購入/支払方法選択');
         $PageLayout->setUrl('shopping_payment');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);
@@ -46,7 +46,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先変更');
+        $PageLayout->setName('商品購入/お届け先変更');
         $PageLayout->setUrl('shopping_shipping_change');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);
@@ -55,7 +55,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先変更');
+        $PageLayout->setName('商品購入/お届け先変更');
         $PageLayout->setUrl('shopping_shipping_edit_change');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);
@@ -64,7 +64,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先の複数指定');
+        $PageLayout->setName('商品購入/お届け先の複数指定');
         $PageLayout->setUrl('shopping_shipping_multiple_change');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);

src/Eccube/Security/Core/Encoder/PasswordEncoder.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
         if ($this->config['auth_type'] == 'PLAIN') {
             $res = $raw;
         } else {
-            $res = hash_hmac($this->config['password_hash_algos'], $raw . ':' . $this->config['auth_magic'], $salt);
+            $res = hash_hmac($this->config['password_hash_algos'], $raw.':'.$this->config['auth_magic'], $salt);
         }
 
         return $res;
@@ -81,7 +81,7 @@ 
         } else {
             // 旧バージョン(2.11未満)からの移行を考慮
             if (empty($salt)) {
-                $hash = sha1($raw . ':' . $this->config['auth_magic']);
+                $hash = sha1($raw.':'.$this->config['auth_magic']);
             } else {
                 $hash = $this->encodePassword($raw, $salt);
             }

src/Eccube/Util/Str.php

Spacing +5 added lines, -5 removed lines

@@ -159,7 +159,7 @@ 
             return $value;
         }
 
-        return rtrim(mb_substr($value, 0, $length, 'UTF-8')) . $end;
+        return rtrim(mb_substr($value, 0, $length, 'UTF-8')).$end;
     }
 
 
@@ -186,18 +186,18 @@ 
         }
         if ($diff->m == 1 || $diff->days > 0) {
             if ($diff->days <= 31) {
-                return $diff->days . '日前';
+                return $diff->days.'日前';
             }
             // return $date->format("Y/m/d H:i");
             return $date->format("Y/m/d");
         }
         if ($diff->h > 0) {
-            return $diff->h . "時間前";
+            return $diff->h."時間前";
         }
         if ($diff->i > 0) {
-            return $diff->i . "分前";
+            return $diff->i."分前";
         }
-        return $diff->s . "秒前";
+        return $diff->s."秒前";
     }
 
     /**

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/Controller/Mypage/WithdrawController.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
                     // 会員削除
                     $email = $Customer->getEmail();
                     // メールアドレスにダミーをセット
-                    $Customer->setEmail(Str::random(60) . '@dummy.dummy');
+                    $Customer->setEmail(Str::random(60).'@dummy.dummy');
                     $Customer->setDelFlg(Constant::ENABLED);
 
                     $app['orm.em']->flush();

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

Unused Use Statements -1 removed lines

@@ -27,7 +27,6 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Eccube\Common\Constant;
 use Eccube\Util\EntityUtil;
-use Symfony\Component\Form\FormFactory;
 use Symfony\Component\HttpFoundation\Request;
 
 class CsvExportService