bug #12213 Upgrade psalm (Tomanhez)

pamil · web-flow · commit dab149301f01 · 2020-12-31T12:36:37.000+01:00
This PR was merged into the 1.9-dev branch. Discussion ---------- | Q | A | --------------- | ----- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | License | MIT  Commits ------- b0fcc2c Upgrade psalm and add fixes
diff --git a/composer.json b/composer.json
@@ -146,7 +146,7 @@
         "symfony/flex": "^1.7",
         "symfony/web-profiler-bundle": "^4.4",
         "symplify/package-builder": "^8.0 <8.3",
-        "vimeo/psalm": "4.1.1"
+        "vimeo/psalm": "4.3.2"
     },
     "replace": {
         "sylius/addressing": "self.version",
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ChannelExampleFactory.php b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ChannelExampleFactory.php
@@ -149,10 +149,10 @@ protected function configureOptions(OptionsResolver $resolver): void
                 return $options['code'] . '.localhost';
             })
             ->setDefault('color', function (Options $options): string {
-                return (string) $this->faker->colorName;
+                return $this->faker->colorName;
             })
             ->setDefault('enabled', function (Options $options): bool {
-                return (bool) $this->faker->boolean(90);
+                return $this->faker->boolean(90);
             })
             ->setAllowedTypes('enabled', 'bool')
             ->setDefault('skipping_shipping_step_allowed', false)
diff --git a/src/Sylius/Bundle/CoreBundle/Form/Extension/LocaleTypeExtension.php b/src/Sylius/Bundle/CoreBundle/Form/Extension/LocaleTypeExtension.php
@@ -44,6 +44,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             if ($locale instanceof LocaleInterface && null !== $locale->getCode()) {
                 $options['disabled'] = true;
 
+                /** @psalm-suppress InvalidArrayOffset */
                 $options['choices'] = [$this->getLocaleName($locale->getCode()) => $locale->getCode()];
             } else {
                 $options['choices'] = array_flip($this->getAvailableLocales());
diff --git a/src/Sylius/Bundle/CoreBundle/Installer/Provider/DatabaseSetupCommandsProvider.php b/src/Sylius/Bundle/CoreBundle/Installer/Provider/DatabaseSetupCommandsProvider.php
@@ -114,7 +114,7 @@ private function isSchemaPresent(): bool
 
     private function getDatabaseName(): string
     {
-        return (string) $this->getEntityManager()->getConnection()->getDatabase();
+        return $this->getEntityManager()->getConnection()->getDatabase();
     }
 
     private function getSchemaManager(): AbstractSchemaManager
diff --git a/src/Sylius/Component/Core/Customer/Statistics/CustomerStatistics.php b/src/Sylius/Component/Core/Customer/Statistics/CustomerStatistics.php
@@ -32,7 +32,7 @@ public function __construct(array $perChannelStatistics)
 
     public function getAllOrdersCount(): int
     {
-        return (int) array_sum(array_map(function (PerChannelCustomerStatistics $statistics) {
+        return array_sum(array_map(function (PerChannelCustomerStatistics $statistics) {
             return $statistics->getOrdersCount();
         }, $this->perChannelsStatistics));
     }
diff --git a/src/Sylius/Component/Core/Customer/Statistics/CustomerStatisticsProvider.php b/src/Sylius/Component/Core/Customer/Statistics/CustomerStatisticsProvider.php
@@ -64,7 +64,7 @@ public function getCustomerStatistics(CustomerInterface $customer): CustomerStat
      */
     private function getOrdersSummedTotal(array $orders): int
     {
-        return (int) array_sum(
+        return array_sum(
             array_map(function (OrderInterface $order) {
                 return $order->getTotal();
             }, $orders)
diff --git a/src/Sylius/Component/Taxation/Model/TaxRate.php b/src/Sylius/Component/Taxation/Model/TaxRate.php
@@ -80,6 +80,7 @@ public function setName(?string $name): void
         $this->name = $name;
     }
 
+    /** @psalm-suppress RedundantCastGivenDocblockType */
     public function getAmount(): float
     {
         return (float) $this->amount;
diff --git a/src/Sylius/Component/User/Model/User.php b/src/Sylius/Component/User/Model/User.php
@@ -124,6 +124,7 @@ public function __construct()
         $this->enabled = false;
     }
 
+    /** @psalm-suppress RedundantCastGivenDocblockType */
     public function __toString(): string
     {
         return (string) $this->getUsername();

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ private function isSchemaPresent(): bool`
`114`	`114`
`115`	`115`	`private function getDatabaseName(): string`
`116`	`116`	`{`
`117`		`- return (string) $this->getEntityManager()->getConnection()->getDatabase();`
	`117`	`+ return $this->getEntityManager()->getConnection()->getDatabase();`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`private function getSchemaManager(): AbstractSchemaManager`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(array $perChannelStatistics)`
`32`	`32`
`33`	`33`	`public function getAllOrdersCount(): int`
`34`	`34`	`{`
`35`		`- return (int) array_sum(array_map(function (PerChannelCustomerStatistics $statistics) {`
	`35`	`+ return array_sum(array_map(function (PerChannelCustomerStatistics $statistics) {`
`36`	`36`	`return $statistics->getOrdersCount();`
`37`	`37`	`}, $this->perChannelsStatistics));`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function getCustomerStatistics(CustomerInterface $customer): CustomerStat`
`64`	`64`	`*/`
`65`	`65`	`private function getOrdersSummedTotal(array $orders): int`
`66`	`66`	`{`
`67`		`- return (int) array_sum(`
	`67`	`+ return array_sum(`
`68`	`68`	`array_map(function (OrderInterface $order) {`
`69`	`69`	`return $order->getTotal();`
`70`	`70`	`}, $orders)`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ public function setName(?string $name): void`
`80`	`80`	`$this->name = $name;`
`81`	`81`	`}`
`82`	`82`
	`83`	`+ /** @psalm-suppress RedundantCastGivenDocblockType */`
`83`	`84`	`public function getAmount(): float`
`84`	`85`	`{`
`85`	`86`	`return (float) $this->amount;`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ public function __construct()`
`124`	`124`	`$this->enabled = false;`
`125`	`125`	`}`
`126`	`126`
	`127`	`+ /** @psalm-suppress RedundantCastGivenDocblockType */`
`127`	`128`	`public function __toString(): string`
`128`	`129`	`{`
`129`	`130`	`return (string) $this->getUsername();`