Update bundle for Sylius 1.9 / Symfony 4.4+||5.2+

composer.json

@@ -7,7 +7,7 @@
         "php": "^7.2",
         "sylius/sylius": "^1.4",
         "portphp/portphp": "^1.2",
-        "symfony/stopwatch": "^3.3 | ^4.1 | ^5.0",
+        "symfony/stopwatch": "^4.4 || ^5.2",
         "queue-interop/queue-interop": "^0.6.2|^0.7|^0.8"
     },
     "suggest": {

src/Command/ExportDataCommand.php

@@ -43,23 +43,27 @@ protected function configure(): void
                 new InputArgument('file', InputArgument::OPTIONAL, 'The target file to export to.'),
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The format of the file to export to'),
                 /** @todo Extracting details to show with this option. At the moment it will have no effect */
-                new InputOption('details', null, InputOption::VALUE_NONE,
-                    'If to return details about skipped/failed rows'),
+                new InputOption(
+                    'details',
+                    null,
+                    InputOption::VALUE_NONE,
+                    'If to return details about skipped/failed rows'
+                ),
             ]);
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output): void
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         /** @var string $exporter */
         $exporter = $input->getArgument('exporter');
 
         if (empty($exporter)) {
             $this->listExporters($input, $output);
 
-            return;
+            return 0;
         }
 
         $format = $input->getOption('format');
@@ -97,6 +101,8 @@ protected function execute(InputInterface $input, OutputInterface $output): void
             $file,
             $name
         ));
+
+        return 0;
     }
 
     private function listExporters(InputInterface $input, OutputInterface $output, ?string $errorMessage = null): void

src/DependencyInjection/Configuration.php

@@ -14,8 +14,14 @@ final class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder(): TreeBuilder
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('fos_sylius_import_export');
+        if (method_exists(TreeBuilder::class, 'getRootNode')) {
+            $treeBuilder = new TreeBuilder('fos_sylius_import_export');
+            $rootNode = $treeBuilder->getRootNode();
+        } else {
+            $treeBuilder = new TreeBuilder();
+            $rootNode = $treeBuilder->root('fos_sylius_import_export');
+        }
+
 
         $rootNode
             ->children()
@@ -43,7 +49,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->end()
                 ->end()
             ->end()
-        ->end();
+            ->end();
 
         return $treeBuilder;
     }

src/Importer/JsonResourceImporter.php

@@ -4,14 +4,14 @@
 
 namespace FriendsOfSylius\SyliusImportExportPlugin\Importer;
 
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\ORM\EntityManagerInterface;
 use FriendsOfSylius\SyliusImportExportPlugin\Exception\ImporterException;
 use FriendsOfSylius\SyliusImportExportPlugin\Processor\ResourceProcessorInterface;
 
 final class JsonResourceImporter extends ResourceImporter implements SingleDataArrayImporterInterface
 {
     public function __construct(
-        ObjectManager $objectManager,
+        EntityManagerInterface $objectManager,
         ResourceProcessorInterface $resourceProcessor,
         ImportResultLoggerInterface $importerResult,
         int $batchSize,

src/Importer/ResourceImporter.php

@@ -4,18 +4,18 @@
 
 namespace FriendsOfSylius\SyliusImportExportPlugin\Importer;
 
-use Doctrine\Common\Persistence\ObjectManager;
+use Port\Reader\ReaderFactory;
+use Doctrine\ORM\EntityManagerInterface;
 use FriendsOfSylius\SyliusImportExportPlugin\Exception\ImporterException;
 use FriendsOfSylius\SyliusImportExportPlugin\Exception\ItemIncompleteException;
 use FriendsOfSylius\SyliusImportExportPlugin\Processor\ResourceProcessorInterface;
-use Port\Reader\ReaderFactory;
 
 class ResourceImporter implements ImporterInterface
 {
     /** @var ReaderFactory */
     private $readerFactory;
 
-    /** @var ObjectManager */
+    /** @var EntityManagerInterface */
     protected $objectManager;
 
     /** @var ResourceProcessorInterface */
@@ -38,7 +38,7 @@ class ResourceImporter implements ImporterInterface
 
     public function __construct(
         ReaderFactory $readerFactory,
-        ObjectManager $objectManager,
+        EntityManagerInterface $objectManager,
         ResourceProcessorInterface $resourceProcessor,
         ImportResultLoggerInterface $importerResult,
         int $batchSize,

src/Resources/config/services.yml

@@ -354,7 +354,7 @@ services:
 
     sylius.class_metadata.product_image:
         class: Doctrine\ORM\Mapping\ClassMetadata
-        factory:   'doctrine.orm.default_entity_manager:getClassMetadata'
+        factory:   ['@doctrine.orm.default_entity_manager' , 'getClassMetadata']
         arguments: ['Sylius\Component\Core\Model\ProductImage']
 
     sylius.repository.product_image: