diff --git a/composer.json b/composer.json index 275105ad0d..02284dba1d 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "nanasess/ec-cube2-class-extends-stubs": "^1.0", "nanasess/eccube2-fixture-generator": "^2.0", "phpdocumentor/reflection-docblock": "~5.5.1", - "phpstan/phpstan": "^1.10", + "phpstan/phpstan": "^2.0", "phpunit/phpunit": "^9.6", "symfony/yaml": "^5.4 || ^6.4" }, diff --git a/composer.lock b/composer.lock index c82bc6192d..606c77ddae 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "636ee3a24be4e148cef2625409af2b8c", + "content-hash": "8193790eda3917eed8b2431b71f28b80", "packages": [ { "name": "mobiledetect/mobiledetectlib", @@ -2125,20 +2125,20 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.7", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0" + "reference": "46b4d3529b12178112d9008337beda0cc2a1a6b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", - "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/46b4d3529b12178112d9008337beda0cc2a1a6b4", + "reference": "46b4d3529b12178112d9008337beda0cc2a1a6b4", "shasum": "" }, "require": { - "php": "^7.2|^8.0" + "php": "^7.4|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -2179,7 +2179,7 @@ "type": "github" } ], - "time": "2024-10-18T11:12:07+00:00" + "time": "2024-11-28T22:19:37+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php b/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php index 9a3efde2ea..bf8229f3cb 100644 --- a/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php +++ b/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php @@ -213,7 +213,7 @@ public function action() $arrBkupList = $this->lfGetBkupData('ORDER BY create_date DESC'); // テンプレートファイルに渡すデータをセット $this->arrErr = isset($arrErr) ? $arrErr : []; - $this->arrForm = isset($arrForm) ? $arrForm : []; + $this->arrForm = $arrForm; $this->arrBkupList = $arrBkupList; } diff --git a/data/class/pages/products/LC_Page_Products_Detail.php b/data/class/pages/products/LC_Page_Products_Detail.php index 807e064ccf..ea3afe3d46 100644 --- a/data/class/pages/products/LC_Page_Products_Detail.php +++ b/data/class/pages/products/LC_Page_Products_Detail.php @@ -21,9 +21,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -if (file_exists(MODULE_REALDIR.'mdl_gmopg/inc/function.php')) { - require_once MODULE_REALDIR.'mdl_gmopg/inc/function.php'; -} /** * 商品詳細 のページクラス. * diff --git a/data/require_plugin.php b/data/require_plugin.php deleted file mode 100644 index fec67cff48..0000000000 --- a/data/require_plugin.php +++ /dev/null @@ -1,24 +0,0 @@ -