diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php index 7a72179a8..a7c637bda 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php @@ -34,7 +34,7 @@ class MaritalStatusFilter implements FilterInterface $this->translatableStringHelper = $translatableStringHelper; } - public function addRole() + public function addRole(): ?string { return null; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AgeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php similarity index 89% rename from src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AgeAggregatorTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php index f858f248a..a0d869462 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AgeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Aggregator; +namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; use DateTime; @@ -21,7 +21,7 @@ use DateTime; final class AgeAggregatorTest extends AbstractAggregatorTest { /** - * @var \Chill\PersonBundle\Export\Aggregator\AgeAggregator + * @var \Chill\PersonBundle\Export\Aggregator\PersonAggregators\AgeAggregator */ private $aggregator; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GenderAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php similarity index 88% rename from src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GenderAggregatorTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php index f295aa78c..6389ac33d 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GenderAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Aggregator; +namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; @@ -20,7 +20,7 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest; final class GenderAggregatorTest extends AbstractAggregatorTest { /** - * @var \Chill\PersonBundle\Export\Aggregator\GenderAggregator + * @var \Chill\PersonBundle\Export\Aggregator\PersonAggregators\GenderAggregator */ private $aggregator; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/NationalityAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php similarity index 88% rename from src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/NationalityAggregatorTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php index dd06135b9..c093d96cc 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/NationalityAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Aggregator; +namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; @@ -20,7 +20,7 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest; final class NationalityAggregatorTest extends AbstractAggregatorTest { /** - * @var \Chill\PersonBundle\Export\Aggregator\NationalityAggregator + * @var \Chill\PersonBundle\Export\Aggregator\PersonAggregators\NationalityAggregator */ private $aggregator; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/ActionTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php similarity index 87% rename from src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/ActionTypeAggregatorTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php index 235545e0f..ab0492d11 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/ActionTypeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Aggregator; +namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; -use Chill\PersonBundle\Export\Aggregator\ActionTypeAggregator; +use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ActionTypeAggregator; /** * @internal diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GoalAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php similarity index 88% rename from src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GoalAggregatorTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php index 050b8ad5a..ef5bd5097 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GoalAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Aggregator; +namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; -use Chill\PersonBundle\Export\Aggregator\GoalAggregator; +use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalAggregator; /** * @internal diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php similarity index 88% rename from src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/ReferrerAggregatorTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php index e4e0eace8..446cf1e37 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/ReferrerAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Aggregator; +namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; -use Chill\PersonBundle\Export\Aggregator\ReferrerAggregator; +use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ReferrerAggregator; /** * @internal diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/ResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php similarity index 88% rename from src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/ResultAggregatorTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php index 3112fc2d4..a34a16a8a 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/ResultAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Aggregator; +namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; -use Chill\PersonBundle\Export\Aggregator\ResultAggregator; +use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ResultAggregator; /** * @internal diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ActiveOnDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php similarity index 90% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/ActiveOnDateFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php index 81c132f7c..3a8160cd2 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ActiveOnDateFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\ActiveOnDateFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOnDateFilter; use DateTime; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ActiveOneDayBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php similarity index 90% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/ActiveOneDayBetweenDatesFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php index ab173d0b1..30957879e 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ActiveOneDayBetweenDatesFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\ActiveOneDayBetweenDatesFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOneDayBetweenDatesFilter; use DateTime; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ActivityTypeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActivityTypeFilterTest.php similarity index 92% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/ActivityTypeFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActivityTypeFilterTest.php index f59039f35..bce092b6e 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ActivityTypeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActivityTypeFilterTest.php @@ -9,11 +9,11 @@ declare(strict_types=1); -namespace Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\ActivityBundle\Entity\ActivityType; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\ActivityTypeFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActivityTypeFilter; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AdministrativeLocationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php similarity index 91% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/AdministrativeLocationFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php index 190729161..c09c50fbc 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AdministrativeLocationFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php @@ -9,11 +9,11 @@ declare(strict_types=1); -namespace Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;; use Chill\MainBundle\Entity\Location; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\AdministrativeLocationFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\AdministrativeLocationFilter; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ClosingMotiveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php similarity index 91% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/ClosingMotiveFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php index d9403506d..8ff47ac6c 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ClosingMotiveFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php @@ -9,11 +9,11 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive; -use Chill\PersonBundle\Export\Filter\ClosingMotiveFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ClosingMotiveFilter; use Doctrine\ORM\EntityManagerInterface; /** diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ConfidentialFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php similarity index 90% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/ConfidentialFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php index 6229989fe..db469bd49 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ConfidentialFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\ConfidentialFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ConfidentialFilter; use Doctrine\ORM\EntityManagerInterface; /** diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/UserJobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilterTest.php similarity index 85% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/UserJobFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilterTest.php index 3c91c8efa..77881a218 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/UserJobFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilterTest.php @@ -9,17 +9,17 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\UserJobFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\UserJobFilter; use Doctrine\ORM\EntityManagerInterface; /** * @internal * @coversNothing */ -final class UserJobFilterTest extends AbstractFilterTest +final class CurrentUserJobFilterTest extends AbstractFilterTest { private UserJobFilter $filter; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/UserScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilterTest.php similarity index 85% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/UserScopeFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilterTest.php index 72d5eaf57..1ea4d40b0 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/UserScopeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilterTest.php @@ -9,17 +9,17 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\UserScopeFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\UserScopeFilter; use Doctrine\ORM\EntityManagerInterface; /** * @internal * @coversNothing */ -final class UserScopeFilterTest extends AbstractFilterTest +final class CurrentUserScopeFilterTest extends AbstractFilterTest { private UserScopeFilter $filter; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EmergencyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php similarity index 90% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/EmergencyFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php index 7ed43ea65..5a7c1228f 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EmergencyFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\EmergencyFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\EmergencyFilter; use Doctrine\ORM\EntityManagerInterface; /** diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php similarity index 92% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php index a4e39792c..c3c25870d 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php @@ -9,11 +9,11 @@ declare(strict_types=1); -namespace Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; use Chill\PersonBundle\Entity\SocialWork\Evaluation; -use Chill\PersonBundle\Export\Filter\EvaluationFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\EvaluationFilter; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/GeographicalUnitStatFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php similarity index 90% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/GeographicalUnitStatFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php index a2eef9038..8baaf5df7 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/GeographicalUnitStatFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\GeographicalUnitStatFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\GeographicalUnitStatFilter; use DateTime; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/IntensityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php similarity index 90% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/IntensityFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php index 65d2c6880..6319b2acf 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/IntensityFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\IntensityFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\IntensityFilter; use Doctrine\ORM\EntityManagerInterface; /** diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/OpenBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php similarity index 91% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/OpenBetweenDatesFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php index 5e4ae3d0a..5334c17f8 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/OpenBetweenDatesFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\OpenBetweenDatesFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OpenBetweenDatesFilter; use DateTime; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/OriginFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php similarity index 92% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/OriginFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php index f37cebc72..745e62ca6 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/OriginFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php @@ -9,11 +9,11 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin; -use Chill\PersonBundle\Export\Filter\OriginFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OriginFilter; use Doctrine\ORM\EntityManagerInterface; /** diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php similarity index 93% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/ReferrerFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php index 84340e267..a332c89dc 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ReferrerFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php @@ -9,11 +9,11 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Entity\User; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\ReferrerFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ReferrerFilter; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/RequestorFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php similarity index 91% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/RequestorFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php index 50dcb20f5..d936f09ae 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/RequestorFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); -namespace Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; -use Chill\PersonBundle\Export\Filter\RequestorFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\RequestorFilter; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialActionFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php similarity index 92% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialActionFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php index c7834a33a..39321dad1 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialActionFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php @@ -9,11 +9,11 @@ declare(strict_types=1); -namespace Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; use Chill\PersonBundle\Entity\SocialWork\SocialAction; -use Chill\PersonBundle\Export\Filter\SocialActionFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialActionFilter; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialIssueFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php similarity index 92% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialIssueFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php index 16e77381f..a7815d3ed 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialIssueFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php @@ -9,11 +9,11 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; use Chill\PersonBundle\Entity\SocialWork\SocialIssue; -use Chill\PersonBundle\Export\Filter\SocialIssueFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialIssueFilter; use Doctrine\ORM\EntityManagerInterface; /** diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/StepFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php similarity index 91% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/StepFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php index ac75b2123..e9353b461 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/StepFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php @@ -9,11 +9,11 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; use Chill\PersonBundle\Entity\AccompanyingPeriod; -use Chill\PersonBundle\Export\Filter\StepFilter; +use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\StepFilter; /** * @internal diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodFilterTest.php similarity index 94% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodFilterTest.php index 2b0ea2788..fb975000a 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodFilterTest.php @@ -9,9 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; +use Chill\PersonBundle\Export\Filter\PersonFilters\BirthdateFilter; use DateTime; use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException; @@ -21,10 +22,7 @@ use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException; */ final class AccompanyingPeriodFilterTest extends AbstractFilterTest { - /** - * @var \Chill\PersonBundle\Export\Filter\BirthdateFilter - */ - private $filter; + private BirthdateFilter $filter; protected function setUp(): void { diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/BirthdayFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdayFilterTest.php similarity index 91% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/BirthdayFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdayFilterTest.php index 18eda9071..4ff4f5ce3 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/BirthdayFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdayFilterTest.php @@ -9,9 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; +use Chill\PersonBundle\Export\Filter\PersonFilters\BirthdateFilter; use DateTime; /** @@ -20,10 +21,7 @@ use DateTime; */ final class BirthdayFilterTest extends AbstractFilterTest { - /** - * @var \Chill\PersonBundle\Export\Filter\BirthdateFilter - */ - private $filter; + private BirthdateFilter $filter; protected function setUp(): void { diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/GenderFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php similarity index 91% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/GenderFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php index 7e7a584cb..8ce02a653 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/GenderFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php @@ -9,10 +9,11 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; use Chill\PersonBundle\Entity\Person; +use Chill\PersonBundle\Export\Filter\PersonFilters\GenderFilter; /** * @internal @@ -20,10 +21,7 @@ use Chill\PersonBundle\Entity\Person; */ final class GenderFilterTest extends AbstractFilterTest { - /** - * @var \Chill\PersonBundle\Export\Filter\GenderFilter - */ - private $filter; + private GenderFilter $filter; protected function setUp(): void { diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/JobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php similarity index 91% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/JobFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php index 9a9bb2498..5116af979 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/JobFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php @@ -9,9 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; +use Chill\PersonBundle\Export\Filter\SocialWorkFilters\JobFilter; use Doctrine\ORM\EntityManagerInterface; /** diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php similarity index 91% rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/ScopeFilterTest.php rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php index 1269f0372..b12eb4e5b 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/ScopeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php @@ -9,9 +9,10 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Tests\Export\Filter; +namespace Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters; use Chill\MainBundle\Test\Export\AbstractFilterTest; +use Chill\PersonBundle\Export\Filter\SocialWorkFilters\ScopeFilter; use Doctrine\ORM\EntityManagerInterface; /**