Merge remote-tracking branch 'upstream/main' into feature/prod-clone-ask

# Conflicts:
#	app/code/core/Mage/Catalog/Model/Product.php

Author: m-michalis

.all-contributorsrc

@@ -1716,6 +1716,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "vernad",
+      "name": "vernad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/51973447?v=4",
+      "profile": "https://github.com/vernad",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "commitType": "docs"

.php-cs-fixer.dist.php

@@ -12,16 +12,52 @@
         'logical_operators' => true,
         // RISKY: Replaces intval, floatval, doubleval, strval and boolval function calls with according type casting operator.
         'modernize_types_casting' => true,
+        // There should not be empty PHPDoc blocks.
+        'no_empty_phpdoc' => 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,
+        // Operators - when multiline - must always be at the beginning or at the end of the line.
+        'operator_linebreak' => true,
+        // Sort union types and intersection types using configured order.
+        'ordered_types' => 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' => 'self'],
+        // PHPDoc annotation descriptions should not be a sentence.
+        'phpdoc_annotation_without_dot' => true,
+        // Docblocks should have the same indentation as the documented subject.
+        'phpdoc_indent' => true,
+        // Annotations in PHPDoc should be ordered in defined sequence.
+        'phpdoc_order' => ['order' => ['param', 'return', 'throws', 'deprecated', 'see', 'SuppressWarnings']],
+        // Order PHPDoc tags by value.
+        'phpdoc_order_by_value' => ['annotations' => ['author', 'covers', 'group', 'method', 'throws', 'uses']],
+        // Orders all @param annotations in DocBlocks according to method signature.
+        'phpdoc_param_order' => true,
+        // PHPDoc should start and end with content, excluding the very first and last line of the docblocks.
+        'phpdoc_trim' => true,
+        // Removes extra blank lines after summary and after description in PHPDoc.
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
+        // Scalar types should always be written in the same form. int not integer, bool not boolean, float not real or double.
+        'phpdoc_scalar' => true,
+        // Single line @var PHPDoc should have proper spacing.
+        'phpdoc_single_line_var_spacing' => true,
+        // Fixes casing of PHPDoc tags.
+        'phpdoc_tag_casing' => true,
+        // Sorts PHPDoc types.
+        'phpdoc_types_order' => true,
+        // @var and @type annotations must have type and name in the correct order.
+        'phpdoc_var_annotation_correct_order' => true,
+        // @var and @type annotations of classy properties should not contain the name.
+        'phpdoc_var_without_name' => true,
+        // There MUST NOT be more than one property or constant declared per statement.
+        'single_class_element_per_statement' => true,
         // 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.
         // removed "match" and "parameters" for PHP7
         // see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8308
         'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arguments', 'array_destructuring', 'arrays']],
+        // A single space or none should be around union type and intersection type operators.
+        'types_spaces' => true,
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()
@@ -30,7 +66,6 @@
             ])
             ->exclude([
                 __DIR__ . '/shell/translations.php',
-                __DIR__ . '/shell/update-copyright.php',
             ])
             ->name('*.php')
             ->ignoreDotFiles(true)