Port Sylius 2 and Symfony 7.4 with PHP 8.2 enhancements

.gitignore

@@ -2,6 +2,8 @@
 /node_modules/
 /composer.lock
 
+/.idea/
+
 /etc/build/*
 !/etc/build/.gitignore
 

composer.json

@@ -8,13 +8,22 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.4 || ^8.1",
-        "sherlockode/advanced-content-bundle": "^0.9.8",
-        "sylius/sylius": "^1.10"
+        "php": "^8.2",
+        "sherlockode/advanced-content-bundle": "^0.10",
+        "sylius/sylius": "^2.0",
+        "symfony/framework-bundle": "^7.4",
+        "symfony/form": "^7.4",
+        "symfony/twig-bundle": "^7.4",
+        "twig/twig": "^3.0"
     },
     "config": {
         "sort-packages": true
     },
+    "extra": {
+        "branch-alias": {
+            "dev-sylius-2": "1.0.x-dev"
+        }
+    },
     "autoload": {
         "psr-4": {
             "Sherlockode\\SyliusAdvancedContentPlugin\\": "src/"

src/Command/ScopeInitCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sherlockode\SyliusAdvancedContentPlugin\Command;
 
 use Sherlockode\AdvancedContentBundle\Manager\ConfigurationManager;
@@ -12,87 +14,47 @@
 
 class ScopeInitCommand extends Command
 {
-    /**
-     * @var ConfigurationManager
-     */
-    private $configurationManager;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @var ScopeInitializer
-     */
-    private $scopeInitializer;
-
-    /**
-     * @param ConfigurationManager $configurationManager
-     * @param TranslatorInterface  $translator
-     * @param ScopeInitializer     $scopeInitializer
-     * @param                      $name
-     */
     public function __construct(
-        ConfigurationManager $configurationManager,
-        TranslatorInterface $translator,
-        ScopeInitializer $scopeInitializer,
-        $name = null
+        private readonly ConfigurationManager $configurationManager,
+        private readonly TranslatorInterface $translator,
+        private readonly ScopeInitializer $scopeInitializer,
     ) {
-        parent::__construct($name);
-        $this->configurationManager = $configurationManager;
-        $this->translator = $translator;
-        $this->scopeInitializer = $scopeInitializer;
+        parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('sherlockode:sylius-acb:init-scope')
             ->setDescription('Initialize sylius scopes for ACB')
         ;
     }
 
-    /**
-     * @param InputInterface  $input
-     * @param OutputInterface $output
-     *
-     * @return int|void
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 
         if (!$this->configurationManager->isScopesEnabled()) {
             $io->info($this->translator->trans('sherlockode_sylius_acb.scopes.disabled'));
 
-            if (defined(sprintf('%s::SUCCESS', get_class($this)))) {
-                return self::SUCCESS;
-            }
-            return;
+            return self::SUCCESS;
         }
+
         if (!$this->scopeInitializer->hasMissingScopes()) {
             $io->info($this->translator->trans('sherlockode_sylius_acb.scopes.up_to_date'));
 
-            if (defined(sprintf('%s::SUCCESS', get_class($this)))) {
-                return self::SUCCESS;
-            }
-            return;
+            return self::SUCCESS;
         }
 
         try {
             $this->scopeInitializer->init();
             $io->success($this->translator->trans('sherlockode_sylius_acb.scopes.init_success'));
-            if (defined(sprintf('%s::SUCCESS', get_class($this)))) {
-                return self::SUCCESS;
-            }
-            return;
+
+            return self::SUCCESS;
         } catch (\Exception $e) {
             $io->error($e->getMessage());
 
-            if (defined(sprintf('%s::FAILURE', get_class($this)))) {
-                return self::FAILURE;
-            }
+            return self::FAILURE;
         }
     }
 }

src/Controller/PreviewController.php

@@ -1,60 +1,29 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sherlockode\SyliusAdvancedContentPlugin\Controller;
 
 use Sherlockode\AdvancedContentBundle\Scope\ScopeHandlerInterface;
 use Sherlockode\SyliusAdvancedContentPlugin\Preview\ViewHandlerInterface;
 use Sherlockode\SyliusAdvancedContentPlugin\Scope\ChannelLocaleScopeHandler;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class PreviewController extends AbstractController
 {
-    /**
-     * @var ChannelLocaleScopeHandler
-     */
-    private $channelLocaleScopeHandler;
-
-    /**
-     * @var RepositoryInterface
-     */
-    private $pageRepository;
-
-    /**
-     * @var ViewHandlerInterface
-     */
-    private $viewHandler;
-
-    /**
-     * @param ScopeHandlerInterface $channelLocaleScopeHandler
-     * @param RepositoryInterface   $pageRepository
-     * @param ViewHandlerInterface  $viewHandler
-     */
     public function __construct(
-        ScopeHandlerInterface $channelLocaleScopeHandler,
-        RepositoryInterface $pageRepository,
-        ViewHandlerInterface $viewHandler
+        private readonly ScopeHandlerInterface $channelLocaleScopeHandler,
+        private readonly RepositoryInterface $pageRepository,
+        private readonly ViewHandlerInterface $viewHandler,
     ) {
-        $this->channelLocaleScopeHandler = $channelLocaleScopeHandler;
-        $this->pageRepository = $pageRepository;
-        $this->viewHandler = $viewHandler;
     }
 
-    /**
-     * @param Request $request
-     * @param string  $pageIdentifier
-     *
-     * @return Response
-     *
-     * @throws \Exception
-     */
-    public function previewAction(
-        Request $request,
-        string $pageIdentifier
-    ): Response {
+    public function previewAction(Request $request, string $pageIdentifier): Response
+    {
         $channelCode = $request->query->get('_channel_code');
         $localeCode = $request->query->get('_locale');
 
@@ -67,7 +36,7 @@ public function previewAction(
             throw new NotFoundHttpException(sprintf(
                 'Scope for channel "%s" and locale "%s" does not exists',
                 $channelCode,
-                $localeCode
+                $localeCode,
             ));
         }
 
@@ -77,7 +46,7 @@ public function previewAction(
             throw new NotFoundHttpException(sprintf(
                 'Page with scope for channel "%s" and locale "%s" does not exists',
                 $channelCode,
-                $localeCode
+                $localeCode,
             ));
         }
 
@@ -86,7 +55,7 @@ public function previewAction(
         if (!$template) {
             throw new \Exception(sprintf(
                 'Cannot find any template for the page "%s" preview',
-                $page->getPageIdentifier()
+                $page->getPageIdentifier(),
             ));
         }
 

src/Controller/ScopeController.php

@@ -1,50 +1,25 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sherlockode\SyliusAdvancedContentPlugin\Controller;
 
 use Sherlockode\AdvancedContentBundle\Manager\ConfigurationManager;
 use Sherlockode\SyliusAdvancedContentPlugin\Scope\ScopeInitializer;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ScopeController extends AbstractController
 {
-    /**
-     * @var ConfigurationManager
-     */
-    private $configurationManager;
-
-    /**
-     * @var ScopeInitializer
-     */
-    private $scopeInitializer;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @param ConfigurationManager $configurationManager
-     * @param ScopeInitializer     $scopeInitializer
-     * @param TranslatorInterface  $translator
-     */
     public function __construct(
-        ConfigurationManager $configurationManager,
-        ScopeInitializer $scopeInitializer,
-        TranslatorInterface $translator
+        private readonly ConfigurationManager $configurationManager,
+        private readonly ScopeInitializer $scopeInitializer,
+        private readonly TranslatorInterface $translator,
     ) {
-        $this->configurationManager = $configurationManager;
-        $this->scopeInitializer = $scopeInitializer;
-        $this->translator = $translator;
     }
 
-    /**
-     * @return Response
-     */
-    public function updateScopesAction()
+    public function updateScopesAction(): Response
     {
         if (!$this->configurationManager->isScopesEnabled()) {
             $this->addFlash('error', $this->translator->trans('sherlockode_sylius_acb.scopes.disabled'));

src/DependencyInjection/Compiler/SyliusClassMappingCompilerPass.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sherlockode\SyliusAdvancedContentPlugin\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

src/DependencyInjection/SherlockodeSyliusAdvancedContentExtension.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sherlockode\SyliusAdvancedContentPlugin\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/Entity/Content.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sherlockode\SyliusAdvancedContentPlugin\Entity;
 
 use Doctrine\Common\Collections\Collection;

src/Entity/ContentInterface.php

@@ -4,7 +4,7 @@
 
 namespace Sherlockode\SyliusAdvancedContentPlugin\Entity;
 
-use Sylius\Component\Resource\Model\ResourceInterface;
+use Sylius\Resource\Model\ResourceInterface;
 
 interface ContentInterface extends ResourceInterface
 {

src/Entity/ContentVersion.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sherlockode\SyliusAdvancedContentPlugin\Entity;
 
 use Sherlockode\AdvancedContentBundle\Model\ContentVersion as BaseContentVersion;

src/Entity/ContentVersionInterface.php

@@ -4,7 +4,7 @@
 
 namespace Sherlockode\SyliusAdvancedContentPlugin\Entity;
 
-use Sylius\Component\Resource\Model\ResourceInterface;
+use Sylius\Resource\Model\ResourceInterface;
 
 interface ContentVersionInterface extends ResourceInterface
 {

src/Entity/Page.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sherlockode\SyliusAdvancedContentPlugin\Entity;
 
 use Doctrine\Common\Collections\Collection;
@@ -8,7 +10,7 @@
 use Gedmo\Timestampable\Traits\TimestampableEntity;
 use Sherlockode\AdvancedContentBundle\Model\Page as BasePage;
 use Sherlockode\AdvancedContentBundle\Model\PageVersionInterface;
-use Sylius\Component\Resource\Model\ResourceInterface;
+use Sylius\Resource\Model\ResourceInterface;
 
 class Page extends BasePage implements PageInterface
 {

src/Entity/PageInterface.php

@@ -4,7 +4,7 @@
 
 namespace Sherlockode\SyliusAdvancedContentPlugin\Entity;
 
-use Sylius\Component\Resource\Model\ResourceInterface;
+use Sylius\Resource\Model\ResourceInterface;
 
 interface PageInterface extends ResourceInterface
 {

src/Entity/PageMeta.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sherlockode\SyliusAdvancedContentPlugin\Entity;
 
 use Doctrine\Common\Collections\Collection;

src/Entity/PageMetaInterface.php

@@ -4,7 +4,7 @@
 
 namespace Sherlockode\SyliusAdvancedContentPlugin\Entity;
 
-use Sylius\Component\Resource\Model\ResourceInterface;
+use Sylius\Resource\Model\ResourceInterface;
 
 interface PageMetaInterface extends ResourceInterface
 {

src/Entity/PageMetaVersion.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sherlockode\SyliusAdvancedContentPlugin\Entity;
 
 use Sherlockode\AdvancedContentBundle\Model\PageMetaVersion as BasePageMetaVersion;