From 7d20756b7b800bcd421a96e0dd24395baa392c88 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Sat, 30 Mar 2024 01:24:38 +0100 Subject: [PATCH] Move fixtures out of src --- app/config/services_test.yml | 2 +- composer-dependency-analyser.php | 1 + composer.json | 3 ++- {src/DataFixtures => fixtures}/AnnotationFixtures.php | 0 {src/DataFixtures => fixtures}/ConfigFixtures.php | 0 {src/DataFixtures => fixtures}/EntryFixtures.php | 0 .../IgnoreOriginInstanceRuleFixtures.php | 0 .../DataFixtures => fixtures}/IgnoreOriginUserRuleFixtures.php | 0 {src/DataFixtures => fixtures}/InternalSettingFixtures.php | 0 {src/DataFixtures => fixtures}/SiteCredentialFixtures.php | 0 {src/DataFixtures => fixtures}/TagFixtures.php | 0 {src/DataFixtures => fixtures}/TaggingRuleFixtures.php | 0 {src/DataFixtures => fixtures}/UserFixtures.php | 0 13 files changed, 4 insertions(+), 2 deletions(-) rename {src/DataFixtures => fixtures}/AnnotationFixtures.php (100%) rename {src/DataFixtures => fixtures}/ConfigFixtures.php (100%) rename {src/DataFixtures => fixtures}/EntryFixtures.php (100%) rename {src/DataFixtures => fixtures}/IgnoreOriginInstanceRuleFixtures.php (100%) rename {src/DataFixtures => fixtures}/IgnoreOriginUserRuleFixtures.php (100%) rename {src/DataFixtures => fixtures}/InternalSettingFixtures.php (100%) rename {src/DataFixtures => fixtures}/SiteCredentialFixtures.php (100%) rename {src/DataFixtures => fixtures}/TagFixtures.php (100%) rename {src/DataFixtures => fixtures}/TaggingRuleFixtures.php (100%) rename {src/DataFixtures => fixtures}/UserFixtures.php (100%) diff --git a/app/config/services_test.yml b/app/config/services_test.yml index 9d894bb57..c850bf215 100644 --- a/app/config/services_test.yml +++ b/app/config/services_test.yml @@ -6,6 +6,6 @@ services: # fixtures Wallabag\DataFixtures\: - resource: '../../src/DataFixtures/*' + resource: '../../fixtures/*' tags: ['doctrine.fixture.orm'] autowire: true diff --git a/composer-dependency-analyser.php b/composer-dependency-analyser.php index 7034e16e4..8a778481a 100644 --- a/composer-dependency-analyser.php +++ b/composer-dependency-analyser.php @@ -12,6 +12,7 @@ return $config ->addPathToScan(__DIR__ . '/migrations', false) ->addPathToScan(__DIR__ . '/src', false) ->addPathToScan(__DIR__ . '/web', false) + ->addPathToScan(__DIR__ . '/fixtures', true) ->addPathToScan(__DIR__ . '/tests', true) ->ignoreErrorsOnPackages([ 'babdev/pagerfanta-bundle', diff --git a/composer.json b/composer.json index 654540e23..97a045784 100644 --- a/composer.json +++ b/composer.json @@ -200,7 +200,8 @@ }, "autoload-dev": { "psr-4": { - "Tests\\Wallabag\\": "tests/" + "Tests\\Wallabag\\": "tests/", + "Wallabag\\DataFixtures\\": "fixtures/" }, "files": [ "tests/functions.php" diff --git a/src/DataFixtures/AnnotationFixtures.php b/fixtures/AnnotationFixtures.php similarity index 100% rename from src/DataFixtures/AnnotationFixtures.php rename to fixtures/AnnotationFixtures.php diff --git a/src/DataFixtures/ConfigFixtures.php b/fixtures/ConfigFixtures.php similarity index 100% rename from src/DataFixtures/ConfigFixtures.php rename to fixtures/ConfigFixtures.php diff --git a/src/DataFixtures/EntryFixtures.php b/fixtures/EntryFixtures.php similarity index 100% rename from src/DataFixtures/EntryFixtures.php rename to fixtures/EntryFixtures.php diff --git a/src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php b/fixtures/IgnoreOriginInstanceRuleFixtures.php similarity index 100% rename from src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php rename to fixtures/IgnoreOriginInstanceRuleFixtures.php diff --git a/src/DataFixtures/IgnoreOriginUserRuleFixtures.php b/fixtures/IgnoreOriginUserRuleFixtures.php similarity index 100% rename from src/DataFixtures/IgnoreOriginUserRuleFixtures.php rename to fixtures/IgnoreOriginUserRuleFixtures.php diff --git a/src/DataFixtures/InternalSettingFixtures.php b/fixtures/InternalSettingFixtures.php similarity index 100% rename from src/DataFixtures/InternalSettingFixtures.php rename to fixtures/InternalSettingFixtures.php diff --git a/src/DataFixtures/SiteCredentialFixtures.php b/fixtures/SiteCredentialFixtures.php similarity index 100% rename from src/DataFixtures/SiteCredentialFixtures.php rename to fixtures/SiteCredentialFixtures.php diff --git a/src/DataFixtures/TagFixtures.php b/fixtures/TagFixtures.php similarity index 100% rename from src/DataFixtures/TagFixtures.php rename to fixtures/TagFixtures.php diff --git a/src/DataFixtures/TaggingRuleFixtures.php b/fixtures/TaggingRuleFixtures.php similarity index 100% rename from src/DataFixtures/TaggingRuleFixtures.php rename to fixtures/TaggingRuleFixtures.php diff --git a/src/DataFixtures/UserFixtures.php b/fixtures/UserFixtures.php similarity index 100% rename from src/DataFixtures/UserFixtures.php rename to fixtures/UserFixtures.php