Skip to content

Commit f0e85b3

Browse files
committed
Fix some deps and fix deprecated interface
1 parent 9b81559 commit f0e85b3

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

composer.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
"license": "MIT",
66
"require": {
77
"php": ">=7.3",
8+
"doctrine/persistence": "^1.3 || ^2.0",
89
"setono/doctrine-orm-batcher-bundle": "^0.3.1",
910
"sylius/sylius": "^1.3",
11+
"symfony/config": "^4.4 || ^5.0",
1012
"symfony/event-dispatcher": "^4.4 || ^5.0",
1113
"symfony/messenger": "^4.4 || ^5.0",
1214
"thecodingmachine/safe": "^1.0",
@@ -30,7 +32,7 @@
3032
"phpstan/phpstan-strict-rules": "^0.12",
3133
"phpstan/phpstan-webmozart-assert": "^0.12",
3234
"phpunit/phpunit": "^8.3",
33-
"roave/security-advisories": "dev-master",
35+
"roave/security-advisories": "dev-latest",
3436
"sensiolabs/security-checker": "^5.0",
3537
"sylius-labs/coding-standard": "^3.1",
3638
"symfony/browser-kit": "^4.4 || ^5.0",
@@ -42,7 +44,11 @@
4244
"thecodingmachine/phpstan-safe-rule": "^1.0"
4345
},
4446
"config": {
45-
"sort-packages": true
47+
"sort-packages": true,
48+
"allow-plugins": {
49+
"symfony/thanks": true,
50+
"ergebnis/composer-normalize": true
51+
}
4652
},
4753
"extra": {
4854
"branch-alias": {

src/DependencyInjection/Configuration.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,8 @@ final class Configuration implements ConfigurationInterface
1111
{
1212
public function getConfigTreeBuilder(): TreeBuilder
1313
{
14-
if (method_exists(TreeBuilder::class, 'getRootNode')) {
15-
$treeBuilder = new TreeBuilder('loevgaard_sylius_barcode');
16-
$rootNode = $treeBuilder->getRootNode();
17-
} else {
18-
// BC layer for symfony/config 4.1 and older
19-
$treeBuilder = new TreeBuilder();
20-
$rootNode = $treeBuilder->root('loevgaard_sylius_barcode');
21-
}
14+
$treeBuilder = new TreeBuilder('loevgaard_sylius_barcode');
15+
$rootNode = $treeBuilder->getRootNode();
2216

2317
$rootNode
2418
->children()

src/Message/Handler/ProcessBatchHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Loevgaard\SyliusBarcodePlugin\Message\Handler;
66

7-
use Doctrine\Common\Persistence\ManagerRegistry;
7+
use Doctrine\Persistence\ManagerRegistry;
88
use Doctrine\ORM\EntityManagerInterface;
99
use InvalidArgumentException;
1010
use Loevgaard\SyliusBarcodePlugin\BarcodeChecker\BarcodeCheckerInterface;

0 commit comments

Comments
 (0)