From d57014538571f28cee05dacfcc13c0d0380cb4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 9 May 2022 13:55:04 +0200 Subject: [PATCH] refactor and rename classes --- .../ChillCalendarBundle.php | 2 +- .../AzureGetMachineAccessTokenCommand.php | 2 +- .../Command/MapUserCalendarCommand.php | 2 +- .../Controller/CalendarController.php | 2 +- .../RemoteCalendarConnectAzureController.php | 6 +-- .../RemoteCalendarProxyController.php | 2 +- .../ChillCalendarExtension.php | 2 +- .../Connector/MSGraph/MachineHttpClient.php | 2 +- .../Connector/MSGraph/MachineTokenStorage.php | 2 +- .../Connector/MSGraph/MapCalendarToUser.php | 4 +- .../MSGraph/OnBehalfOfUserHttpClient.php} | 8 ++-- .../MSGraph/OnBehalfOfUserTokenStorage.php} | 7 +++- .../MSGraph/RemoteEventConverter.php | 8 +++- .../MSGraphRemoteCalendarConnector.php | 20 ++++----- .../Connector/NullRemoteCalendarConnector.php | 2 +- .../RemoteCalendarConnectorInterface.php | 4 +- .../RemoteCalendarCompilerPass.php | 8 ++-- .../Model/RemoteEvent.php | 2 +- .../config/services/remote_calendar.yaml | 15 +++++++ .../Resources/config/services/synchro.yaml | 15 ------- .../Connector/MSGraph/MSGraphClient.php | 41 ------------------- 21 files changed, 61 insertions(+), 95 deletions(-) rename src/Bundle/ChillCalendarBundle/{Synchro => RemoteCalendar}/Connector/MSGraph/MachineHttpClient.php (96%) rename src/Bundle/ChillCalendarBundle/{Synchro => RemoteCalendar}/Connector/MSGraph/MachineTokenStorage.php (95%) rename src/Bundle/ChillCalendarBundle/{Synchro => RemoteCalendar}/Connector/MSGraph/MapCalendarToUser.php (93%) rename src/Bundle/ChillCalendarBundle/{Synchro/Connector/MSGraph/UserHttpClient.php => RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php} (87%) rename src/Bundle/ChillCalendarBundle/{Synchro/Connector/MSGraph/MSGraphTokenStorage.php => RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php} (90%) rename src/Bundle/ChillCalendarBundle/{Synchro => RemoteCalendar}/Connector/MSGraph/RemoteEventConverter.php (84%) rename src/Bundle/ChillCalendarBundle/{Synchro => RemoteCalendar}/Connector/MSGraphRemoteCalendarConnector.php (81%) rename src/Bundle/ChillCalendarBundle/{Synchro => RemoteCalendar}/Connector/NullRemoteCalendarConnector.php (93%) rename src/Bundle/ChillCalendarBundle/{Synchro => RemoteCalendar}/Connector/RemoteCalendarConnectorInterface.php (89%) rename src/Bundle/ChillCalendarBundle/{Synchro => RemoteCalendar}/DependencyInjection/RemoteCalendarCompilerPass.php (84%) rename src/Bundle/ChillCalendarBundle/{Synchro => RemoteCalendar}/Model/RemoteEvent.php (95%) create mode 100644 src/Bundle/ChillCalendarBundle/Resources/config/services/remote_calendar.yaml delete mode 100644 src/Bundle/ChillCalendarBundle/Resources/config/services/synchro.yaml delete mode 100644 src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MSGraphClient.php diff --git a/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php b/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php index 28bf7b6d6..3bf7b5e44 100644 --- a/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php +++ b/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace Chill\CalendarBundle; -use Chill\CalendarBundle\Synchro\DependencyInjection\RemoteCalendarCompilerPass; +use Chill\CalendarBundle\RemoteCalendar\DependencyInjection\RemoteCalendarCompilerPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; diff --git a/src/Bundle/ChillCalendarBundle/Command/AzureGetMachineAccessTokenCommand.php b/src/Bundle/ChillCalendarBundle/Command/AzureGetMachineAccessTokenCommand.php index 226edbc23..378ecc603 100644 --- a/src/Bundle/ChillCalendarBundle/Command/AzureGetMachineAccessTokenCommand.php +++ b/src/Bundle/ChillCalendarBundle/Command/AzureGetMachineAccessTokenCommand.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace Chill\CalendarBundle\Command; -use Chill\CalendarBundle\Synchro\Connector\MSGraph\MachineTokenStorage; +use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MachineTokenStorage; use KnpU\OAuth2ClientBundle\Client\ClientRegistry; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; diff --git a/src/Bundle/ChillCalendarBundle/Command/MapUserCalendarCommand.php b/src/Bundle/ChillCalendarBundle/Command/MapUserCalendarCommand.php index 43d4ccfa7..e0f68ec3a 100644 --- a/src/Bundle/ChillCalendarBundle/Command/MapUserCalendarCommand.php +++ b/src/Bundle/ChillCalendarBundle/Command/MapUserCalendarCommand.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace Chill\CalendarBundle\Command; -use Chill\CalendarBundle\Synchro\Connector\MSGraph\MapCalendarToUser; +use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MapCalendarToUser; use Chill\MainBundle\Repository\UserRepository; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\Console\Command\Command; diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php index 2f238e763..98e1c6eda 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php @@ -13,8 +13,8 @@ namespace Chill\CalendarBundle\Controller; use Chill\CalendarBundle\Entity\Calendar; use Chill\CalendarBundle\Form\CalendarType; +use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface; use Chill\CalendarBundle\Repository\CalendarRepository; -use Chill\CalendarBundle\Synchro\Connector\RemoteCalendarConnectorInterface; use Chill\MainBundle\Entity\User; use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Security\Authorization\AuthorizationHelper; diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php index 4ddba6f5c..f8d67b093 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace Chill\CalendarBundle\Controller; -use Chill\CalendarBundle\Synchro\Connector\MSGraph\MSGraphTokenStorage; +use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\OnBehalfOfUserTokenStorage; use KnpU\OAuth2ClientBundle\Client\ClientRegistry; use League\OAuth2\Client\Provider\Exception\IdentityProviderException; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -25,11 +25,11 @@ class RemoteCalendarConnectAzureController { private ClientRegistry $clientRegistry; - private MSGraphTokenStorage $MSGraphTokenStorage; + private OnBehalfOfUserTokenStorage $MSGraphTokenStorage; public function __construct( ClientRegistry $clientRegistry, - MSGraphTokenStorage $MSGraphTokenStorage + OnBehalfOfUserTokenStorage $MSGraphTokenStorage ) { $this->clientRegistry = $clientRegistry; $this->MSGraphTokenStorage = $MSGraphTokenStorage; diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php index d8453696b..a0552391a 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace Chill\CalendarBundle\Controller; -use Chill\CalendarBundle\Synchro\Connector\RemoteCalendarConnectorInterface; +use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface; use Chill\MainBundle\Entity\User; use DateTimeImmutable; use Symfony\Component\HttpFoundation\JsonResponse; diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php index 0f94c1982..5a99191d4 100644 --- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php +++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php @@ -36,7 +36,7 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf $loader->load('services/fixtures.yml'); $loader->load('services/form.yml'); $loader->load('services/event.yml'); - $loader->load('services/synchro.yaml'); + $loader->load('services/remote_calendar.yaml'); $container->setParameter('chill_calendar', $config); } diff --git a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MachineHttpClient.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php similarity index 96% rename from src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MachineHttpClient.php rename to src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php index 09645a970..c9a3f982e 100644 --- a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MachineHttpClient.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\CalendarBundle\Synchro\Connector\MSGraph; +namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph; use League\OAuth2\Client\Tool\BearerAuthorizationTrait; use LogicException; diff --git a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MachineTokenStorage.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineTokenStorage.php similarity index 95% rename from src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MachineTokenStorage.php rename to src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineTokenStorage.php index 4d9cef091..31533722e 100644 --- a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MachineTokenStorage.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineTokenStorage.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\CalendarBundle\Synchro\Connector\MSGraph; +namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph; use Chill\MainBundle\Redis\ChillRedis; use League\OAuth2\Client\Token\AccessTokenInterface; diff --git a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MapCalendarToUser.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php similarity index 93% rename from src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MapCalendarToUser.php rename to src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php index ec4b9a882..79589d28b 100644 --- a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MapCalendarToUser.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php @@ -9,9 +9,9 @@ declare(strict_types=1); -namespace Chill\CalendarBundle\Synchro\Connector\MSGraph; +namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph; -use Chill\CalendarBundle\Synchro\Connector\MSGraphRemoteCalendarConnector; +use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraphRemoteCalendarConnector; use Chill\MainBundle\Entity\User; use Psr\Log\LoggerInterface; diff --git a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/UserHttpClient.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php similarity index 87% rename from src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/UserHttpClient.php rename to src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php index 6daf6fb16..9ca988287 100644 --- a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/UserHttpClient.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\CalendarBundle\Synchro\Connector\MSGraph; +namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph; use League\OAuth2\Client\Tool\BearerAuthorizationTrait; use LogicException; @@ -17,18 +17,18 @@ use Symfony\Contracts\HttpClient\HttpClientInterface; use Symfony\Contracts\HttpClient\ResponseInterface; use Symfony\Contracts\HttpClient\ResponseStreamInterface; -class UserHttpClient +class OnBehalfOfUserHttpClient { use BearerAuthorizationTrait; private HttpClientInterface $decoratedClient; - private MSGraphTokenStorage $tokenStorage; + private OnBehalfOfUserTokenStorage $tokenStorage; /** * @param HttpClientInterface $decoratedClient */ - public function __construct(MSGraphTokenStorage $tokenStorage, ?HttpClientInterface $decoratedClient = null) + public function __construct(OnBehalfOfUserTokenStorage $tokenStorage, ?HttpClientInterface $decoratedClient = null) { $this->decoratedClient = $decoratedClient ?? \Symfony\Component\HttpClient\HttpClient::create(); $this->tokenStorage = $tokenStorage; diff --git a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MSGraphTokenStorage.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php similarity index 90% rename from src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MSGraphTokenStorage.php rename to src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php index 94cb917f7..580c95888 100644 --- a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MSGraphTokenStorage.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php @@ -9,14 +9,17 @@ declare(strict_types=1); -namespace Chill\CalendarBundle\Synchro\Connector\MSGraph; +namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph; use LogicException; use Symfony\Component\HttpFoundation\Session\SessionInterface; use TheNetworg\OAuth2\Client\Provider\Azure; use TheNetworg\OAuth2\Client\Token\AccessToken; -class MSGraphTokenStorage +/** + * Store token obtained on behalf of a User. + */ +class OnBehalfOfUserTokenStorage { public const MS_GRAPH_ACCESS_TOKEN = 'msgraph_access_token'; diff --git a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/RemoteEventConverter.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php similarity index 84% rename from src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/RemoteEventConverter.php rename to src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php index 092191336..4d358b95b 100644 --- a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/RemoteEventConverter.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php @@ -9,12 +9,16 @@ declare(strict_types=1); -namespace Chill\CalendarBundle\Synchro\Connector\MSGraph; +namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph; -use Chill\CalendarBundle\Synchro\Model\RemoteEvent; +use Chill\CalendarBundle\RemoteCalendar\Model\RemoteEvent; use DateTimeImmutable; use DateTimeZone; +/** + * Convert Chill Calendar event to Remote MS Graph event, and MS Graph + * event to RemoteEvent. + */ class RemoteEventConverter { private const REMOTE_DATE_FORMAT = 'Y-m-d\TH:i:s.u0'; diff --git a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraphRemoteCalendarConnector.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php similarity index 81% rename from src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraphRemoteCalendarConnector.php rename to src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php index 6c659fec4..613dd7dc0 100644 --- a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraphRemoteCalendarConnector.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php @@ -9,12 +9,12 @@ declare(strict_types=1); -namespace Chill\CalendarBundle\Synchro\Connector; +namespace Chill\CalendarBundle\RemoteCalendar\Connector; -use Chill\CalendarBundle\Synchro\Connector\MSGraph\MachineHttpClient; -use Chill\CalendarBundle\Synchro\Connector\MSGraph\MSGraphTokenStorage; -use Chill\CalendarBundle\Synchro\Connector\MSGraph\RemoteEventConverter; -use Chill\CalendarBundle\Synchro\Connector\MSGraph\UserHttpClient; +use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MachineHttpClient; +use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\OnBehalfOfUserHttpClient; +use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\OnBehalfOfUserTokenStorage; +use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteEventConverter; use Chill\MainBundle\Entity\User; use DateTimeImmutable; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -27,18 +27,18 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface private RemoteEventConverter $remoteEventConverter; - private MSGraphTokenStorage $tokenStorage; + private OnBehalfOfUserTokenStorage $tokenStorage; private UrlGeneratorInterface $urlGenerator; - private UserHttpClient $userHttpClient; + private OnBehalfOfUserHttpClient $userHttpClient; public function __construct( MachineHttpClient $machineHttpClient, - MSGraphTokenStorage $tokenStorage, + OnBehalfOfUserTokenStorage $tokenStorage, + OnBehalfOfUserHttpClient $userHttpClient, RemoteEventConverter $remoteEventConverter, - UrlGeneratorInterface $urlGenerator, - UserHttpClient $userHttpClient + UrlGeneratorInterface $urlGenerator ) { $this->machineHttpClient = $machineHttpClient; $this->remoteEventConverter = $remoteEventConverter; diff --git a/src/Bundle/ChillCalendarBundle/Synchro/Connector/NullRemoteCalendarConnector.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php similarity index 93% rename from src/Bundle/ChillCalendarBundle/Synchro/Connector/NullRemoteCalendarConnector.php rename to src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php index 40e53b612..c0901c6c5 100644 --- a/src/Bundle/ChillCalendarBundle/Synchro/Connector/NullRemoteCalendarConnector.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\CalendarBundle\Synchro\Connector; +namespace Chill\CalendarBundle\RemoteCalendar\Connector; use Chill\MainBundle\Entity\User; use DateTimeImmutable; diff --git a/src/Bundle/ChillCalendarBundle/Synchro/Connector/RemoteCalendarConnectorInterface.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php similarity index 89% rename from src/Bundle/ChillCalendarBundle/Synchro/Connector/RemoteCalendarConnectorInterface.php rename to src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php index 998d945f2..7a3fc6132 100644 --- a/src/Bundle/ChillCalendarBundle/Synchro/Connector/RemoteCalendarConnectorInterface.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php @@ -9,9 +9,9 @@ declare(strict_types=1); -namespace Chill\CalendarBundle\Synchro\Connector; +namespace Chill\CalendarBundle\RemoteCalendar\Connector; -use Chill\CalendarBundle\Synchro\Model\RemoteEvent; +use Chill\CalendarBundle\RemoteCalendar\Model\RemoteEvent; use Chill\MainBundle\Entity\User; use DateTimeImmutable; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Bundle/ChillCalendarBundle/Synchro/DependencyInjection/RemoteCalendarCompilerPass.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php similarity index 84% rename from src/Bundle/ChillCalendarBundle/Synchro/DependencyInjection/RemoteCalendarCompilerPass.php rename to src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php index 5a7449673..4390f4634 100644 --- a/src/Bundle/ChillCalendarBundle/Synchro/DependencyInjection/RemoteCalendarCompilerPass.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php @@ -9,11 +9,11 @@ declare(strict_types=1); -namespace Chill\CalendarBundle\Synchro\DependencyInjection; +namespace Chill\CalendarBundle\RemoteCalendar\DependencyInjection; -use Chill\CalendarBundle\Synchro\Connector\MSGraphRemoteCalendarConnector; -use Chill\CalendarBundle\Synchro\Connector\NullRemoteCalendarConnector; -use Chill\CalendarBundle\Synchro\Connector\RemoteCalendarConnectorInterface; +use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraphRemoteCalendarConnector; +use Chill\CalendarBundle\RemoteCalendar\Connector\NullRemoteCalendarConnector; +use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface; use RuntimeException; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/Bundle/ChillCalendarBundle/Synchro/Model/RemoteEvent.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php similarity index 95% rename from src/Bundle/ChillCalendarBundle/Synchro/Model/RemoteEvent.php rename to src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php index b25ee0e6e..99673c47e 100644 --- a/src/Bundle/ChillCalendarBundle/Synchro/Model/RemoteEvent.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\CalendarBundle\Synchro\Model; +namespace Chill\CalendarBundle\RemoteCalendar\Model; use DateTimeImmutable; use Symfony\Component\Serializer\Annotation as Serializer; diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services/remote_calendar.yaml b/src/Bundle/ChillCalendarBundle/Resources/config/services/remote_calendar.yaml new file mode 100644 index 000000000..af55692ca --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/remote_calendar.yaml @@ -0,0 +1,15 @@ +services: + _defaults: + autoconfigure: true + autowire: true + + Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface: ~ + + Chill\CalendarBundle\RemoteCalendar\Connector\NullRemoteCalendarConnector: ~ + + Chill\CalendarBundle\RemoteCalendar\Connector\MSGraphRemoteCalendarConnector: ~ + + Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\: + resource: '../../RemoteCalendar/Connector/MSGraph/' + + diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services/synchro.yaml b/src/Bundle/ChillCalendarBundle/Resources/config/services/synchro.yaml deleted file mode 100644 index f253f2a0f..000000000 --- a/src/Bundle/ChillCalendarBundle/Resources/config/services/synchro.yaml +++ /dev/null @@ -1,15 +0,0 @@ -services: - _defaults: - autoconfigure: true - autowire: true - - Chill\CalendarBundle\Synchro\Connector\RemoteCalendarConnectorInterface: ~ - - Chill\CalendarBundle\Synchro\Connector\NullRemoteCalendarConnector: ~ - - Chill\CalendarBundle\Synchro\Connector\MSGraphRemoteCalendarConnector: ~ - - Chill\CalendarBundle\Synchro\Connector\MSGraph\: - resource: '../../Synchro/Connector/MSGraph/' - - diff --git a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MSGraphClient.php b/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MSGraphClient.php deleted file mode 100644 index 58baf73fb..000000000 --- a/src/Bundle/ChillCalendarBundle/Synchro/Connector/MSGraph/MSGraphClient.php +++ /dev/null @@ -1,41 +0,0 @@ -format(DateTimeImmutable::ATOM); - $to = $endDate->format(DateTimeImmutable::ATOM); - - $response = $this->provider->getObjects("{$calendar}/calendar/calendarView?startDateTime={$from}&endDateTime={$end}"); - - dump($response); - - return $response; - } -}