Merge pull request #1085 from EC-CUBE/dependabot/composer/phpstan/php…

…stan-2.0.3 Bump phpstan/phpstan from 1.12.7 to 2.0.3
EC-CUBE · Dec 17, 2024 · 4badd95 · 4badd95
2 parents 27be918 + 4149789
commit 4badd95
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 36 deletions.
diff --git 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
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
@@ -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
@@ -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
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -41,3 +41,25 @@ parameters:
     -
       message: "#^Inner named functions are not supported by PHPStan\\.#"
       path: data/class/SC_Initial.php
+    -
+      message: '#^Path in include_once\(\) "Auth/SASL.php" is not a file or it does not exist.#'
+      path: data/module/Net/SMTP.php
+    -
+      message: '#^Path in require_once\(\) ".*\.php" is not a file or it does not exist\.$#'
+      paths:
+        - data/module/Calendar/Calendar.php
+        - data/module/Calendar/Day.php
+        - data/module/Calendar/Decorator/Textual.php
+        - data/module/Calendar/Decorator/Uri.php
+        - data/module/Calendar/Decorator/Weekday.php
+        - data/module/Calendar/Decorator/Wrapper.php
+        - data/module/Calendar/Factory.php
+        - data/module/Calendar/Hour.php
+        - data/module/Calendar/Minute.php
+        - data/module/Calendar/Month.php
+        - data/module/Calendar/Month/Weekdays.php
+        - data/module/Calendar/Month/Weeks.php
+        - data/module/Calendar/Second.php
+        - data/module/Calendar/Util/Textual.php
+        - data/module/Calendar/Week.php
+        - data/module/Calendar/Year.php