Fix some deps and fix deprecated interface

loevgaard · Feb 14, 2022 · f0e85b3 · f0e85b3
1 parent 9b81559
commit f0e85b3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -5,8 +5,10 @@
     "license": "MIT",
     "require": {
         "php": ">=7.3",
+        "doctrine/persistence": "^1.3 || ^2.0",
         "setono/doctrine-orm-batcher-bundle": "^0.3.1",
         "sylius/sylius": "^1.3",
+        "symfony/config": "^4.4 || ^5.0",
         "symfony/event-dispatcher": "^4.4 || ^5.0",
         "symfony/messenger": "^4.4 || ^5.0",
         "thecodingmachine/safe": "^1.0",
@@ -30,7 +32,7 @@
         "phpstan/phpstan-strict-rules": "^0.12",
         "phpstan/phpstan-webmozart-assert": "^0.12",
         "phpunit/phpunit": "^8.3",
-        "roave/security-advisories": "dev-master",
+        "roave/security-advisories": "dev-latest",
         "sensiolabs/security-checker": "^5.0",
         "sylius-labs/coding-standard": "^3.1",
         "symfony/browser-kit": "^4.4 || ^5.0",
@@ -42,7 +44,11 @@
         "thecodingmachine/phpstan-safe-rule": "^1.0"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "symfony/thanks": true,
+            "ergebnis/composer-normalize": true
+        }
     },
     "extra": {
         "branch-alias": {

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -11,14 +11,8 @@ final class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder(): TreeBuilder
     {
-        if (method_exists(TreeBuilder::class, 'getRootNode')) {
-            $treeBuilder = new TreeBuilder('loevgaard_sylius_barcode');
-            $rootNode = $treeBuilder->getRootNode();
-        } else {
-            // BC layer for symfony/config 4.1 and older
-            $treeBuilder = new TreeBuilder();
-            $rootNode = $treeBuilder->root('loevgaard_sylius_barcode');
-        }
+        $treeBuilder = new TreeBuilder('loevgaard_sylius_barcode');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()

diff --git a/src/Message/Handler/ProcessBatchHandler.php b/src/Message/Handler/ProcessBatchHandler.php
@@ -4,7 +4,7 @@
 
 namespace Loevgaard\SyliusBarcodePlugin\Message\Handler;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManagerInterface;
 use InvalidArgumentException;
 use Loevgaard\SyliusBarcodePlugin\BarcodeChecker\BarcodeCheckerInterface;