From f0e806448db073ee3e1003618e1994cf2cb04cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= <nobuhiko.kimoto@gmail.com>
Date: Fri, 20 Dec 2024 10:58:49 +0900
Subject: [PATCH 1/2] fixed #622

---
 html/admin/load_module_config.php                  |  2 +-
 html/test/upgrade/index.php                        | 14 +++++++-------
 .../SC_Helper_Address_registAddressTest.php        |  8 ++++----
 .../SC_Helper_Kiyaku_saveKiyakuTest.php            |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/html/admin/load_module_config.php b/html/admin/load_module_config.php
index f3acba0830..4155d796bd 100644
--- a/html/admin/load_module_config.php
+++ b/html/admin/load_module_config.php
@@ -39,7 +39,7 @@
 if (!empty($module_id) && is_numeric($module_id)) {
     GC_Utils_Ex::gfPrintLog('loading module ====> module_id = ' . $module_id);
 
-    $objQuery =& SC_Query_Ex::getSingletonInstance();
+    $objQuery = SC_Query_Ex::getSingletonInstance();
     $arrRet = $objQuery->select('module_code', 'dtb_module', 'module_id = ?', array($module_id));
 
     if (isset($arrRet[0]['module_code'])) {
diff --git a/html/test/upgrade/index.php b/html/test/upgrade/index.php
index 6cd47ca40e..06e7050a68 100644
--- a/html/test/upgrade/index.php
+++ b/html/test/upgrade/index.php
@@ -56,13 +56,13 @@
 );
 
 switch (getMode()) {
-case 'products_list':
-    displayProductsList();
-    break;
+    case 'products_list':
+        displayProductsList();
+        break;
 
-default:
-    displayProductsList();
-    break;
+    default:
+        displayProductsList();
+        break;
 }
 
 /**
@@ -106,7 +106,7 @@ function updateModuleTable($arrProductsList)
 {
     $table = 'dtb_module';
     $where = 'module_id = ?';
-    $objQuery =& SC_Query_Ex::getSingletonInstance();
+    $objQuery = SC_Query_Ex::getSingletonInstance();
 
     $objQuery->begin();
     foreach ($arrProductsList as $arrProduct) {
diff --git a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php
index 50a2d8f4cc..99426eb9b7 100644
--- a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php
+++ b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php';
 
 class SC_Helper_Address_registAddressTest extends SC_Helper_Address_TestBase
 {
@@ -22,7 +22,7 @@ protected function tearDown(): void
     /*
         public function testregistAddressTest_顧客idが無い場合_システムエラーを返す()
         {
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
+            $objQuery = SC_Query_Ex::getSingletonInstance();
             $this->setUpAddress();
             //$this->expected = "1";
             $this->objAddress->registAddress(null);
@@ -56,7 +56,7 @@ public function testregistAddressTest_会員の登録配送先を追加する()
                     'fax03' => '1114',
                     'country_id' => null
                 );
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
+            $objQuery = SC_Query_Ex::getSingletonInstance();
             $this->expected = '1002';
             $this->objAddress->registAddress($arrSql);
             $col = 'other_deliv_id';
diff --git a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_saveKiyakuTest.php b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_saveKiyakuTest.php
index c798b15f8c..27b6722f6d 100644
--- a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_saveKiyakuTest.php
+++ b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_saveKiyakuTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
 
 class SC_Helper_Kiyaku_saveKiyakuTest extends SC_Helper_Kiyaku_TestBase
 {
@@ -24,7 +24,7 @@ public function testsaveKiyakuTest_新規で規約を登録する場合_1003を
 
         if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避
 
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
+            $objQuery = SC_Query_Ex::getSingletonInstance();
             $this->setUpKiyaku();
             $this->expected = '1003';
 
@@ -54,7 +54,7 @@ public function testsaveKiyakuTest_規約を更新する場合_1001を返す()
     {
         if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避
 
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
+            $objQuery = SC_Query_Ex::getSingletonInstance();
             $this->setUpKiyaku();
             $sqlval = array(
                     'kiyaku_id' => '1001',

From 00b9badb63186e73b895edd85ae978a08716dfac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= <nobuhiko.kimoto@gmail.com>
Date: Fri, 20 Dec 2024 11:17:06 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=3D=20&=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SC_Helper_Address_TestBase.php            |  12 +-
 .../SC_Helper_Address_deleteAddressTest.php   |   6 +-
 .../SC_Helper_Address_registAddressTest.php   |   2 +-
 .../SC_Helper_Kiyaku_TestBase.php             |  14 +-
 .../SC_Helper_Kiyaku_deleteKiyakuTest.php     |   6 +-
 .../SC_Helper_Kiyaku_getKiyakuTest.php        |  30 +-
 .../SC_Helper_Kiyaku_getListTest.php          |  22 +-
 .../SC_Helper_Kiyaku_rankDownTest.php         |   6 +-
 .../SC_Helper_Kiyaku_rankUpTest.php           |   6 +-
 .../SC_Helper_News_deleteNewsTest.php         |   6 +-
 .../SC_Helper_News_getListTest.php            | 280 +++++++++---------
 .../SC_Helper_News_moveRankTest.php           |   6 +-
 .../SC_Helper_News_rankDownTest.php           |   6 +-
 .../SC_Helper_News_rankUpTest.php             |   6 +-
 .../SC_Helper_News_saveNewsTest.php           |  34 ++-
 15 files changed, 222 insertions(+), 220 deletions(-)

diff --git a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php
index 01bde11e48..bfc3ae08d2 100644
--- a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php
+++ b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../../';
-require_once $HOME.'/tests/class/Common_TestCase.php';
+$HOME = realpath(__DIR__) . '/../../../../';
+require_once $HOME . '/tests/class/Common_TestCase.php';
 
 class SC_Helper_Address_TestBase extends Common_TestCase
 {
@@ -20,7 +20,7 @@ protected function tearDown(): void
      */
     protected function setUpAddress()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         // シーケンス初期化
 
         $kiyaku = [
@@ -42,7 +42,7 @@ protected function setUpAddress()
                 'fax01' => '111',
                 'fax02' => '1111',
                 'fax03' => '1111',
-                  ],
+            ],
             [
                 'other_deliv_id' => '1001',
                 'customer_id' => '1',
@@ -61,8 +61,8 @@ protected function setUpAddress()
                 'fax01' => '111',
                 'fax02' => '1111',
                 'fax03' => '1111',
-                  ],
-                                ];
+            ],
+        ];
 
         $this->objQuery->delete('dtb_other_deliv');
         foreach ($kiyaku as $key => $item) {
diff --git a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_deleteAddressTest.php b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_deleteAddressTest.php
index 49c5783e3d..4cfb589351 100644
--- a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_deleteAddressTest.php
+++ b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_deleteAddressTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php';
 
 class SC_Helper_Address_deleteAddressTest extends SC_Helper_Address_TestBase
 {
@@ -25,7 +25,7 @@ public function testdeleteAddressTest会員の登録配送先を削除する()
         $customer_id = 1;
         $this->expected = null;
         $this->objAddress->deleteAddress($other_deliv_id, $customer_id);
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $select = '*';
         $from = 'dtb_other_deliv';
         $where = 'other_deliv_id = ? AND customer_id = ?';
diff --git a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php
index 99426eb9b7..bb49d851f6 100644
--- a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php
+++ b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php
@@ -96,7 +96,7 @@ public function testregistAddressTest会員の登録配送先を更新する()
                 'company_name' => null,
                 'zipcode' => null,
             ];
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->objAddress->registAddress($arrSql);
 
         $this->expected = $arrSql;
diff --git a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php
index 3845d6c618..7bd32ff526 100755
--- a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php
+++ b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../../';
-require_once $HOME.'/tests/class/Common_TestCase.php';
+$HOME = realpath(__DIR__) . '/../../../../';
+require_once $HOME . '/tests/class/Common_TestCase.php';
 
 class SC_Helper_Kiyaku_TestBase extends Common_TestCase
 {
@@ -20,7 +20,7 @@ protected function tearDown(): void
      */
     protected function setUpKiyaku()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
 
         $kiyaku = [
             [
@@ -32,7 +32,7 @@ protected function setUpKiyaku()
                 'create_date' => '2000-01-01 00:00:00',
                 'update_date' => '2000-01-01 00:00:00',
                 'del_flg' => '0',
-                  ],
+            ],
             [
                 'kiyaku_id' => '1001',
                 'kiyaku_title' => 'test2',
@@ -42,7 +42,7 @@ protected function setUpKiyaku()
                 'create_date' => '2000-01-01 00:00:00',
                 'update_date' => '2000-01-01 00:00:00',
                 'del_flg' => '0',
-                  ],
+            ],
             [
                 'kiyaku_id' => '1002',
                 'kiyaku_title' => 'test3',
@@ -52,8 +52,8 @@ protected function setUpKiyaku()
                 'create_date' => '2000-01-01 00:00:00',
                 'update_date' => '2000-01-01 00:00:00',
                 'del_flg' => '1',
-                  ],
-                                ];
+            ],
+        ];
 
         $this->objQuery->delete('dtb_kiyaku');
         foreach ($kiyaku as $key => $item) {
diff --git a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_deleteKiyakuTest.php b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_deleteKiyakuTest.php
index 1bb11dc65b..a41b58032c 100644
--- a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_deleteKiyakuTest.php
+++ b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_deleteKiyakuTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
 
 class SC_Helper_Kiyaku_deleteKiyakuTest extends SC_Helper_Kiyaku_TestBase
 {
@@ -20,7 +20,7 @@ protected function tearDown(): void
 
     public function testdeleteKiyakuTest削除ができた場合DelFlgの1を返す()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpKiyaku();
         $kiyaku_id = 1001;
 
diff --git a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php
index 728d7c3095..227b847420 100644
--- a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php
+++ b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
 
 class SC_Helper_Kiyaku_getKiyakuTest extends SC_Helper_Kiyaku_TestBase
 {
@@ -20,7 +20,7 @@ protected function tearDown(): void
 
     public function testgetKiyakuTest規約情報を取得できた場合規約のarrayを返す()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpKiyaku();
         $has_deleted = false;
         $kiyaku_id = 1000;
@@ -34,7 +34,7 @@ public function testgetKiyakuTest規約情報を取得できた場合規約のar
             'create_date' => '2000-01-01 00:00:00',
             'update_date' => '2000-01-01 00:00:00',
             'del_flg' => '0',
-                                ];
+        ];
 
         $this->actual = $this->objKiyaku->getKiyaku($kiyaku_id, $has_deleted);
         $this->verify('規約詳細取得');
@@ -42,7 +42,7 @@ public function testgetKiyakuTest規約情報を取得できた場合規約のar
 
     public function testgetKiyakuTest規約情報を規約idから取得する際削除された規約を指定した場合Nullを返す()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpKiyaku();
         $has_deleted = false;
         $kiyaku_id = 1002;
@@ -55,21 +55,21 @@ public function testgetKiyakuTest規約情報を規約idから取得する際削
 
     public function testgetKiyakuTest削除された情報を含む規約情報を規約idから取得する際削除された規約を指定した場合Nullを返す()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpKiyaku();
         $has_deleted = true;
         $kiyaku_id = 1002;
         // 期待値
         $this->expected = [
-                'kiyaku_id' => '1002',
-                'kiyaku_title' => 'test3',
-                'kiyaku_text' => 'test_text',
-                'rank' => '10',
-                'creator_id' => '0',
-                'create_date' => '2000-01-01 00:00:00',
-                'update_date' => '2000-01-01 00:00:00',
-                'del_flg' => '1',
-                                ];
+            'kiyaku_id' => '1002',
+            'kiyaku_title' => 'test3',
+            'kiyaku_text' => 'test_text',
+            'rank' => '10',
+            'creator_id' => '0',
+            'create_date' => '2000-01-01 00:00:00',
+            'update_date' => '2000-01-01 00:00:00',
+            'del_flg' => '1',
+        ];
 
         $this->actual = $this->objKiyaku->getKiyaku($kiyaku_id, $has_deleted);
         $this->verify('規約詳細取得');
diff --git a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getListTest.php b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getListTest.php
index a493ce3af2..94c5d16338 100644
--- a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getListTest.php
+++ b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getListTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
 
 class SC_Helper_Kiyaku_getListTest extends SC_Helper_Kiyaku_TestBase
 {
@@ -20,7 +20,7 @@ protected function tearDown(): void
 
     public function testgetListTest削除した商品も含んだ一覧を取得できた場合一覧のarrayを返す()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpKiyaku();
         $has_deleted = true;
         // 期待値
@@ -29,18 +29,18 @@ public function testgetListTest削除した商品も含んだ一覧を取得で
                 'kiyaku_id' => '1000',
                 'kiyaku_title' => 'test1',
                 'kiyaku_text' => 'test_text',
-                  ],
+            ],
             [
                 'kiyaku_id' => '1001',
                 'kiyaku_title' => 'test2',
                 'kiyaku_text' => 'test_text2',
-                  ],
+            ],
             [
                 'kiyaku_id' => '1002',
                 'kiyaku_title' => 'test3',
                 'kiyaku_text' => 'test_text',
-                  ],
-                                ];
+            ],
+        ];
 
         $this->actual = $this->objKiyaku->getList($has_deleted);
         $this->verify('規約一覧取得');
@@ -48,7 +48,7 @@ public function testgetListTest削除した商品も含んだ一覧を取得で
 
     public function testgetListTest一覧を取得できた場合削除した商品は取得しない一覧のarrayを返す()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpKiyaku();
         $has_deleted = false;
         // 期待値
@@ -57,13 +57,13 @@ public function testgetListTest一覧を取得できた場合削除した商品
                 'kiyaku_id' => '1000',
                 'kiyaku_title' => 'test1',
                 'kiyaku_text' => 'test_text',
-                  ],
+            ],
             [
                 'kiyaku_id' => '1001',
                 'kiyaku_title' => 'test2',
                 'kiyaku_text' => 'test_text2',
-                  ],
-                                ];
+            ],
+        ];
 
         $this->actual = $this->objKiyaku->getList($has_deleted);
         $this->verify('規約一覧取得');
diff --git a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankDownTest.php b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankDownTest.php
index dcaf5e18a6..22b194e4f7 100644
--- a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankDownTest.php
+++ b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankDownTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
 
 class SC_Helper_Kiyaku_rankDownTest extends SC_Helper_Kiyaku_TestBase
 {
@@ -20,7 +20,7 @@ protected function tearDown(): void
 
     public function testrankDownTestランクダウンができた場合ランクを返す()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpKiyaku();
         $kiyaku_id = 1000;
 
diff --git a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankUpTest.php b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankUpTest.php
index 4011159452..02177c1d02 100644
--- a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankUpTest.php
+++ b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_rankUpTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
 
 class SC_Helper_Kiyaku_rankUpTest extends SC_Helper_Kiyaku_TestBase
 {
@@ -20,7 +20,7 @@ protected function tearDown(): void
 
     public function testrankUpTestランクアップができた場合ランクを返す()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpKiyaku();
         $kiyaku_id = 1001;
 
diff --git a/tests/class/helper/SC_Helper_News/SC_Helper_News_deleteNewsTest.php b/tests/class/helper/SC_Helper_News/SC_Helper_News_deleteNewsTest.php
index 4bd5450554..8d5862480e 100644
--- a/tests/class/helper/SC_Helper_News/SC_Helper_News_deleteNewsTest.php
+++ b/tests/class/helper/SC_Helper_News/SC_Helper_News_deleteNewsTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php';
 
 class SC_Helper_News_deleteNewsTest extends SC_Helper_News_TestBase
 {
@@ -20,7 +20,7 @@ protected function tearDown(): void
 
     public function testDeleteNewsTestニュースIDを指定した場合対象のニュース情報が削除される()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpNews();
         $news_id = 1002;
 
diff --git a/tests/class/helper/SC_Helper_News/SC_Helper_News_getListTest.php b/tests/class/helper/SC_Helper_News/SC_Helper_News_getListTest.php
index 0b67af39db..130d0e2336 100644
--- a/tests/class/helper/SC_Helper_News/SC_Helper_News_getListTest.php
+++ b/tests/class/helper/SC_Helper_News/SC_Helper_News_getListTest.php
@@ -1,150 +1,150 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php';
 
 class SC_Helper_News_getListTest extends SC_Helper_News_TestBase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->objNews = new SC_Helper_News_Ex();
+  protected function setUp(): void
+  {
+    parent::setUp();
+    $this->objNews = new SC_Helper_News_Ex();
+  }
+
+  protected function tearDown(): void
+  {
+    parent::tearDown();
+  }
+
+  // ///////////////////////////////////////
+
+  public function testGetList削除されたニュースも含む場合全てのニュース一覧が取得できる()
+  {
+    $objQuery = SC_Query_Ex::getSingletonInstance();
+    $this->setUpNews();
+    $dispNumber = 0;
+    $pageNumber = 0;
+    $has_deleted = true;
+
+    $this->expected = [
+      [
+        'update_date' => '2000-01-01 00:00:00',
+        'news_id' => '1004',
+        'news_title' => 'ニュース情報04',
+        'creator_id' => '1',
+        'del_flg' => '0',
+      ],
+      [
+        'update_date' => '2000-01-01 00:00:00',
+        'news_id' => '1003',
+        'news_title' => 'ニュース情報03',
+        'creator_id' => '1',
+        'del_flg' => '1',
+      ],
+      [
+        'update_date' => '2000-01-01 00:00:00',
+        'news_id' => '1002',
+        'news_title' => 'ニュース情報02',
+        'creator_id' => '1',
+        'del_flg' => '0',
+      ],
+      [
+        'update_date' => '2000-01-01 00:00:00',
+        'news_id' => '1001',
+        'news_title' => 'ニュース情報01',
+        'creator_id' => '1',
+        'del_flg' => '0',
+      ],
+    ];
+    $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted);
+    foreach ($result as $value) {
+      $this->actual[] = Test_Utils::mapArray($value, ['update_date', 'news_id', 'news_title', 'creator_id', 'del_flg']);
     }
 
-    protected function tearDown(): void
-    {
-        parent::tearDown();
+    $this->verify();
+  }
+
+  public function testGetList削除されたニュースは含まない場合削除されていないニュース一覧が取得できる()
+  {
+    $objQuery = SC_Query_Ex::getSingletonInstance();
+    $this->setUpNews();
+    $dispNumber = 0;
+    $pageNumber = 0;
+    $has_deleted = false;
+
+    $this->expected = [
+      [
+        'update_date' => '2000-01-01 00:00:00',
+        'news_id' => '1004',
+        'news_title' => 'ニュース情報04',
+        'creator_id' => '1',
+        'del_flg' => '0',
+      ],
+      [
+        'update_date' => '2000-01-01 00:00:00',
+        'news_id' => '1002',
+        'news_title' => 'ニュース情報02',
+        'creator_id' => '1',
+        'del_flg' => '0',
+      ],
+      [
+        'update_date' => '2000-01-01 00:00:00',
+        'news_id' => '1001',
+        'news_title' => 'ニュース情報01',
+        'creator_id' => '1',
+        'del_flg' => '0',
+      ],
+    ];
+
+    $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted);
+    foreach ($result as $value) {
+      $this->actual[] = Test_Utils::mapArray($value, ['update_date', 'news_id', 'news_title', 'creator_id', 'del_flg']);
     }
 
-    // ///////////////////////////////////////
-
-    public function testGetList削除されたニュースも含む場合全てのニュース一覧が取得できる()
-    {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
-        $this->setUpNews();
-        $dispNumber = 0;
-        $pageNumber = 0;
-        $has_deleted = true;
-
-        $this->expected = [
-          [
-            'update_date' => '2000-01-01 00:00:00',
-            'news_id' => '1004',
-            'news_title' => 'ニュース情報04',
-            'creator_id' => '1',
-            'del_flg' => '0',
-            ],
-          [
-            'update_date' => '2000-01-01 00:00:00',
-            'news_id' => '1003',
-            'news_title' => 'ニュース情報03',
-            'creator_id' => '1',
-            'del_flg' => '1',
-            ],
-          [
-            'update_date' => '2000-01-01 00:00:00',
-            'news_id' => '1002',
-            'news_title' => 'ニュース情報02',
-            'creator_id' => '1',
-            'del_flg' => '0',
-            ],
-          [
-            'update_date' => '2000-01-01 00:00:00',
-            'news_id' => '1001',
-            'news_title' => 'ニュース情報01',
-            'creator_id' => '1',
-            'del_flg' => '0',
-            ],
-          ];
-        $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted);
-        foreach ($result as $value) {
-            $this->actual[] = Test_Utils::mapArray($value, ['update_date', 'news_id', 'news_title', 'creator_id', 'del_flg']);
-        }
-
-        $this->verify();
-    }
-
-    public function testGetList削除されたニュースは含まない場合削除されていないニュース一覧が取得できる()
-    {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
-        $this->setUpNews();
-        $dispNumber = 0;
-        $pageNumber = 0;
-        $has_deleted = false;
-
-        $this->expected = [
-          [
-            'update_date' => '2000-01-01 00:00:00',
-            'news_id' => '1004',
-            'news_title' => 'ニュース情報04',
-            'creator_id' => '1',
-            'del_flg' => '0',
-            ],
-          [
-            'update_date' => '2000-01-01 00:00:00',
-            'news_id' => '1002',
-            'news_title' => 'ニュース情報02',
-            'creator_id' => '1',
-            'del_flg' => '0',
-            ],
-          [
-            'update_date' => '2000-01-01 00:00:00',
-            'news_id' => '1001',
-            'news_title' => 'ニュース情報01',
-            'creator_id' => '1',
-            'del_flg' => '0',
-            ],
-          ];
-
-        $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted);
-        foreach ($result as $value) {
-            $this->actual[] = Test_Utils::mapArray($value, ['update_date', 'news_id', 'news_title', 'creator_id', 'del_flg']);
-        }
-
-        $this->verify();
-    }
-
-    public function testGetList表示件数1かつページ番号3の場合対象のニュースが取得できる()
-    {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
-        $this->setUpNews();
-        $dispNumber = 1;
-        $pageNumber = 3;
-        $has_deleted = false;
-
-        $this->expected = [
-          'update_date' => '2000-01-01 00:00:00',
-          'news_id' => '1001',
-          'news_title' => 'ニュース情報01',
-          'creator_id' => '1',
-          'del_flg' => '0',
-        ];
-
-        $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted);
-        $this->actual = Test_Utils::mapArray($result[0], ['update_date', 'news_id', 'news_title', 'creator_id', 'del_flg']);
-
-        $this->verify();
-    }
-
-    public function testGetList表示件数1かつページ番号0の場合対象のニュースが取得できる()
-    {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
-        $this->setUpNews();
-        $dispNumber = 1;
-        $pageNumber = 0;
-        $has_deleted = false;
-
-        $this->expected = [
-          'update_date' => '2000-01-01 00:00:00',
-          'news_id' => '1004',
-          'news_title' => 'ニュース情報04',
-          'creator_id' => '1',
-          'del_flg' => '0',
-        ];
-
-        $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted);
-        $this->actual = Test_Utils::mapArray($result[0], ['update_date', 'news_id', 'news_title', 'creator_id', 'del_flg']);
-
-        $this->verify();
-    }
+    $this->verify();
+  }
+
+  public function testGetList表示件数1かつページ番号3の場合対象のニュースが取得できる()
+  {
+    $objQuery = SC_Query_Ex::getSingletonInstance();
+    $this->setUpNews();
+    $dispNumber = 1;
+    $pageNumber = 3;
+    $has_deleted = false;
+
+    $this->expected = [
+      'update_date' => '2000-01-01 00:00:00',
+      'news_id' => '1001',
+      'news_title' => 'ニュース情報01',
+      'creator_id' => '1',
+      'del_flg' => '0',
+    ];
+
+    $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted);
+    $this->actual = Test_Utils::mapArray($result[0], ['update_date', 'news_id', 'news_title', 'creator_id', 'del_flg']);
+
+    $this->verify();
+  }
+
+  public function testGetList表示件数1かつページ番号0の場合対象のニュースが取得できる()
+  {
+    $objQuery = SC_Query_Ex::getSingletonInstance();
+    $this->setUpNews();
+    $dispNumber = 1;
+    $pageNumber = 0;
+    $has_deleted = false;
+
+    $this->expected = [
+      'update_date' => '2000-01-01 00:00:00',
+      'news_id' => '1004',
+      'news_title' => 'ニュース情報04',
+      'creator_id' => '1',
+      'del_flg' => '0',
+    ];
+
+    $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted);
+    $this->actual = Test_Utils::mapArray($result[0], ['update_date', 'news_id', 'news_title', 'creator_id', 'del_flg']);
+
+    $this->verify();
+  }
 }
diff --git a/tests/class/helper/SC_Helper_News/SC_Helper_News_moveRankTest.php b/tests/class/helper/SC_Helper_News/SC_Helper_News_moveRankTest.php
index e10cb9b64b..6a3d559fbd 100644
--- a/tests/class/helper/SC_Helper_News/SC_Helper_News_moveRankTest.php
+++ b/tests/class/helper/SC_Helper_News/SC_Helper_News_moveRankTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php';
 
 class SC_Helper_News_moveRankTest extends SC_Helper_News_TestBase
 {
@@ -20,7 +20,7 @@ protected function tearDown(): void
 
     public function testMoveRankTestニュースIDと移動先ランクを指定した場合対象のランクが移動する()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpNews();
         $news_id = 1001;
         $rank = 1;
diff --git a/tests/class/helper/SC_Helper_News/SC_Helper_News_rankDownTest.php b/tests/class/helper/SC_Helper_News/SC_Helper_News_rankDownTest.php
index 1e557b7d36..86f5266ad0 100644
--- a/tests/class/helper/SC_Helper_News/SC_Helper_News_rankDownTest.php
+++ b/tests/class/helper/SC_Helper_News/SC_Helper_News_rankDownTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php';
 
 class SC_Helper_News_rankDownTest extends SC_Helper_News_TestBase
 {
@@ -20,7 +20,7 @@ protected function tearDown(): void
 
     public function testRankDownTestニュースIDを指定した場合対象のランクが1減少する()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpNews();
         $news_id = 1003;
 
diff --git a/tests/class/helper/SC_Helper_News/SC_Helper_News_rankUpTest.php b/tests/class/helper/SC_Helper_News/SC_Helper_News_rankUpTest.php
index 67d2db3fc4..75920eb926 100644
--- a/tests/class/helper/SC_Helper_News/SC_Helper_News_rankUpTest.php
+++ b/tests/class/helper/SC_Helper_News/SC_Helper_News_rankUpTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php';
 
 class SC_Helper_News_rankUpTest extends SC_Helper_News_TestBase
 {
@@ -20,7 +20,7 @@ protected function tearDown(): void
 
     public function testRankUpTestニュースIDを指定した場合対象のランクが1増加する()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpNews();
         $news_id = 1002;
 
diff --git a/tests/class/helper/SC_Helper_News/SC_Helper_News_saveNewsTest.php b/tests/class/helper/SC_Helper_News/SC_Helper_News_saveNewsTest.php
index d92ca149a8..50a93391d8 100644
--- a/tests/class/helper/SC_Helper_News/SC_Helper_News_saveNewsTest.php
+++ b/tests/class/helper/SC_Helper_News/SC_Helper_News_saveNewsTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$HOME = realpath(__DIR__).'/../../../..';
-require_once $HOME.'/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php';
+$HOME = realpath(__DIR__) . '/../../../..';
+require_once $HOME . '/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php';
 
 class SC_Helper_News_saveNewsTest extends SC_Helper_News_TestBase
 {
@@ -24,7 +24,7 @@ public function testSaveNewsTestNewsIdが空の場合新規登録される()
             $this->markTestSkipped('postgresqlだとどうしてもDBエラーになるのでスキップ');
         }
 
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpNews();
 
         $sqlval = [
@@ -48,7 +48,8 @@ public function testSaveNewsTestNewsIdが空の場合新規登録される()
             'news_title, creator_id, del_flg',
             'dtb_news',
             'news_id = ?',
-            [$ret_id]);
+            [$ret_id]
+        );
         $this->actual['content'] = $result[0];
 
         $this->verify();
@@ -56,23 +57,23 @@ public function testSaveNewsTestNewsIdが空の場合新規登録される()
 
     public function testSaveNewsTestNewsIdが存在する場合対象のニュースが更新される()
     {
-        $objQuery = &SC_Query_Ex::getSingletonInstance();
+        $objQuery = SC_Query_Ex::getSingletonInstance();
         $this->setUpNews();
 
         $sqlval = [
-          'news_id' => '1002',
-          'news_title' => 'ニュース情報05更新',
-          'creator_id' => '1',
-          'del_flg' => '0',
-          ];
+            'news_id' => '1002',
+            'news_title' => 'ニュース情報05更新',
+            'creator_id' => '1',
+            'del_flg' => '0',
+        ];
 
         $this->expected['count'] = '4';
         $this->expected['content'] = [
-          'news_id' => '1002',
-          'news_title' => 'ニュース情報05更新',
-          'creator_id' => '1',
-          'del_flg' => '0',
-          ];
+            'news_id' => '1002',
+            'news_title' => 'ニュース情報05更新',
+            'creator_id' => '1',
+            'del_flg' => '0',
+        ];
 
         $ret_id = $this->objNews->saveNews($sqlval);
 
@@ -81,7 +82,8 @@ public function testSaveNewsTestNewsIdが存在する場合対象のニュース
             'news_id, news_title, creator_id, del_flg',
             'dtb_news',
             'news_id = ?',
-            [$ret_id]);
+            [$ret_id]
+        );
         $this->actual['content'] = $result[0];
 
         $this->verify();