Merge pull request #2626 from shopware5/chore/update-dependencies

chore: Update friendsofphp/php-cs-fixer to 3.46.0
shopware5 · Jan 5, 2024 · 5680fc7 · 5680fc7
2 parents c93747a + af5f2cf
commit 5680fc7
Show file tree

Hide file tree

Showing 77 changed files with 368 additions and 546 deletions.
diff --git a/.phpstan-baseline.neon b/.phpstan-baseline.neon
@@ -7775,116 +7775,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginCategoryService.php
 
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:installCronjob\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:installForm\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:installMenu\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:installResources\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:installSnippets\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:refreshPluginList\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeCrontabEntries\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeEmotionComponents\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeEventSubscribers\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeFormsAndElements\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeMenuEntries\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeSnippets\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginInstaller\\:\\:removeTemplates\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.added\" expects value type string, got type DateTimeInterface$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.author\" expects value type string\\|null, got type mixed$#"
-			count: 2
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.id\" expects value type int, got type mixed$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.label\" expects value type string, got type mixed$#"
-			count: 2
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.link\" expects value type string\\|null, got type mixed$#"
-			count: 2
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.refresh_date\" expects value type string\\|null, got type DateTimeInterface$#"
-			count: 2
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.translations\" expects value type string\\|null, got type non\\-empty\\-string\\|false\\|null$#"
-			count: 2
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.update_version\" expects value type string\\|null, got type mixed$#"
-			count: 1
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.version\" expects value type string, got type mixed$#"
-			count: 2
-			path: engine/Shopware/Bundle/PluginInstallerBundle/Service/PluginInstaller.php
-
 		-
 			message: "#^Method Shopware\\\\Bundle\\\\PluginInstallerBundle\\\\Service\\\\PluginLicenceService\\:\\:cleanupLocalLicenseInformation\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -18415,11 +18305,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Components/Plugin/Namespace.php
 
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.author\" expects value type string\\|null, got type mixed$#"
-			count: 2
-			path: engine/Shopware/Components/Plugin/Namespace.php
-
 		-
 			message: "#^Query error\\: Column \"s_core_plugins\\.capability_enable\" expects value type int, got type bool$#"
 			count: 2
@@ -18440,11 +18325,6 @@ parameters:
 			count: 2
 			path: engine/Shopware/Components/Plugin/Namespace.php
 
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.copyright\" expects value type string\\|null, got type mixed$#"
-			count: 2
-			path: engine/Shopware/Components/Plugin/Namespace.php
-
 		-
 			message: "#^Query error\\: Column \"s_core_plugins\\.description\" expects value type string\\|null, got type mixed$#"
 			count: 2
@@ -18465,11 +18345,6 @@ parameters:
 			count: 2
 			path: engine/Shopware/Components/Plugin/Namespace.php
 
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.source\" expects value type string, got type mixed$#"
-			count: 2
-			path: engine/Shopware/Components/Plugin/Namespace.php
-
 		-
 			message: "#^Query error\\: Column \"s_core_plugins\\.support\" expects value type string\\|null, got type mixed$#"
 			count: 2
@@ -18490,11 +18365,6 @@ parameters:
 			count: 2
 			path: engine/Shopware/Components/Plugin/Namespace.php
 
-		-
-			message: "#^Query error\\: Column \"s_core_plugins\\.version\" expects value type string, got type mixed$#"
-			count: 2
-			path: engine/Shopware/Components/Plugin/Namespace.php
-
 		-
 			message: "#^Method Shopware\\\\Components\\\\Plugin\\\\PaymentInstaller\\:\\:createOrUpdate\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -21440,11 +21310,6 @@ parameters:
 			count: 1
 			path: engine/Shopware/Controllers/Backend/ArticlePriceVariation.php
 
-		-
-			message: "#^Parameter \\#1 \\$configuratorSet of method Shopware\\\\Models\\\\Article\\\\Configurator\\\\PriceVariation\\:\\:setConfiguratorSet\\(\\) expects Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set, Shopware\\\\Models\\\\Article\\\\Configurator\\\\Set\\|null given\\.$#"
-			count: 1
-			path: engine/Shopware/Controllers/Backend/ArticlePriceVariation.php
-
 		-
 			message: "#^Access to an undefined property Enlight_Controller_Request_RequestHttp\\:\\:\\$id\\.$#"
 			count: 1
@@ -38030,71 +37895,6 @@ parameters:
 			count: 1
 			path: tests/Functional/Core/OrderTest.php
 
-		-
-			message: "#^Cannot call method getId\\(\\) on Shopware\\\\Models\\\\Category\\\\Category\\|null\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
-		-
-			message: "#^Method sArticlesTest\\:\\:assertsArticlesState\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
-		-
-			message: "#^Method sArticlesTest\\:\\:assertsArticlesState\\(\\) has parameter \\$categoryId with no type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
-		-
-			message: "#^Method sArticlesTest\\:\\:assertsArticlesState\\(\\) has parameter \\$customerGroupId with no type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
-		-
-			message: "#^Method sArticlesTest\\:\\:assertsArticlesState\\(\\) has parameter \\$sArticles with no type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
-		-
-			message: "#^Method sArticlesTest\\:\\:assertsArticlesState\\(\\) has parameter \\$translationId with no type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
-		-
-			message: "#^Method sArticlesTest\\:\\:testCanInjectParameters\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
-		-
-			message: "#^Method sArticlesTest\\:\\:testCanInstanciatesArticles\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
-		-
-			message: "#^Method sArticlesTest\\:\\:testPriceGroupForMainVariant\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
-		-
-			message: "#^Method sArticlesTest\\:\\:testsGetPromotionByIdWithNonExistingArticle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
-		-
-			message: "#^Method sArticlesTest\\:\\:testsRoundWithFloatingPointRepresentation\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
-		-
-			message: "#^Method sArticlesTest\\:\\:testsRoundWithFloatingPointRepresentationLarge\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
-		-
-			message: "#^Method sArticlesTest\\:\\:testsRoundWithFloatingPointRepresentationNegative\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Core/sArticlesTest.php
-
 		-
 			message: "#^Method sCategoriesTest\\:\\:getCategoryById\\(\\) has parameter \\$allCategories with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -38315,11 +38115,6 @@ parameters:
 			count: 1
 			path: tests/Functional/Models/Order/ShippingTest.php
 
-		-
-			message: "#^Method RemoveAndCreateResourceTest\\:\\:testRemoveAndCreateAresource\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/Functional/Modules/Acl/RemoveAndCreateResourceTest.php
-
 		-
 			message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Modules\\\\Articles\\\\SeoCategoryTest\\:\\:getSimpleTestData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/_sql/migrations/102-add-new-emotions.php b/_sql/migrations/102-add-new-emotions.php
@@ -21,7 +21,9 @@
  * our trademarks remain entirely with the shopware AG.
  */
 
-class Migrations_Migration102 extends \Shopware\Components\Migrations\AbstractMigration
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration102 extends AbstractMigration
 {
     public function up($modus)
     {

diff --git a/_sql/migrations/1206-add-laststock-field-to-variants.php b/_sql/migrations/1206-add-laststock-field-to-variants.php
@@ -33,7 +33,7 @@ public function up($modus)
         // Try/Catches are necessary to allow multiple runs of this migration
         try {
             $this->connection->exec('ALTER TABLE `s_articles_details` ADD `laststock` INT(1) NOT NULL DEFAULT 0 AFTER `stockmin`');
-        } catch (\PDOException $ex) {
+        } catch (PDOException $ex) {
             // This code says the column already exists, we want only all other exceptions to be raised
             if ($ex->getCode() !== '42S21') {
                 throw $ex;
@@ -42,7 +42,7 @@ public function up($modus)
 
         try {
             $this->connection->exec('ALTER TABLE `s_article_configurator_options` ADD `media_id` int(11) NULL');
-        } catch (\PDOException $ex) {
+        } catch (PDOException $ex) {
             // This code says the column already exists, we want only all other exceptions to be raised
             if ($ex->getCode() !== '42S21') {
                 throw $ex;

diff --git a/_sql/migrations/1436-document-type-mail-templates.php b/_sql/migrations/1436-document-type-mail-templates.php
@@ -21,7 +21,9 @@
  * our trademarks remain entirely with the shopware AG.
  */
 
-class Migrations_Migration1436 extends Shopware\Components\Migrations\AbstractMigration
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1436 extends AbstractMigration
 {
     /**
      * {@inheritdoc}
@@ -34,7 +36,7 @@ public function up($modus)
 
         try {
             $installationLanguage = $this->connection->query('SELECT LOWER(TRIM(`name`)) FROM `s_core_countries_areas` WHERE `id` = 1')->fetchColumn(0);
-        } catch (\Exception $ex) {
+        } catch (Exception $ex) {
             // Empty on purpose
         }
 

diff --git a/_sql/migrations/1439-change-back-document-id-to-tmp.php b/_sql/migrations/1439-change-back-document-id-to-tmp.php
@@ -21,7 +21,9 @@
  * our trademarks remain entirely with the shopware AG.
  */
 
-class Migrations_Migration1439 extends Shopware\Components\Migrations\AbstractMigration
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1439 extends AbstractMigration
 {
     public function up($modus)
     {
@@ -52,8 +54,8 @@ private function isMySql8()
         try {
             $result = $this->connection
                 ->query('SELECT @@version AS version')
-                ->fetch(\PDO::FETCH_COLUMN);
-        } catch (\Exception $exception) {
+                ->fetch(PDO::FETCH_COLUMN);
+        } catch (Exception $exception) {
             // Silent catch
         }
 
@@ -74,8 +76,8 @@ private function isIdUpperCase()
         try {
             $result = $this->connection
                 ->query('SHOW COLUMNS FROM `s_order_documents`')
-                ->fetchAll(\PDO::FETCH_ASSOC);
-        } catch (\Exception $exception) {
+                ->fetchAll(PDO::FETCH_ASSOC);
+        } catch (Exception $exception) {
             // Silent catch
         }
 

diff --git a/_sql/migrations/1440-change-document-id-to-lowercase.php b/_sql/migrations/1440-change-document-id-to-lowercase.php
@@ -21,7 +21,9 @@
  * our trademarks remain entirely with the shopware AG.
  */
 
-class Migrations_Migration1440 extends Shopware\Components\Migrations\AbstractMigration
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1440 extends AbstractMigration
 {
     public function up($modus)
     {
@@ -55,8 +57,8 @@ private function isIdTemp()
         try {
             $result = $this->connection
                 ->query('SHOW COLUMNS FROM `s_order_documents`')
-                ->fetchAll(\PDO::FETCH_ASSOC);
-        } catch (\Exception $exception) {
+                ->fetchAll(PDO::FETCH_ASSOC);
+        } catch (Exception $exception) {
             // Silent catch
         }
 

diff --git a/_sql/migrations/1452-change-laststock-filter.php b/_sql/migrations/1452-change-laststock-filter.php
@@ -21,7 +21,9 @@
  * our trademarks remain entirely with the shopware AG.
  */
 
-class Migrations_Migration1452 extends \Shopware\Components\Migrations\AbstractMigration
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1452 extends AbstractMigration
 {
     public function up($modus)
     {

diff --git a/_sql/migrations/1453-fix-extended-editor.php b/_sql/migrations/1453-fix-extended-editor.php
@@ -21,7 +21,9 @@
  * our trademarks remain entirely with the shopware AG.
  */
 
-class Migrations_Migration1453 extends \Shopware\Components\Migrations\AbstractMigration
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1453 extends AbstractMigration
 {
     public function up($modus)
     {

diff --git a/_sql/migrations/1455-add-customer-group-key-exemption-option.php b/_sql/migrations/1455-add-customer-group-key-exemption-option.php
@@ -21,7 +21,9 @@
  * our trademarks remain entirely with the shopware AG.
  */
 
-class Migrations_Migration1455 extends \Shopware\Components\Migrations\AbstractMigration
+use Shopware\Components\Migrations\AbstractMigration;
+
+class Migrations_Migration1455 extends AbstractMigration
 {
     /**
      * Migration to make new "Exclude Customergroup" option visible in advanced menu without reinstallation