From 42714b704d9707c0ecafc59fc2659557c2302ab5 Mon Sep 17 00:00:00 2001 From: fouadsalkini Date: Mon, 1 Jan 2024 04:50:27 +0200 Subject: [PATCH 1/2] added sf7 support --- composer.json | 16 ++++++++-------- example/composer.json | 24 ++++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index d99514b..8996c63 100644 --- a/composer.json +++ b/composer.json @@ -15,19 +15,19 @@ ], "require": { "php": "^8", - "symfony/framework-bundle": "^6.0", - "symfony/console": "^6.0", - "symfony/finder": "^6.0", + "symfony/framework-bundle": "^6.0|^7.0", + "symfony/console": "^6.0|^7.0", + "symfony/finder": "^6.0|^7.0", "doctrine/doctrine-bundle": "^2.0", "doctrine/orm": "^2.0", - "symfony/yaml": "^6.0", - "symfony/doctrine-bridge": "^6.0", + "symfony/yaml": "^6.0|^7.0", + "symfony/doctrine-bridge": "^6.0|^7.0", "webmozart/glob": "^4.5" }, "require-dev": { - "symfony/config": "^6.0", - "symfony/dependency-injection": "^6.0", - "symfony/phpunit-bridge": "^6.0" + "symfony/config": "^6.0|^7.0", + "symfony/dependency-injection": "^6.0|^7.0", + "symfony/phpunit-bridge": "^6.0|^7.0" }, "autoload": { diff --git a/example/composer.json b/example/composer.json index 33a8c4b..07a0747 100644 --- a/example/composer.json +++ b/example/composer.json @@ -6,23 +6,23 @@ "ext-ctype": "*", "ext-iconv": "*", "evotodi/seed-bundle": "dev-master", - "sensio/framework-extra-bundle": "^6.0", - "symfony/asset": "^6.0", - "symfony/console": "^6.0", - "symfony/dotenv": "^6.0", + "sensio/framework-extra-bundle": "^6.0|^7.0", + "symfony/asset": "^6.0|^7.0", + "symfony/console": "^6.0|^7.0", + "symfony/dotenv": "^6.0|^7.0", "symfony/flex": "^1.0", - "symfony/framework-bundle": "^6.0", - "symfony/property-access": "^6.0", - "symfony/yaml": "^6.0", + "symfony/framework-bundle": "^6.0|^7.0", + "symfony/property-access": "^6.0|^7.0", + "symfony/yaml": "^6.0|^7.0", "doctrine/doctrine-bundle": "^2.0", "doctrine/orm": "^2.8" }, "require-dev": { - "symfony/debug-bundle": "^6.0", + "symfony/debug-bundle": "^6.0|^7.0", "symfony/maker-bundle": "^1.0", - "symfony/stopwatch": "^6.0", - "symfony/var-dumper": "^6.0", - "symfony/web-profiler-bundle": "^6.0" + "symfony/stopwatch": "^6.0|^7.0", + "symfony/var-dumper": "^6.0|^7.0", + "symfony/web-profiler-bundle": "^6.0|^7.0" }, "config": { "preferred-install": { @@ -68,7 +68,7 @@ "extra": { "symfony": { "allow-contrib": true, - "require": "^6.0", + "require": "^6.0|^7.0", "docker": false } } From 716b0fd800bdae8609c8e574ec3b9d3eaa6ce7c5 Mon Sep 17 00:00:00 2001 From: Evotodi Date: Wed, 3 Jan 2024 10:34:48 -0500 Subject: [PATCH 2/2] Fixed depreciations in test --- src/DependencyInjection/Compiler/SeedPass.php | 2 +- src/DependencyInjection/EvotodiSeedExtension.php | 2 +- src/EvotodiSeedBundle.php | 4 ++-- tests/App/config.yml | 3 ++- tests/SeedCommandTest.php | 4 ++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/DependencyInjection/Compiler/SeedPass.php b/src/DependencyInjection/Compiler/SeedPass.php index 6069a90..8f05635 100644 --- a/src/DependencyInjection/Compiler/SeedPass.php +++ b/src/DependencyInjection/Compiler/SeedPass.php @@ -15,7 +15,7 @@ class SeedPass implements CompilerPassInterface /** * @throws InvalidSeedNameException */ - public function process(ContainerBuilder $container) + public function process(ContainerBuilder $container): void { if (!$container->has('seed.registry')) { return; diff --git a/src/DependencyInjection/EvotodiSeedExtension.php b/src/DependencyInjection/EvotodiSeedExtension.php index 8dd3170..cfd3caf 100644 --- a/src/DependencyInjection/EvotodiSeedExtension.php +++ b/src/DependencyInjection/EvotodiSeedExtension.php @@ -14,7 +14,7 @@ class EvotodiSeedExtension extends Extension /** * @throws Exception */ - public function load(array $configs, ContainerBuilder $container) + public function load(array $configs, ContainerBuilder $container): void { $container->registerForAutoconfiguration(SeedInterface::class)->addTag('seed.seed'); diff --git a/src/EvotodiSeedBundle.php b/src/EvotodiSeedBundle.php index f37ad7c..6de3fbf 100644 --- a/src/EvotodiSeedBundle.php +++ b/src/EvotodiSeedBundle.php @@ -19,8 +19,8 @@ public function getContainerExtension(): ?ExtensionInterface return $this->extension; } - public function build(ContainerBuilder $container) - { + public function build(ContainerBuilder $container): void + { $this->container = $container; parent::build($container); diff --git a/tests/App/config.yml b/tests/App/config.yml index 018de42..71813fe 100644 --- a/tests/App/config.yml +++ b/tests/App/config.yml @@ -8,7 +8,8 @@ framework: doctrine: dbal: memory: true - orm: ~ + orm: + enable_lazy_ghost_objects: true services: Evotodi\SeedBundle\Tests\fixtures\: resource: '../fixtures/*' diff --git a/tests/SeedCommandTest.php b/tests/SeedCommandTest.php index a69bd93..6c519d2 100644 --- a/tests/SeedCommandTest.php +++ b/tests/SeedCommandTest.php @@ -1,6 +1,10 @@