Merge branch 'master' into fix/return-value-not-array

nanasess · Dec 20, 2024 · 0b9d2f3 · 0b9d2f3
2 parents 87b44ef + b083b10
commit 0b9d2f3
Show file tree

Hide file tree

Showing 77 changed files with 4,027 additions and 11,384 deletions.
diff --git a/README.md b/README.md
@@ -32,12 +32,13 @@ Pull requestを送信する際は、EC-CUBEのコピーライトポリシーに
 
 #### システム要件
 
-| 分類      | ソフトウェア         | Version                                                                 |
-|-----------|----------------------|-------------------------------------------------------------------------|
-| WebServer | Apache               | 2.4.x or higher<br> (mod_rewrite / mod_ssl 必須)                        |
-| PHP       | PHP                  | 7.4.33 or higher                                                        |
-| Database  | PostgreSQL           | 9.x or higher                                                           |
-| Database  | MySQL                | 5.x / 8.x or higher<br> (InnoDBエンジン 必須)                           |
+| 分類      | ソフトウェア | Version                                                 |
+|-----------|--------------|---------------------------------------------------------|
+| WebServer | Apache       | 2.4.x or higher<br> (mod_rewrite / mod_ssl 必須)        |
+| PHP       | PHP          | 7.4.33 or higher                                        |
+| Database  | PostgreSQL   | 9.x or higher                                           |
+| Database  | MySQL        | 5.x / 8.0.x / 8.4.x or higher<br> (InnoDBエンジン 必須) |
+
 
 ##### 必要な PHP Extensions
 

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"
     },
@@ -39,15 +39,19 @@
         "mobiledetect/mobiledetectlib": "^3.74",
         "nanasess/mdb2": "^2.5",
         "nanasess/php8-compat": "^1.0",
+        "nobuhiko/calendar": "^1.0",
         "pear/archive_tar": "^1.4.3",
         "pear/mail": "*",
+        "pear/net_smtp": "^1.12",
+        "pear/net_socket": "^1.2",
         "pear/pear-core-minimal": "^1.10",
         "pear/xml_parser": "*",
         "pear/xml_serializer": "*",
         "pear/xml_util": "*",
         "setasign/fpdf": "^1.8",
         "setasign/fpdi": "^2.6",
-        "smarty/smarty": "^5.0.2"
+        "smarty/smarty": "^5.0.2",
+        "symfony/polyfill-php80": "^1.31"
     },
     "autoload": {
         "classmap": [