diff --git a/app/config/services_test.yml b/app/config/services_test.yml index c850bf215..e2789b19c 100644 --- a/app/config/services_test.yml +++ b/app/config/services_test.yml @@ -6,6 +6,9 @@ services: # fixtures Wallabag\DataFixtures\: + bind: + $defaultIgnoreOriginInstanceRules: '%wallabag.default_ignore_origin_instance_rules%' + $defaultInternalSettings: '%wallabag.default_internal_settings%' resource: '../../fixtures/*' tags: ['doctrine.fixture.orm'] autowire: true diff --git a/fixtures/IgnoreOriginInstanceRuleFixtures.php b/fixtures/IgnoreOriginInstanceRuleFixtures.php index 31833e31a..b02cfcba3 100644 --- a/fixtures/IgnoreOriginInstanceRuleFixtures.php +++ b/fixtures/IgnoreOriginInstanceRuleFixtures.php @@ -4,27 +4,22 @@ namespace Wallabag\DataFixtures; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; use Wallabag\Entity\IgnoreOriginInstanceRule; -class IgnoreOriginInstanceRuleFixtures extends Fixture implements ContainerAwareInterface +class IgnoreOriginInstanceRuleFixtures extends Fixture { - /** - * @var ContainerInterface - */ - private $container; + private array $defaultIgnoreOriginInstanceRules; - public function setContainer(?ContainerInterface $container = null) + public function __construct(array $defaultIgnoreOriginInstanceRules) { - $this->container = $container; + $this->defaultIgnoreOriginInstanceRules = $defaultIgnoreOriginInstanceRules; } public function load(ObjectManager $manager): void { - foreach ($this->container->getParameter('wallabag.default_ignore_origin_instance_rules') as $ignore_origin_instance_rule) { + foreach ($this->defaultIgnoreOriginInstanceRules as $ignoreOriginInstanceRule) { $newIgnoreOriginInstanceRule = new IgnoreOriginInstanceRule(); - $newIgnoreOriginInstanceRule->setRule($ignore_origin_instance_rule['rule']); + $newIgnoreOriginInstanceRule->setRule($ignoreOriginInstanceRule['rule']); $manager->persist($newIgnoreOriginInstanceRule); } diff --git a/fixtures/InternalSettingFixtures.php b/fixtures/InternalSettingFixtures.php index f9d6c9385..a09971968 100644 --- a/fixtures/InternalSettingFixtures.php +++ b/fixtures/InternalSettingFixtures.php @@ -4,25 +4,20 @@ namespace Wallabag\DataFixtures; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; use Wallabag\Entity\InternalSetting; -class InternalSettingFixtures extends Fixture implements ContainerAwareInterface +class InternalSettingFixtures extends Fixture { - /** - * @var ContainerInterface - */ - private $container; + private array $defaultInternalSettings; - public function setContainer(?ContainerInterface $container = null) + public function __construct(array $defaultInternalSettings) { - $this->container = $container; + $this->defaultInternalSettings = $defaultInternalSettings; } public function load(ObjectManager $manager): void { - foreach ($this->container->getParameter('wallabag.default_internal_settings') as $setting) { + foreach ($this->defaultInternalSettings as $setting) { $newSetting = new InternalSetting(); $newSetting->setName($setting['name']); $newSetting->setValue($setting['value']); diff --git a/fixtures/SiteCredentialFixtures.php b/fixtures/SiteCredentialFixtures.php index dab7a1714..3f99f690a 100644 --- a/fixtures/SiteCredentialFixtures.php +++ b/fixtures/SiteCredentialFixtures.php @@ -5,37 +5,32 @@ namespace Wallabag\DataFixtures; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; use Wallabag\Entity\SiteCredential; use Wallabag\Entity\User; use Wallabag\Helper\CryptoProxy; -class SiteCredentialFixtures extends Fixture implements DependentFixtureInterface, ContainerAwareInterface +class SiteCredentialFixtures extends Fixture implements DependentFixtureInterface { - /** - * @var ContainerInterface - */ - private $container; + private CryptoProxy $cryptoProxy; - public function setContainer(?ContainerInterface $container = null) + public function __construct(CryptoProxy $cryptoProxy) { - $this->container = $container; + $this->cryptoProxy = $cryptoProxy; } public function load(ObjectManager $manager): void { $credential = new SiteCredential($this->getReference('admin-user', User::class)); $credential->setHost('.super.com'); - $credential->setUsername($this->container->get(CryptoProxy::class)->crypt('.super')); - $credential->setPassword($this->container->get(CryptoProxy::class)->crypt('bar')); + $credential->setUsername($this->cryptoProxy->crypt('.super')); + $credential->setPassword($this->cryptoProxy->crypt('bar')); $manager->persist($credential); $credential = new SiteCredential($this->getReference('admin-user', User::class)); $credential->setHost('paywall.example.com'); - $credential->setUsername($this->container->get(CryptoProxy::class)->crypt('paywall.example')); - $credential->setPassword($this->container->get(CryptoProxy::class)->crypt('bar')); + $credential->setUsername($this->cryptoProxy->crypt('paywall.example')); + $credential->setPassword($this->cryptoProxy->crypt('bar')); $manager->persist($credential);