Re-associate activity exports and filters

Some filter can work on both exports and lists associated to persons and accompanyings periods. They are moved to a more common namespace.

The modifiers in list are also fixed to allow an association with these filters.

src/Bundle/ChillActivityBundle/Export/Aggregator/ByCreatorAggregator.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -45,7 +45,7 @@ class ByCreatorAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillActivityBundle/Export/Aggregator/ByThirdpartyAggregator.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -50,7 +50,7 @@ class ByThirdpartyAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -50,7 +50,7 @@ class CreatorScopeAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillActivityBundle/Export/Aggregator/DateAggregator.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -66,7 +66,7 @@ class DateAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -50,7 +50,7 @@ class LocationTypeAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Export\Export\ListActivityHelper;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Entity\Scope;
@@ -160,6 +161,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return array_merge(
             $this->helper->supportsModifiers(),
             [
+                Declarations::ACTIVITY,
                 \Chill\PersonBundle\Export\Declarations::ACP_TYPE,
             ]
         );

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php

@@ -299,7 +299,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return [
             Declarations::ACTIVITY,
             Declarations::ACTIVITY_PERSON,
-            //PersonDeclarations::PERSON_TYPE,
+            PersonDeclarations::PERSON_TYPE,
         ];
     }
 }

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php

@@ -155,7 +155,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         return [
             Declarations::ACTIVITY,
             Declarations::ACTIVITY_PERSON,
-            //PersonDeclarations::PERSON_TYPE,
+            PersonDeclarations::PERSON_TYPE,
         ];
     }
 }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php

@@ -21,19 +21,15 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
+/**
+ * Filter accompanying period to keep only the one having at list one activity from the given ActivityType.
+ */
 class ActivityTypeFilter implements FilterInterface
 {
-    private ActivityTypeRepositoryInterface $activityTypeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
     public function __construct(
-        ActivityTypeRepositoryInterface $activityTypeRepository,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->activityTypeRepository = $activityTypeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private readonly ActivityTypeRepositoryInterface $activityTypeRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php

@@ -17,6 +17,9 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
+/**
+ * Filter accompanying periods to keep only the one without any activity
+ */
 class HasNoActivityFilter implements FilterInterface
 {
     public function addRole(): ?string

src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -43,7 +43,7 @@ class ByCreatorFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -58,7 +58,7 @@ class EmergencyFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -36,7 +36,7 @@ class LocationFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -55,7 +55,7 @@ class LocationTypeFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
@@ -59,7 +59,7 @@ class SentReceivedFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -51,7 +51,7 @@ class UserFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
@@ -57,7 +57,7 @@ class UserScopeFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)