Merge branch 'v1-develop' into v1

baldwin-agency · Oct 8, 2024 · ea2f12b · ea2f12b
2 parents dd86777 + 85626ae
commit ea2f12b
Show file tree

Hide file tree

Showing 8 changed files with 622 additions and 610 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,9 @@
+/.gitattributes        export-ignore
+/.gitignore            export-ignore
+/.php-auto-version     export-ignore
+/.php-cs-fixer.php     export-ignore
+/composer.lock         export-ignore
+/Makefile              export-ignore
+/phpstan-baseline.neon export-ignore
+/phpstan.neon          export-ignore
+/vendor-bin            export-ignore
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -18,6 +18,7 @@
         'binary_operator_spaces'                           => ['default' => 'at_least_single_space', 'operators' => ['=>' => 'align']],
         'declare_strict_types'                             => true,
         'no_alias_functions'                               => true,
+        'no_unused_imports'                                => true,
         'no_useless_sprintf'                               => true,
         'nullable_type_declaration_for_default_null_value' => true,
         'ordered_imports'                                  => ['sort_algorithm' => 'alpha'],

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": "~7.4.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
-        "magento/framework": "103.0.4-p9 || 103.0.5-p8 || 103.0.6-p6 || 103.0.7 || 103.0.7-p1"
+        "magento/framework": "103.0.4-p9 || 103.0.4-p11 || 103.0.5-p8 || 103.0.5-p10 || 103.0.6-p6 || 103.0.6-p8 || 103.0.7 || 103.0.7-p1 || 103.0.7-p3"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8",

diff --git a/composer.lock b/composer.lock