Merge branch '1.11'

* 1.11:
  [Maintenance][CI] Add "Refactor" workflow
  [DX] General refactor

.github/workflows/refactor.yml

@@ -0,0 +1,57 @@
+name: Refactor
+
+on:
+    schedule:
+        -
+            cron: "0 2 * * MON" # Run at 2am every Monday
+    workflow_dispatch: ~
+
+jobs:
+    coding-standard:
+        runs-on: ubuntu-latest
+
+        name: "Coding standard refactor"
+
+        timeout-minutes: 5
+
+        strategy:
+            fail-fast: false
+            matrix:
+                branch: ["1.10", "1.11", "master"]
+
+        steps:
+            -
+                uses: actions/checkout@v3
+                with:
+                    ref: ${{ matrix.branch }}
+
+            -
+                name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: 8.0 # the lowest PHP version working with ECS
+
+            -
+                name: Install PHP dependencies
+                run: composer update --no-interaction --no-scripts
+
+            -
+                name: Run ECS
+                run: vendor/bin/ecs check --fix src/Sylius
+
+            -
+                name: Create Pull Request
+                uses: peter-evans/create-pull-request@v4
+                with:
+                    commit-message: '[CS][DX] Refactor'
+                    author: Sylius Bot <[email protected]>
+                    title: '[CS][DX] Refactor'
+                    body: |
+                        This PR has been generated automatically.
+                        For more details see [refactor.yml](/Sylius/Sylius/blob/master/.github/workflows/refactor.yml).
+                    labels: |
+                        DX
+                        Enhancement
+                    branch: coding-standard/refactor-${{ matrix.branch }}
+                    delete-branch: true
+                    base: ${{ matrix.branch }}

src/Sylius/Behat/Context/Api/Admin/ManagingCustomerGroupsContext.php

@@ -225,8 +225,8 @@ public function iShouldBeNotifiedThatItHasBeenSuccessfullyDeleted(): void
     {
         Assert::true(
             $this->responseChecker->isDeletionSuccessful(
-            $this->client->getLastResponse()
-        ),
+                $this->client->getLastResponse()
+            ),
             'Customer group could not be deleted'
         );
     }

src/Sylius/Behat/Context/Api/Admin/ManagingOrdersContext.php

@@ -123,10 +123,10 @@ public function iShouldSeeASingleOrderFromCustomer(CustomerInterface $customer):
     {
         Assert::true(
             $this->responseChecker->hasItemWithValue(
-            $this->client->getLastResponse(),
-            'customer',
-            $this->iriConverter->getIriFromItem($customer)
-        ),
+                $this->client->getLastResponse(),
+                'customer',
+                $this->iriConverter->getIriFromItem($customer)
+            ),
             sprintf('There is no order for customer %s', $customer->getEmail())
         );
     }

src/Sylius/Behat/Context/Api/Admin/ManagingProductAssociationTypesContext.php

@@ -146,8 +146,8 @@ public function iShouldBeNotifiedThatItHasBeenSuccessfullyDeleted(): void
     {
         Assert::true(
             $this->responseChecker->isDeletionSuccessful(
-            $this->client->getLastResponse()
-        ),
+                $this->client->getLastResponse()
+            ),
             'Product association type could not be deleted'
         );
     }

src/Sylius/Behat/Context/Api/Admin/ManagingZonesContext.php

@@ -406,8 +406,8 @@ public function iShouldBeNotifiedThatItHasBeenSuccessfullyDeleted(): void
     {
         Assert::true(
             $this->responseChecker->isDeletionSuccessful(
-            $this->client->getLastResponse()
-        ),
+                $this->client->getLastResponse()
+            ),
             'Zone could not be deleted'
         );
     }

src/Sylius/Behat/Context/Api/Shop/AddressContext.php

@@ -381,9 +381,9 @@ public function iShouldBeNotifiedThatTheProvinceNeedsToBeSpecified(): void
     {
         Assert::true(
             $this->responseChecker->hasViolationWithMessage(
-            $this->client->getLastResponse(),
-            'Please select proper province.'
-        )
+                $this->client->getLastResponse(),
+                'Please select proper province.'
+            )
         );
     }
 

src/Sylius/Behat/Context/Cli/CancelUnpaidOrdersContext.php

@@ -13,13 +13,13 @@
 
 namespace Sylius\Behat\Context\Cli;
 
+use Behat\Behat\Context\Context;
 use Sylius\Component\Core\OrderPaymentStates;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Webmozart\Assert\Assert;
-use Behat\Behat\Context\Context;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Webmozart\Assert\Assert;
 
 final class CancelUnpaidOrdersContext implements Context
 {
@@ -64,6 +64,6 @@ public function onlyOrderWithNumberShouldBeCanceled(string $orderNumber): void
      */
     public function shouldBeInformedThatUnpaidOrdersHaveBeenCanceled(): void
     {
-        Assert::contains($this->commandTester->getDisplay(), "Unpaid orders have been canceled");
+        Assert::contains($this->commandTester->getDisplay(), 'Unpaid orders have been canceled');
     }
 }

src/Sylius/Behat/Context/Cli/InstallerContext.php

@@ -13,11 +13,11 @@
 
 namespace Sylius\Behat\Context\Cli;
 
-use Symfony\Component\Console\Command\Command;
 use Behat\Behat\Context\Context;
 use Sylius\Bundle\CoreBundle\Command\InstallSampleDataCommand;
 use Sylius\Bundle\CoreBundle\Command\SetupCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Webmozart\Assert\Assert;

src/Sylius/Behat/Context/Cli/ShowingAvailablePluginsContext.php

@@ -13,10 +13,10 @@
 
 namespace Sylius\Behat\Context\Cli;
 
-use Symfony\Component\Console\Command\Command;
 use Behat\Behat\Context\Context;
 use Sylius\Bundle\CoreBundle\Command\SetupCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Webmozart\Assert\Assert;

src/Sylius/Behat/Context/Setup/ProductAttributeContext.php

@@ -13,10 +13,10 @@
 
 namespace Sylius\Behat\Context\Setup;
 
-use Faker\Generator;
-use Faker\Factory;
 use Behat\Behat\Context\Context;
 use Doctrine\Persistence\ObjectManager;
+use Faker\Factory;
+use Faker\Generator;
 use Sylius\Behat\Service\SharedStorageInterface;
 use Sylius\Component\Attribute\AttributeType\SelectAttributeType;
 use Sylius\Component\Attribute\Factory\AttributeFactoryInterface;

src/Sylius/Behat/Context/Ui/Admin/ManagingOrdersContext.php

@@ -269,11 +269,11 @@ public function itShouldBeShippedTo(
      * @Then the order should be billed to :customerName, :street, :postcode, :city, :countryName
      */
     public function itShouldBeBilledToCustomerAtAddress(
-           string $customerName,
-           string $street,
-           string $postcode,
-           string $city,
-           string $countryName
+        string $customerName,
+        string $street,
+        string $postcode,
+        string $city,
+        string $countryName
     ) {
         $this->itShouldBeBilledTo(null, $customerName, $street, $postcode, $city, $countryName);
     }

src/Sylius/Behat/Context/Ui/Shop/LoginContext.php

@@ -14,7 +14,6 @@
 namespace Sylius\Behat\Context\Ui\Shop;
 
 use Behat\Behat\Context\Context;
-use FriendsOfBehat\PageObjectExtension\Page\UnexpectedPageException;
 use Sylius\Behat\Element\Shop\Account\RegisterElementInterface;
 use Sylius\Behat\NotificationType;
 use Sylius\Behat\Page\Shop\Account\LoginPageInterface;

src/Sylius/Behat/Context/Ui/Shop/ProductContext.php

@@ -254,7 +254,7 @@ public function iCheckListOfProductsForTaxon(TaxonInterface $taxon): void
      */
     public function iTryToBrowseProductsFromTaxonWithATrailingSlashInThePath(TaxonInterface $taxon): void
     {
-        $this->indexPage->tryToOpen(['slug' => $taxon->getSlug().'/']);
+        $this->indexPage->tryToOpen(['slug' => $taxon->getSlug() . '/']);
     }
 
     /**

src/Sylius/Behat/Element/Product/ShowPage/VariantsElement.php

@@ -57,9 +57,9 @@ private function hasProductWithGivenNameCodePriceAndCurrentStock(
         $variantContent = $variant->getParent()->find(
             'css',
             sprintf(
-            '.variants-accordion__content.%s',
-            explode(' ', $variant->getAttribute('class'))[1]
-        )
+                '.variants-accordion__content.%s',
+                explode(' ', $variant->getAttribute('class'))[1]
+            )
         );
 
         if (

src/Sylius/Behat/Page/ErrorPageInterface.php

@@ -14,6 +14,7 @@
 namespace Sylius\Behat\Page;
 
 use Behat\Mink\Exception\ElementNotFoundException;
+
 interface ErrorPageInterface
 {
     public function getCode(): int;

src/Sylius/Behat/Page/Shop/Cart/SummaryPageInterface.php

@@ -21,6 +21,7 @@ interface SummaryPageInterface extends PageInterface
     public function getGrandTotal(): string;
 
     public function getBaseGrandTotal(): string;
+
     public function getIncludedTaxTotal(): string;
 
     public function getExcludedTaxTotal(): string;

src/Sylius/Behat/Service/SessionManager.php

@@ -66,6 +66,7 @@ private function saveAndRestartSession(string $newSessionName): void
         $previousSessionName = $this->mink->getDefaultSessionName();
 
         $this->sharedStorage->set('behat_previous_session_name', $previousSessionName);
+
         try {
             $token = $this->securityService->getCurrentToken();
             $this->sharedStorage->set($this->getKeyForToken($previousSessionName), $token);

src/Sylius/Bundle/AddressingBundle/Form/Type/CountryChoiceType.php

@@ -62,7 +62,7 @@ public function configureOptions(OptionsResolver $resolver): void
                     $countries = array_filter($countries, $options['choice_filter']);
                 }
 
-                usort($countries, static fn(CountryInterface $firstCountry, CountryInterface $secondCountry): int => $firstCountry->getName() <=> $secondCountry->getName());
+                usort($countries, static fn (CountryInterface $firstCountry, CountryInterface $secondCountry): int => $firstCountry->getName() <=> $secondCountry->getName());
 
                 return $countries;
             })

src/Sylius/Bundle/AddressingBundle/Form/Type/ZoneType.php

@@ -67,7 +67,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ];
 
             if ($zone->getType() === ZoneInterface::TYPE_ZONE) {
-                $entryOptions['entry_options']['choice_filter'] = static fn(?ZoneInterface $subZone): bool => $subZone !== null && $zone->getId() !== $subZone->getId();
+                $entryOptions['entry_options']['choice_filter'] = static fn (?ZoneInterface $subZone): bool => $subZone !== null && $zone->getId() !== $subZone->getId();
             }
 
             $event->getForm()->add('members', CollectionType::class, [

src/Sylius/Bundle/AddressingBundle/Tests/Form/Type/CountryChoiceTypeTest.php

@@ -13,8 +13,8 @@
 
 namespace Sylius\Bundle\AddressingBundle\Tests\Form\Type;
 
-use Prophecy\Prophecy\ObjectProphecy;
 use PHPUnit\Framework\Assert;
+use Prophecy\Prophecy\ObjectProphecy;
 use Prophecy\Prophecy\ProphecyInterface;
 use Sylius\Bundle\AddressingBundle\Form\Type\CountryChoiceType;
 use Sylius\Component\Addressing\Model\CountryInterface;
@@ -110,14 +110,14 @@ public function it_returns_filtered_out_countries(): void
             $this->poland->reveal(),
         ]);
 
-        $this->assertChoicesLabels(['Poland'], ['choice_filter' => static fn(?CountryInterface $country): bool => $country !== null && $country->getName() === 'Poland']);
+        $this->assertChoicesLabels(['Poland'], ['choice_filter' => static fn (?CountryInterface $country): bool => $country !== null && $country->getName() === 'Poland']);
     }
 
     private function assertChoicesLabels(array $expectedLabels, array $formConfiguration = []): void
     {
         $form = $this->factory->create(CountryChoiceType::class, null, $formConfiguration);
         $view = $form->createView();
 
-        Assert::assertSame($expectedLabels, array_map(static fn(ChoiceView $choiceView): string => $choiceView->label, $view->vars['choices']));
+        Assert::assertSame($expectedLabels, array_map(static fn (ChoiceView $choiceView): string => $choiceView->label, $view->vars['choices']));
     }
 }

src/Sylius/Bundle/AddressingBundle/Tests/Form/Type/ZoneChoiceTypeTest.php

@@ -13,8 +13,8 @@
 
 namespace Sylius\Bundle\AddressingBundle\Tests\Form\Type;
 
-use Prophecy\Prophecy\ObjectProphecy;
 use PHPUnit\Framework\Assert;
+use Prophecy\Prophecy\ObjectProphecy;
 use Prophecy\Prophecy\ProphecyInterface;
 use Sylius\Bundle\AddressingBundle\Form\Type\ZoneChoiceType;
 use Sylius\Component\Addressing\Model\Scope as AddressingScope;
@@ -136,6 +136,6 @@ private function assertChoicesLabels(array $expectedLabels, array $formConfigura
         $form = $this->factory->create(ZoneChoiceType::class, null, $formConfiguration);
         $view = $form->createView();
 
-        Assert::assertSame($expectedLabels, array_map(fn(ChoiceView $choiceView): string => $choiceView->label, $view->vars['choices']));
+        Assert::assertSame($expectedLabels, array_map(fn (ChoiceView $choiceView): string => $choiceView->label, $view->vars['choices']));
     }
 }

src/Sylius/Bundle/AddressingBundle/spec/Validator/Constraints/ProvinceAddressConstraintValidatorSpec.php

@@ -19,7 +19,6 @@
 use Sylius\Bundle\AddressingBundle\Validator\Constraints\ProvinceAddressConstraintValidator;
 use Sylius\Component\Addressing\Model\AddressInterface;
 use Sylius\Component\Addressing\Model\Country;
-use Sylius\Component\Addressing\Model\CountryInterface;
 use Sylius\Component\Addressing\Model\Province;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Validator\Constraint;

src/Sylius/Bundle/AddressingBundle/test/src/Tests/SyliusAddressingBundleTest.php

@@ -30,7 +30,7 @@ public function its_services_are_initializable(): void
 
         $services = $container->getServiceIds();
 
-        $services = array_filter($services, fn(string $serviceId): bool => str_starts_with($serviceId, 'sylius.'));
+        $services = array_filter($services, fn (string $serviceId): bool => str_starts_with($serviceId, 'sylius.'));
 
         foreach ($services as $id) {
             Assert::assertNotNull($container->get($id, ContainerInterface::NULL_ON_INVALID_REFERENCE));

src/Sylius/Bundle/AdminBundle/Controller/NotificationController.php

@@ -17,7 +17,6 @@
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Psr7\Uri;
 use Http\Message\MessageFactory;
-use Psr\Http\Message\UriInterface;
 use Sylius\Bundle\CoreBundle\Application\Kernel;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;

src/Sylius/Bundle/AdminBundle/Tests/Controller/NotificationControllerTest.php

@@ -13,12 +13,12 @@
 
 namespace Sylius\Bundle\AdminBundle\Tests\Controller;
 
-use Prophecy\Prophecy\ObjectProphecy;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ConnectException;
 use Http\Message\MessageFactory;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
 use Prophecy\Prophecy\ProphecyInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;

src/Sylius/Bundle/AdminBundle/Twig/OrderUnitTaxesExtension.php

@@ -43,7 +43,7 @@ private function getAmount(OrderItemInterface $orderItem, bool $neutral): int
     {
         $total = array_reduce(
             $orderItem->getAdjustmentsRecursively(AdjustmentInterface::TAX_ADJUSTMENT)->toArray(),
-            static fn(int $total, BaseAdjustmentInterface $adjustment) => $neutral === $adjustment->isNeutral() ? $total + $adjustment->getAmount() : $total,
+            static fn (int $total, BaseAdjustmentInterface $adjustment) => $neutral === $adjustment->isNeutral() ? $total + $adjustment->getAmount() : $total,
             0
         );
 

src/Sylius/Bundle/AdminBundle/Twig/ShopExtension.php

@@ -25,7 +25,7 @@ public function __construct(private bool $isShopEnabled)
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('is_shop_enabled', fn(): bool => $this->isShopEnabled),
+            new TwigFunction('is_shop_enabled', fn (): bool => $this->isShopEnabled),
         ];
     }
 }

src/Sylius/Bundle/ApiBundle/Command/Account/ChangePaymentMethod.php

@@ -20,19 +20,19 @@
 /** @experimental */
 class ChangePaymentMethod implements OrderTokenValueAwareInterface, SubresourceIdAwareInterface, IriToIdentifierConversionAwareInterface
 {
-    /**
-     * @var string|null
-     */
+    /** @var string|null */
     public $orderTokenValue;
 
     /**
      * @psalm-immutable
+     *
      * @var string|null
      */
     public $paymentId;
 
     /**
      * @psalm-immutable
+     *
      * @var string
      */
     public $paymentMethodCode;