diff --git a/app/config/services_test.yml b/app/config/services_test.yml index 781d5c770..02aae0b76 100644 --- a/app/config/services_test.yml +++ b/app/config/services_test.yml @@ -22,11 +22,6 @@ services: - "%kernel.cache_dir%/doctrine/metadata" # fixtures - Wallabag\UserBundle\DataFixtures\: - resource: '../../src/Wallabag/UserBundle/DataFixtures/*' - tags: ['doctrine.fixture.orm'] - autowire: true - Wallabag\CoreBundle\DataFixtures\: resource: '../../src/Wallabag/CoreBundle/DataFixtures/*' tags: ['doctrine.fixture.orm'] diff --git a/src/Wallabag/CoreBundle/DataFixtures/AnnotationFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/AnnotationFixtures.php index 2f4db5adc..5c49ceed0 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/AnnotationFixtures.php +++ b/src/Wallabag/CoreBundle/DataFixtures/AnnotationFixtures.php @@ -7,7 +7,6 @@ use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; use Wallabag\CoreBundle\Entity\Annotation; use Wallabag\CoreBundle\Entity\Entry; -use Wallabag\UserBundle\DataFixtures\UserFixtures; use Wallabag\UserBundle\Entity\User; class AnnotationFixtures extends Fixture implements DependentFixtureInterface diff --git a/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php index 1992fb905..45e7b6f20 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php @@ -6,7 +6,6 @@ use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; use Wallabag\CoreBundle\Entity\Config; -use Wallabag\UserBundle\DataFixtures\UserFixtures; use Wallabag\UserBundle\Entity\User; class ConfigFixtures extends Fixture implements DependentFixtureInterface diff --git a/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php index 571c8e8b2..acb32695b 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php +++ b/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php @@ -7,7 +7,6 @@ use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\CoreBundle\Entity\Tag; -use Wallabag\UserBundle\DataFixtures\UserFixtures; use Wallabag\UserBundle\Entity\User; class EntryFixtures extends Fixture implements DependentFixtureInterface diff --git a/src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php index 22b7efae6..a17685619 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php +++ b/src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php @@ -6,7 +6,6 @@ use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule; -use Wallabag\UserBundle\DataFixtures\UserFixtures; use Wallabag\UserBundle\Entity\User; class IgnoreOriginUserRuleFixtures extends Fixture implements DependentFixtureInterface diff --git a/src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php index 92c226e10..8bb952cad 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php +++ b/src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php @@ -9,7 +9,6 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Wallabag\CoreBundle\Entity\SiteCredential; use Wallabag\CoreBundle\Helper\CryptoProxy; -use Wallabag\UserBundle\DataFixtures\UserFixtures; use Wallabag\UserBundle\Entity\User; class SiteCredentialFixtures extends Fixture implements DependentFixtureInterface, ContainerAwareInterface diff --git a/src/Wallabag/UserBundle/DataFixtures/UserFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/UserFixtures.php similarity index 96% rename from src/Wallabag/UserBundle/DataFixtures/UserFixtures.php rename to src/Wallabag/CoreBundle/DataFixtures/UserFixtures.php index b5ab28fa5..a0951fe1c 100644 --- a/src/Wallabag/UserBundle/DataFixtures/UserFixtures.php +++ b/src/Wallabag/CoreBundle/DataFixtures/UserFixtures.php @@ -1,6 +1,6 @@