Merge branch 'master' into gh-actions-php-cs-fixer

EC-CUBE · Dec 20, 2024 · 5b6c587 · 5b6c587
2 parents d446346 + 6235b10
commit 5b6c587
Show file tree

Hide file tree

Showing 203 changed files with 5,869 additions and 13,157 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -16,13 +16,17 @@
     'no_superfluous_phpdoc_tags' => false, // 副作用があるため
     'increment_style' => false, // 強制しなくて良い
     'yoda_style' => false, // 強制しなくて良い
+    'blank_line_after_opening_tag' => false, // 強制しなくて良い
+    'fully_qualified_strict_types' => false, // 強制しなくて良い
+    'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arrays']], // elements で arrays 以外を指定するとPHP7.4でエラーになる
 
     // @Symfony:risky のうち、以下のルールを無効化
     'psr_autoloading' => false, // PSR-4 に準拠していないため
     'is_null' => false, // 副作用があるため
     'native_constant_invocation' => false, // namespace を使用していないため不要
     'string_length_to_empty' => false, // 副作用があるため
     'ternary_to_elvis_operator' => false, // 副作用があるため
+    'get_class_to_class_keyword' => false, // 副作用があるため
 ];
 
 $finder = \PhpCsFixer\Finder::create()
@@ -31,6 +35,7 @@
     ->in(__DIR__.'/data/module')
     ->in(__DIR__.'/data/smarty_extends')
     ->in(__DIR__.'/tests')
+    ->exclude('SOAP')
     ->name('*.php')
 ;
 $config = new \PhpCsFixer\Config();

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": [