diff --git a/app/config/config_test.yml b/app/config/config_test.yml index 80dd0f7e7..4b9d091a6 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -28,6 +28,7 @@ parameters: services: AppBundle\Offices\OfficeFinder: class: AppBundle\Offices\NullOfficeFinder + autowire: true arguments: ['@geocoder'] Afup\Tests\Support\PlanetePHP\FeedHttpClientFactory: ~ diff --git a/app/config/services.yml b/app/config/services.yml index cc041f444..7aca371bf 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -195,6 +195,7 @@ services: arguments: ['@Psr\Http\Client\ClientInterface', null, "%google_maps_api_key%"] AppBundle\Offices\OfficeFinder: + autowire: true arguments: ['@geocoder'] AppBundle\Subscriber\SitemapXmlSubscriber: diff --git a/sources/AppBundle/Antennes/AntennesCollection.php b/sources/AppBundle/Antennes/AntenneRepository.php similarity index 99% rename from sources/AppBundle/Antennes/AntennesCollection.php rename to sources/AppBundle/Antennes/AntenneRepository.php index b64a295cf..7b526a429 100644 --- a/sources/AppBundle/Antennes/AntennesCollection.php +++ b/sources/AppBundle/Antennes/AntenneRepository.php @@ -4,7 +4,7 @@ namespace AppBundle\Antennes; -final class AntennesCollection +final class AntenneRepository { /** @var array */ private array $antennes; diff --git a/sources/AppBundle/Association/Form/CompanyPublicProfile.php b/sources/AppBundle/Association/Form/CompanyPublicProfile.php index 29556c942..d0a59b5b1 100644 --- a/sources/AppBundle/Association/Form/CompanyPublicProfile.php +++ b/sources/AppBundle/Association/Form/CompanyPublicProfile.php @@ -4,7 +4,7 @@ namespace AppBundle\Association\Form; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; @@ -27,12 +27,14 @@ class CompanyPublicProfile extends AbstractType public const DESCRIPTION_MAX_LENGTH = 2000; public const MEMBERSHIP_REASON_MAX_LENGTH = 150; + public function __construct( + private readonly AntenneRepository $antennesRepository, + ) {} + public function buildForm(FormBuilderInterface $builder, array $options): void { - $antennesCollection = new AntennesCollection(); - $antennesInfos = []; - foreach ($antennesCollection->getAll() as $antenne) { + foreach ($this->antennesRepository->getAll() as $antenne) { $antennesInfos[$antenne->label] = $antenne->code; } diff --git a/sources/AppBundle/Association/Form/ContactDetailsType.php b/sources/AppBundle/Association/Form/ContactDetailsType.php index d13c74b22..6326249f1 100644 --- a/sources/AppBundle/Association/Form/ContactDetailsType.php +++ b/sources/AppBundle/Association/Form/ContactDetailsType.php @@ -5,7 +5,7 @@ namespace AppBundle\Association\Form; use Afup\Site\Utils\Pays; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Association\Model\User; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; @@ -23,15 +23,10 @@ class ContactDetailsType extends AbstractType { - /** - * @var Pays - */ - public $countryService; - - public function __construct(Pays $countryService) - { - $this->countryService = $countryService; - } + public function __construct( + private readonly Pays $countryService, + private readonly AntenneRepository $antenneRepository, + ) {} public function buildForm(FormBuilderInterface $builder, array $options): void { @@ -111,9 +106,8 @@ public function configureOptions(OptionsResolver $resolver): void */ private function getOfficesList(): array { - $antennesCollection = new AntennesCollection(); $offices = ['' => '-Aucune-']; - foreach ($antennesCollection->getAllSortedByLabels() as $antenne) { + foreach ($this->antenneRepository->getAllSortedByLabels() as $antenne) { $offices[$antenne->label] = $antenne->code; } return $offices; diff --git a/sources/AppBundle/Association/Form/NearestOfficeChoiceType.php b/sources/AppBundle/Association/Form/NearestOfficeChoiceType.php index 4a8e86973..620ee4370 100644 --- a/sources/AppBundle/Association/Form/NearestOfficeChoiceType.php +++ b/sources/AppBundle/Association/Form/NearestOfficeChoiceType.php @@ -4,20 +4,23 @@ namespace AppBundle\Association\Form; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\OptionsResolver\OptionsResolver; class NearestOfficeChoiceType extends AbstractType { + public function __construct( + private readonly AntenneRepository $antennesRepository, + ) {} + public function configureOptions(OptionsResolver $resolver): void { parent::configureOptions($resolver); - $antennesCollection = new AntennesCollection(); $offices = ['-Aucune-' => '']; - foreach ($antennesCollection->getAllSortedByLabels() as $antenne) { + foreach ($this->antennesRepository->getAllSortedByLabels() as $antenne) { $offices[$antenne->label] = $antenne->code; } diff --git a/sources/AppBundle/Association/Model/User.php b/sources/AppBundle/Association/Model/User.php index bba8f49d6..ef416d865 100644 --- a/sources/AppBundle/Association/Model/User.php +++ b/sources/AppBundle/Association/Model/User.php @@ -4,7 +4,7 @@ namespace AppBundle\Association\Model; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Association\Model\Repository\UserRepository; use AppBundle\Association\NotifiableInterface; use AppBundle\Validator\Constraints as AppAssert; @@ -199,7 +199,7 @@ public function setNearestOffice($nearestOffice): self return $this; } - public function getNearestOfficeLabel() + public function getNearestOfficeLabel(AntenneRepository $antenneRepository) { $code = $this->getNearestOffice(); @@ -208,7 +208,7 @@ public function getNearestOfficeLabel() return null; } - return (new AntennesCollection())->findByCode($code)->label; + return $antenneRepository->findByCode($code)->label; } /** diff --git a/sources/AppBundle/Command/IndexMeetupsCommand.php b/sources/AppBundle/Command/IndexMeetupsCommand.php index 111273d1d..fed784ead 100644 --- a/sources/AppBundle/Command/IndexMeetupsCommand.php +++ b/sources/AppBundle/Command/IndexMeetupsCommand.php @@ -6,6 +6,7 @@ use Algolia\AlgoliaSearch\Exceptions\AlgoliaException; use Algolia\AlgoliaSearch\SearchClient; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Event\Model\Repository\MeetupRepository; use AppBundle\Indexation\Meetups\Runner; use Symfony\Component\Console\Command\Command; @@ -18,6 +19,7 @@ class IndexMeetupsCommand extends Command public function __construct( private readonly SearchClient $searchClient, private readonly MeetupRepository $meetupRepository, + private readonly AntenneRepository $antenneRepository, ) { parent::__construct(); } @@ -40,7 +42,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $this->runScraping($output); } - $runner = new Runner($this->searchClient, $this->meetupRepository); + $runner = new Runner($this->searchClient, $this->meetupRepository, $this->antenneRepository); $runner->run(); return Command::SUCCESS; diff --git a/sources/AppBundle/Controller/Admin/Antennes/AntenneListAction.php b/sources/AppBundle/Controller/Admin/Antennes/AntenneListAction.php index 0d5b800bf..940bfb818 100644 --- a/sources/AppBundle/Controller/Admin/Antennes/AntenneListAction.php +++ b/sources/AppBundle/Controller/Admin/Antennes/AntenneListAction.php @@ -5,7 +5,7 @@ namespace AppBundle\Controller\Admin\Antennes; use AppBundle\Antennes\Antenne; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Twig\Environment; @@ -13,7 +13,7 @@ final readonly class AntenneListAction { public function __construct( - private AntennesCollection $antennesCollection, + private AntenneRepository $antennesCollection, private Environment $twig, ) {} diff --git a/sources/AppBundle/Controller/Admin/Members/UserListAction.php b/sources/AppBundle/Controller/Admin/Members/UserListAction.php index 7b8e4caab..045eef848 100644 --- a/sources/AppBundle/Controller/Admin/Members/UserListAction.php +++ b/sources/AppBundle/Controller/Admin/Members/UserListAction.php @@ -4,7 +4,7 @@ namespace AppBundle\Controller\Admin\Members; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Association\Model\Repository\UserRepository; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -14,7 +14,7 @@ class UserListAction { public function __construct( private readonly UserRepository $userRepository, - private readonly AntennesCollection $antennesCollection, + private readonly AntenneRepository $antenneRepository, private readonly Environment $twig, ) {} @@ -28,7 +28,7 @@ public function __invoke(Request $request): Response $onlyDisplayActive = !$request->query->getBoolean('alsoDisplayInactive'); return new Response($this->twig->render('admin/members/user_list.html.twig', [ - 'antennes' => $this->antennesCollection->getAll(), + 'antennes' => $this->antenneRepository->getAll(), 'users' => $this->userRepository->search( $sort, $direction, diff --git a/sources/AppBundle/Controller/Api/Antennes/GetOneAction.php b/sources/AppBundle/Controller/Api/Antennes/GetOneAction.php index ced9d9e9b..44c2783ac 100644 --- a/sources/AppBundle/Controller/Api/Antennes/GetOneAction.php +++ b/sources/AppBundle/Controller/Api/Antennes/GetOneAction.php @@ -4,7 +4,7 @@ namespace AppBundle\Controller\Api\Antennes; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Event\Model\Repository\MeetupRepository; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -12,7 +12,7 @@ final readonly class GetOneAction { public function __construct( - private AntennesCollection $antennesCollection, + private AntenneRepository $antennesCollection, private MeetupRepository $meetupRepository, ) {} diff --git a/sources/AppBundle/Controller/Website/CompanyPublicProfile/IndexAction.php b/sources/AppBundle/Controller/Website/CompanyPublicProfile/IndexAction.php index 85718e1c2..33fb3f475 100644 --- a/sources/AppBundle/Controller/Website/CompanyPublicProfile/IndexAction.php +++ b/sources/AppBundle/Controller/Website/CompanyPublicProfile/IndexAction.php @@ -5,7 +5,7 @@ namespace AppBundle\Controller\Website\CompanyPublicProfile; use AppBundle\Antennes\Antenne; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Association\Model\CompanyMember; use AppBundle\Association\Model\Repository\CompanyMemberRepository; use AppBundle\Association\UserMembership\BadgesComputer; @@ -18,6 +18,7 @@ public function __construct( CompanyMemberRepository $companyMemberRepository, private readonly ViewRenderer $view, private readonly BadgesComputer $badgesComputer, + private readonly AntenneRepository $antenneRepository, ) { parent::__construct($companyMemberRepository); } @@ -38,10 +39,9 @@ public function __invoke(int $id, string $slug): Response */ private function getRelatedAfupAntennes(CompanyMember $companyMember): array { - $antennesCollection = new AntennesCollection(); $antennes = []; foreach ($companyMember->getFormattedRelatedAfupOffices() as $localOffice) { - $antenne = $antennesCollection->findByCode($localOffice); + $antenne = $this->antenneRepository->findByCode($localOffice); if ($antenne->hideOnOfficesPage) { continue; } diff --git a/sources/AppBundle/Controller/Website/Member/IndexAction.php b/sources/AppBundle/Controller/Website/Member/IndexAction.php index 897e1c9a0..d5ac0ed0f 100644 --- a/sources/AppBundle/Controller/Website/Member/IndexAction.php +++ b/sources/AppBundle/Controller/Website/Member/IndexAction.php @@ -4,6 +4,7 @@ namespace AppBundle\Controller\Website\Member; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Association\Model\Repository\GeneralMeetingQuestionRepository; use AppBundle\Association\Model\Repository\TechletterSubscriptionsRepository; use AppBundle\Association\UserMembership\BadgesComputer; @@ -26,6 +27,7 @@ public function __construct( private readonly BadgesComputer $badgesComputer, private readonly TechletterSubscriptionsRepository $techletterSubscriptionsRepository, private readonly Authentication $authentication, + private readonly AntenneRepository $antenneRepository, ) {} public function __invoke(): Response @@ -64,7 +66,7 @@ public function __invoke(): Response 'has_member_subscribed_to_techletter' => $this->techletterSubscriptionsRepository->hasUserSubscribed($user), 'membership_fee_call_to_update' => null === $daysBeforeMembershipExpiration || $daysBeforeMembershipExpiration < self::DAYS_BEFORE_CALL_TO_UPDATE, 'has_up_to_date_membership_fee' => $user->hasUpToDateMembershipFee(), - 'office_label' => $user->getNearestOfficeLabel(), + 'office_label' => $user->getNearestOfficeLabel($this->antenneRepository), 'has_general_meeting_planned' => $hasGeneralMeetingPlanned, 'has_user_rspved_to_next_general_meeting' => $generalMeetingFactory->hasUserRspvedToLastGeneralMeeting($user), 'membershipfee_end_date' => $dateFinCotisation, diff --git a/sources/AppBundle/Controller/Website/Static/OfficesAction.php b/sources/AppBundle/Controller/Website/Static/OfficesAction.php index 1efbaae13..0a65a3248 100644 --- a/sources/AppBundle/Controller/Website/Static/OfficesAction.php +++ b/sources/AppBundle/Controller/Website/Static/OfficesAction.php @@ -4,7 +4,7 @@ namespace AppBundle\Controller\Website\Static; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Twig\ViewRenderer; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; @@ -13,12 +13,13 @@ final class OfficesAction extends AbstractController { public function __construct( private readonly ViewRenderer $view, + private readonly AntenneRepository $antennesRepository, ) {} public function __invoke(): Response { return $this->view->render('site/offices.html.twig', [ - 'antennes' => (new AntennesCollection())->getAllSortedByLabels(), + 'antennes' => $this->antennesRepository->getAllSortedByLabels(), ]); } } diff --git a/sources/AppBundle/Controller/Website/Talks/ListAction.php b/sources/AppBundle/Controller/Website/Talks/ListAction.php index 26c0fab77..a25b37a0d 100644 --- a/sources/AppBundle/Controller/Website/Talks/ListAction.php +++ b/sources/AppBundle/Controller/Website/Talks/ListAction.php @@ -4,7 +4,7 @@ namespace AppBundle\Controller\Website\Talks; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Twig\ViewRenderer; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\DependencyInjection\Attribute\Autowire; @@ -20,6 +20,7 @@ public function __construct( private readonly string $algoliaAppId, #[Autowire('%algolia_frontend_api_key%')] private readonly string $algoliaFrontendApikey, + private readonly AntenneRepository $antennesRepository, ) {} public function __invoke(Request $request): Response @@ -43,7 +44,7 @@ public function __invoke(Request $request): Response return $this->view->render('site/talks/list.html.twig', [ 'title' => $title, 'canonical' => $canonical, - 'antennes' => (new AntennesCollection())->getAllSortedByLabels(), + 'antennes' => $this->antennesRepository->getAllSortedByLabels(), 'algolia_app_id' => $this->algoliaAppId, 'algolia_api_key' => $this->algoliaFrontendApikey, ]); diff --git a/sources/AppBundle/Event/Form/TicketType.php b/sources/AppBundle/Event/Form/TicketType.php index 82ad97080..da4c8e72e 100644 --- a/sources/AppBundle/Event/Form/TicketType.php +++ b/sources/AppBundle/Event/Form/TicketType.php @@ -4,7 +4,7 @@ namespace AppBundle\Event\Form; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Event\Model\Repository\EventRepository; use AppBundle\Event\Model\Repository\TicketEventTypeRepository; use AppBundle\Event\Model\Repository\TicketSpecialPriceRepository; @@ -29,17 +29,14 @@ class TicketType extends AbstractType public const MEMBER_PERSONAL = 1; public const MEMBER_CORPORATE = 2; - private readonly AntennesCollection $antennesCollection; - public function __construct( private readonly EventRepository $eventRepository, private readonly TicketEventTypeRepository $ticketEventTypeRepository, private readonly TicketTypeAvailability $ticketTypeAvailability, private readonly TicketSpecialPriceRepository $ticketSpecialPriceRepository, private readonly TicketTypeRepository $ticketTypeRepository, - ) { - $this->antennesCollection = new AntennesCollection(); - } + private readonly AntenneRepository $antenneRepository, + ) {} public function buildForm(FormBuilderInterface $builder, array $options): void { @@ -78,7 +75,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void ->add('nearestOffice', ChoiceType::class, [ 'label' => 'Antenne de prédilection', 'required' => false, - 'choices' => array_flip($this->antennesCollection->getOrderedLabelsByKey()), + 'choices' => array_flip($this->antenneRepository->getOrderedLabelsByKey()), ]) ; diff --git a/sources/AppBundle/Indexation/Meetups/MeetupClient.php b/sources/AppBundle/Indexation/Meetups/MeetupClient.php index 557cab3ef..47e1dc73a 100644 --- a/sources/AppBundle/Indexation/Meetups/MeetupClient.php +++ b/sources/AppBundle/Indexation/Meetups/MeetupClient.php @@ -4,7 +4,7 @@ namespace AppBundle\Indexation\Meetups; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Event\Model\Meetup; use AppBundle\Indexation\Meetups\GraphQL\QueryGroupsResponse; use CuyZ\Valinor\Mapper\Source\Source; @@ -18,7 +18,7 @@ public function __construct( private HttpClientInterface $httpClient, - private AntennesCollection $antennesCollection, + private AntenneRepository $antenneRepository, private MapperBuilder $mapperBuilder, ) {} @@ -72,7 +72,7 @@ private function getEventsQuery(): string { $queries = []; - foreach ($this->antennesCollection->getAll() as $antenne) { + foreach ($this->antenneRepository->getAll() as $antenne) { if ($antenne->meetup === null) { continue; } diff --git a/sources/AppBundle/Indexation/Meetups/Runner.php b/sources/AppBundle/Indexation/Meetups/Runner.php index 783a9fb95..e229f56c1 100644 --- a/sources/AppBundle/Indexation/Meetups/Runner.php +++ b/sources/AppBundle/Indexation/Meetups/Runner.php @@ -6,20 +6,21 @@ use Algolia\AlgoliaSearch\SearchClient; use Algolia\AlgoliaSearch\SearchIndex; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Event\Model\Meetup; use AppBundle\Event\Model\Repository\MeetupRepository; use CCMBenchmark\Ting\Repository\CollectionInterface; -class Runner +final readonly class Runner { protected Transformer $transformer; public function __construct( - protected SearchClient $algoliaClient, - protected MeetupRepository $meetupRepository, + private SearchClient $algoliaClient, + private MeetupRepository $meetupRepository, + private AntenneRepository $antenneRepository, ) { - $this->transformer = new Transformer(new AntennesCollection()); + $this->transformer = new Transformer($this->antenneRepository); } public function run(): void diff --git a/sources/AppBundle/Indexation/Meetups/Transformer.php b/sources/AppBundle/Indexation/Meetups/Transformer.php index ace93f106..cb96aacf8 100644 --- a/sources/AppBundle/Indexation/Meetups/Transformer.php +++ b/sources/AppBundle/Indexation/Meetups/Transformer.php @@ -5,14 +5,14 @@ namespace AppBundle\Indexation\Meetups; use AppBundle\Antennes\Antenne; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Event\Model\Meetup; class Transformer { public const MEETUP_URL = 'https://www.meetup.com/fr-FR/'; - public function __construct(private readonly AntennesCollection $antennesCollection) {} + public function __construct(private readonly AntenneRepository $antennesCollection) {} /** * @return array diff --git a/sources/AppBundle/Offices/OfficeFinder.php b/sources/AppBundle/Offices/OfficeFinder.php index 9113e9254..163f9f169 100644 --- a/sources/AppBundle/Offices/OfficeFinder.php +++ b/sources/AppBundle/Offices/OfficeFinder.php @@ -4,7 +4,7 @@ namespace AppBundle\Offices; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Association\Model\User; use AppBundle\Event\Model\Invoice; use Geocoder\Geocoder; @@ -15,14 +15,12 @@ class OfficeFinder { public const MAX_DISTANCE_TO_OFFICE = 50000; - private readonly AntennesCollection $antennesCollection; - private array $geocodeCache = []; - public function __construct(private readonly Geocoder $geocoder) - { - $this->antennesCollection = new AntennesCollection(); - } + public function __construct( + private readonly Geocoder $geocoder, + private readonly AntenneRepository $antenneRepository, + ) {} public function findOffice(Invoice $invoice, User $user = null): ?string { @@ -114,7 +112,7 @@ protected function locateNearestLocalOffice(Coordinates $coordinates): array { $localOfficesDistance = []; - foreach ($this->antennesCollection->getAll() as $antenne) { + foreach ($this->antenneRepository->getAll() as $antenne) { if (null === $antenne->map) { continue; } diff --git a/sources/AppBundle/Twig/OfficesExtension.php b/sources/AppBundle/Twig/OfficesExtension.php index c3cd14132..b11300ead 100644 --- a/sources/AppBundle/Twig/OfficesExtension.php +++ b/sources/AppBundle/Twig/OfficesExtension.php @@ -4,18 +4,22 @@ namespace AppBundle\Twig; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; class OfficesExtension extends AbstractExtension { + public function __construct( + private readonly AntenneRepository $antennesRepository, + ) {} + public function getFunctions(): array { return [ - new TwigFunction('office_name', fn($code): string => (new AntennesCollection())->findByCode($code)->label), - new TwigFunction('office_logo', fn($code): string => (new AntennesCollection())->findByCode($code)->logoUrl), - new TwigFunction('office_meetup_urlname', fn($code) => (new AntennesCollection())->findByCode($code)->meetup->urlName), + new TwigFunction('office_name', fn($code): string => $this->antennesRepository->findByCode($code)->label), + new TwigFunction('office_logo', fn($code): string => $this->antennesRepository->findByCode($code)->logoUrl), + new TwigFunction('office_meetup_urlname', fn($code) => $this->antennesRepository->findByCode($code)->meetup->urlName), ]; } } diff --git a/tests/unit/AppBundle/Indexation/Meetups/MeetupClientTest.php b/tests/unit/AppBundle/Indexation/Meetups/MeetupClientTest.php index 1451645a4..9791b58b7 100644 --- a/tests/unit/AppBundle/Indexation/Meetups/MeetupClientTest.php +++ b/tests/unit/AppBundle/Indexation/Meetups/MeetupClientTest.php @@ -4,7 +4,7 @@ namespace AppBundle\Tests\Indexation\Meetups; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Indexation\Meetups\MeetupClient; use CuyZ\Valinor\MapperBuilder; use PHPUnit\Framework\Attributes\DataProvider; @@ -21,7 +21,7 @@ public function testFailure(MockResponse $response, string $expectedExceptionMes { $httpClient = $this->makeGuzzleMockClient($response); - $meetupClient = new MeetupClient($httpClient, new AntennesCollection(), new MapperBuilder()); + $meetupClient = new MeetupClient($httpClient, new AntenneRepository(), new MapperBuilder()); self::expectException(\Exception::class); self::expectExceptionMessage($expectedExceptionMessage); @@ -109,7 +109,7 @@ public function testReturnsValidResponse(): void ), ); - $meetupClient = new MeetupClient($httpClient, new AntennesCollection(), new MapperBuilder()); + $meetupClient = new MeetupClient($httpClient, new AntenneRepository(), new MapperBuilder()); $antennes = $meetupClient->getEvents(); diff --git a/tests/unit/AppBundle/Indexation/Meetups/TransformerTest.php b/tests/unit/AppBundle/Indexation/Meetups/TransformerTest.php index a0dae7434..749c9dd01 100644 --- a/tests/unit/AppBundle/Indexation/Meetups/TransformerTest.php +++ b/tests/unit/AppBundle/Indexation/Meetups/TransformerTest.php @@ -4,7 +4,7 @@ namespace AppBundle\Tests\Indexation\Meetups; -use AppBundle\Antennes\AntennesCollection; +use AppBundle\Antennes\AntenneRepository; use AppBundle\Event\Model\Meetup; use AppBundle\Indexation\Meetups\Transformer; use PHPUnit\Framework\TestCase; @@ -13,7 +13,7 @@ final class TransformerTest extends TestCase { public function testTransform(): void { - $transformer = new Transformer(new AntennesCollection()); + $transformer = new Transformer(new AntenneRepository()); $meetup = (new Meetup()) ->setId('244992881')