fixes for Sylius 2.0

Author: jbcr

.github/workflows/build.yml

@@ -152,7 +152,7 @@ jobs:
             -
                 name: Update Webpack version
                 if: matrix.sylius == '~2.0.0'
-                run: composer require "symfony/webpack-encore-bundle:^2.0" --no-update --no-scripts --no-interaction
+                run: composer require "symfony/webpack-encore-bundle:^2.0" "nyholm/psr7:^1.8" --no-update --no-scripts --no-interaction
 
             -
                 name: Remove FOS OAuth Server

tests/Application/Command/CommandWithContext.php

@@ -10,22 +10,22 @@
 
 use JbDevLabs\SyliusCliContextPlugin\Command\CliContextAwareInterface;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(name: 'app:command-with-context')]
 final class CommandWithContext extends Command implements CliContextAwareInterface
 {
     protected static $defaultName = 'app:command-with-context';
-    private ChannelContextInterface $channelContext;
 
-    public function __construct(ChannelContextInterface $channelContext)
+    public function __construct(private readonly ChannelContextInterface $channelContext)
     {
         parent::__construct();
-        $this->channelContext = $channelContext;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $channel = $this->channelContext->getChannel();
         $output->writeln('Channel name: ' . $channel->getName());

tests/Application/Command/CommandWithoutContext.php

@@ -10,22 +10,22 @@
 
 use Sylius\Component\Channel\Context\ChannelContextInterface;
 use Sylius\Component\Channel\Context\ChannelNotFoundException;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand('app:command-without-context')]
 final class CommandWithoutContext extends Command
 {
     protected static $defaultName = 'app:command-without-context';
-    private ChannelContextInterface $channelContext;
 
-    public function __construct(ChannelContextInterface $channelContext)
+    public function __construct(private readonly ChannelContextInterface $channelContext)
     {
         parent::__construct();
-        $this->channelContext = $channelContext;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         try {
             $channel = $this->channelContext->getChannel();

tests/Application/Command/LoadChannelManuallyCommand.php

@@ -11,32 +11,30 @@
 
 use JbDevLabs\SyliusCliContextPlugin\CliContext\CliChannelContext;
 use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand('app:change-channel')]
 final class LoadChannelManuallyCommand extends Command
 {
     protected static $defaultName = 'app:change-channel';
-    private CliChannelContext $channelContext;
-    private ChannelRepositoryInterface $channelRepository;
 
-    public function __construct(CliChannelContext $channelContext, ChannelRepositoryInterface $channelRepository)
+    public function __construct(private readonly CliChannelContext $channelContext, private readonly ChannelRepositoryInterface $channelRepository)
     {
         parent::__construct();
-        $this->channelContext = $channelContext;
-        $this->channelRepository = $channelRepository;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->addOption('channel', 'c', InputOption::VALUE_REQUIRED, 'Channel code to use durring the running command',
             null);
     }
 
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $channel = $input->getOption('channel');
 

tests/Application/Command/OtherCommand.php

@@ -10,21 +10,22 @@
 
 
 use Sylius\Component\Channel\Context\ChannelContextInterface;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand('app:other-command')]
 final class OtherCommand extends Command
 {
     protected static $defaultName = 'app:other-command';
 
-    public function __construct(ChannelContextInterface $channelContext)
+    public function __construct(private readonly ChannelContextInterface $channelContext)
     {
         parent::__construct();
-        $this->channelContext = $channelContext;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $channel = $this->channelContext->getChannel();
         $output->writeln('Channel name: ' . $channel->getName());

tests/Application/Kernel.php

@@ -77,7 +77,7 @@ protected function getContainerBaseClass(): string
 
     private function isTestEnvironment(): bool
     {
-        return 0 === strpos($this->getEnvironment(), 'test');
+        return str_starts_with($this->getEnvironment(), 'test');
     }
 
     private function loadContainerConfiguration(LoaderInterface $loader, string $confDir): void
@@ -96,7 +96,7 @@ private function loadRoutesConfiguration(RoutingConfigurator $routes, string $co
     }
 
     /**
-     * @return BundleInterface[]
+     * @return iterable<BundleInterface>
      */
     private function registerBundlesFromFile(string $bundlesFile): iterable
     {
@@ -109,7 +109,7 @@ private function registerBundlesFromFile(string $bundlesFile): iterable
     }
 
     /**
-     * @return string[]
+     * @return iterable<string>
      */
     private function getConfigurationDirectories(): iterable
     {

tests/Application/config/bundles.php

@@ -44,7 +44,6 @@
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true, 'test_cached' => true],
     Sylius\Behat\Application\SyliusTestPlugin\SyliusTestPlugin::class => ['test' => true, 'test_cached' => true],
-    ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
     Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
     Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true],
     SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],

tests/Application/config/routes/sylius_shop.yaml

@@ -4,9 +4,6 @@ sylius_shop:
     requirements:
         _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$
 
-sylius_shop_payum:
-    resource: "@SyliusShopBundle/Resources/config/routing/payum.yml"
-
 sylius_shop_default_locale:
     path: /
     methods: [GET]

tests/Application/config/sylius/1.11/bundles.php

@@ -10,4 +10,5 @@
     SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
     Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
     Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
+    ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
 ];