@@ -23,12 +23,12 @@ |
||
23 | 23 | use FOS\RestBundle\Controller\Annotations\Route; |
24 | 24 | |
25 | 25 | class FailedQueueController extends AbstractController { |
26 | - /** |
|
27 | - * @Route("/api/{version}/failed_queue/", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_list_failed_queue") |
|
28 | - */ |
|
29 | - public function listAction(Request $request, FailedEntriesProvider $failedEntriesProvider) { |
|
26 | + /** |
|
27 | + * @Route("/api/{version}/failed_queue/", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_list_failed_queue") |
|
28 | + */ |
|
29 | + public function listAction(Request $request, FailedEntriesProvider $failedEntriesProvider) { |
|
30 | 30 | $max = $request->query->getInt('limit', 50); |
31 | 31 | |
32 | 32 | return new SingleResourceResponse($failedEntriesProvider->getFailedEntries($max)); |
33 | - } |
|
33 | + } |
|
34 | 34 | } |
@@ -19,34 +19,34 @@ discard block |
||
19 | 19 | use FOS\RestBundle\Controller\Annotations\Route; |
20 | 20 | |
21 | 21 | class SeoMetadataController extends AbstractController { |
22 | - private FormFactoryInterface $formFactory; |
|
23 | - private FactoryInterface $seoMetadataFactory; |
|
24 | - private RepositoryInterface $seoMetadataRepository; |
|
25 | - private EventDispatcherInterface $eventDispatcher; |
|
22 | + private FormFactoryInterface $formFactory; |
|
23 | + private FactoryInterface $seoMetadataFactory; |
|
24 | + private RepositoryInterface $seoMetadataRepository; |
|
25 | + private EventDispatcherInterface $eventDispatcher; |
|
26 | 26 | |
27 | - /** |
|
28 | - * @param FormFactoryInterface $formFactory |
|
29 | - * @param FactoryInterface $seoMetadataFactory |
|
30 | - * @param RepositoryInterface $seoMetadataRepository |
|
31 | - * @param EventDispatcherInterface $eventDispatcher |
|
32 | - */ |
|
33 | - public function __construct(FormFactoryInterface $formFactory, FactoryInterface $seoMetadataFactory, |
|
34 | - RepositoryInterface $seoMetadataRepository, EventDispatcherInterface $eventDispatcher) { |
|
27 | + /** |
|
28 | + * @param FormFactoryInterface $formFactory |
|
29 | + * @param FactoryInterface $seoMetadataFactory |
|
30 | + * @param RepositoryInterface $seoMetadataRepository |
|
31 | + * @param EventDispatcherInterface $eventDispatcher |
|
32 | + */ |
|
33 | + public function __construct(FormFactoryInterface $formFactory, FactoryInterface $seoMetadataFactory, |
|
34 | + RepositoryInterface $seoMetadataRepository, EventDispatcherInterface $eventDispatcher) { |
|
35 | 35 | $this->formFactory = $formFactory; |
36 | 36 | $this->seoMetadataFactory = $seoMetadataFactory; |
37 | 37 | $this->seoMetadataRepository = $seoMetadataRepository; |
38 | 38 | $this->eventDispatcher = $eventDispatcher; |
39 | - } |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * @Route("/api/{version}/packages/seo/{packageGuid}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PUT"}, name="swp_api_core_seo_metadata_put") |
|
43 | - */ |
|
44 | - public function put(Request $request, string $packageGuid): SingleResourceResponse { |
|
41 | + /** |
|
42 | + * @Route("/api/{version}/packages/seo/{packageGuid}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PUT"}, name="swp_api_core_seo_metadata_put") |
|
43 | + */ |
|
44 | + public function put(Request $request, string $packageGuid): SingleResourceResponse { |
|
45 | 45 | $this->eventDispatcher->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_DISABLE); |
46 | 46 | |
47 | 47 | $seoMetadata = $this->seoMetadataRepository->findOneByPackageGuid($packageGuid); |
48 | 48 | if (null === $seoMetadata) { |
49 | - $seoMetadata = $this->seoMetadataFactory->create(); |
|
49 | + $seoMetadata = $this->seoMetadataFactory->create(); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | $form = $this->formFactory->createNamed('', SeoMetadataType::class, $seoMetadata, ['method' => $request->getMethod()]); |
@@ -54,26 +54,26 @@ discard block |
||
54 | 54 | $form->handleRequest($request); |
55 | 55 | |
56 | 56 | if ($form->isSubmitted() && $form->isValid()) { |
57 | - $seoMetadata->setPackageGuid($packageGuid); |
|
58 | - $this->seoMetadataRepository->add($seoMetadata); |
|
57 | + $seoMetadata->setPackageGuid($packageGuid); |
|
58 | + $this->seoMetadataRepository->add($seoMetadata); |
|
59 | 59 | |
60 | - return new SingleResourceResponse($seoMetadata, new ResponseContext(200)); |
|
60 | + return new SingleResourceResponse($seoMetadata, new ResponseContext(200)); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | return new SingleResourceResponse($form, new ResponseContext(400)); |
64 | - } |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @Route("/api/{version}/packages/seo/{packageGuid}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_seo_metadata_get") |
|
68 | - */ |
|
69 | - public function getAction(string $packageGuid): SingleResourceResponse { |
|
66 | + /** |
|
67 | + * @Route("/api/{version}/packages/seo/{packageGuid}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_seo_metadata_get") |
|
68 | + */ |
|
69 | + public function getAction(string $packageGuid): SingleResourceResponse { |
|
70 | 70 | $this->eventDispatcher->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_DISABLE); |
71 | 71 | |
72 | 72 | $existingSeoMetadata = $this->seoMetadataRepository->findOneByPackageGuid($packageGuid); |
73 | 73 | if (null === $existingSeoMetadata) { |
74 | - throw new NotFoundHttpException('SEO metadata not found!'); |
|
74 | + throw new NotFoundHttpException('SEO metadata not found!'); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | return new SingleResourceResponse($existingSeoMetadata, new ResponseContext(200)); |
78 | - } |
|
78 | + } |
|
79 | 79 | } |
@@ -44,35 +44,35 @@ discard block |
||
44 | 44 | use FOS\RestBundle\Controller\Annotations\Route; |
45 | 45 | |
46 | 46 | class ContentListItemController extends AbstractController { |
47 | - private ContentListItemRepositoryInterface $contentListItemRepository; |
|
48 | - private EntityManagerInterface $entityManager; |
|
49 | - private ContentListServiceInterface $contentListService; |
|
50 | - private EventDispatcherInterface $eventDispatcher; |
|
51 | - |
|
52 | - /** |
|
53 | - * @param ContentListItemRepositoryInterface $contentListItemRepository |
|
54 | - * @param EntityManagerInterface $entityManager |
|
55 | - * @param ContentListServiceInterface $contentListService |
|
56 | - * @param EventDispatcherInterface $eventDispatcher |
|
57 | - */ |
|
58 | - public function __construct(ContentListItemRepositoryInterface $contentListItemRepository, |
|
59 | - EntityManagerInterface $entityManager, |
|
60 | - ContentListServiceInterface $contentListService, |
|
61 | - EventDispatcherInterface $eventDispatcher) { |
|
47 | + private ContentListItemRepositoryInterface $contentListItemRepository; |
|
48 | + private EntityManagerInterface $entityManager; |
|
49 | + private ContentListServiceInterface $contentListService; |
|
50 | + private EventDispatcherInterface $eventDispatcher; |
|
51 | + |
|
52 | + /** |
|
53 | + * @param ContentListItemRepositoryInterface $contentListItemRepository |
|
54 | + * @param EntityManagerInterface $entityManager |
|
55 | + * @param ContentListServiceInterface $contentListService |
|
56 | + * @param EventDispatcherInterface $eventDispatcher |
|
57 | + */ |
|
58 | + public function __construct(ContentListItemRepositoryInterface $contentListItemRepository, |
|
59 | + EntityManagerInterface $entityManager, |
|
60 | + ContentListServiceInterface $contentListService, |
|
61 | + EventDispatcherInterface $eventDispatcher) { |
|
62 | 62 | $this->contentListItemRepository = $contentListItemRepository; |
63 | 63 | $this->entityManager = $entityManager; |
64 | 64 | $this->contentListService = $contentListService; |
65 | 65 | $this->eventDispatcher = $eventDispatcher; |
66 | - } |
|
66 | + } |
|
67 | 67 | |
68 | 68 | |
69 | - /** |
|
70 | - * @Route("/api/{version}/content/lists/{id}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_items", requirements={"id"="\d+"}) |
|
71 | - */ |
|
72 | - public function listAction(Request $request, int $id): ResourcesListResponseInterface { |
|
69 | + /** |
|
70 | + * @Route("/api/{version}/content/lists/{id}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_items", requirements={"id"="\d+"}) |
|
71 | + */ |
|
72 | + public function listAction(Request $request, int $id): ResourcesListResponseInterface { |
|
73 | 73 | $sort = $request->query->all('sorting'); |
74 | 74 | if (empty($sort)) { |
75 | - $sort = ['sticky' => 'desc']; |
|
75 | + $sort = ['sticky' => 'desc']; |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | $items = $this->contentListItemRepository->getPaginatedByCriteria( |
@@ -105,20 +105,20 @@ discard block |
||
105 | 105 | ); |
106 | 106 | |
107 | 107 | return new ResourcesListResponse($items, $responseContext); |
108 | - } |
|
108 | + } |
|
109 | 109 | |
110 | - /** |
|
111 | - * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_show_lists_item", requirements={"id"="\d+"}) |
|
112 | - */ |
|
113 | - public function getAction($listId, $id) { |
|
110 | + /** |
|
111 | + * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_show_lists_item", requirements={"id"="\d+"}) |
|
112 | + */ |
|
113 | + public function getAction($listId, $id) { |
|
114 | 114 | return new SingleResourceResponse($this->findOr404($listId, $id)); |
115 | - } |
|
115 | + } |
|
116 | 116 | |
117 | - /** |
|
118 | - * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_lists_item", requirements={"id"="\d+", "listId"="\d+"}) |
|
119 | - */ |
|
120 | - public function updateAction(Request $request, FormFactoryInterface $formFactory, $listId, |
|
121 | - $id): SingleResourceResponseInterface { |
|
117 | + /** |
|
118 | + * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_lists_item", requirements={"id"="\d+", "listId"="\d+"}) |
|
119 | + */ |
|
120 | + public function updateAction(Request $request, FormFactoryInterface $formFactory, $listId, |
|
121 | + $id): SingleResourceResponseInterface { |
|
122 | 122 | $contentListItem = $this->findOr404($listId, $id); |
123 | 123 | $form = $formFactory->createNamed( |
124 | 124 | '', |
@@ -130,59 +130,59 @@ discard block |
||
130 | 130 | $form->handleRequest($request); |
131 | 131 | |
132 | 132 | if ($form->isSubmitted() && $form->isValid()) { |
133 | - $contentListItem->getContentList()->setUpdatedAt(new DateTime()); |
|
133 | + $contentListItem->getContentList()->setUpdatedAt(new DateTime()); |
|
134 | 134 | |
135 | - if (null !== $contentListItem->getStickyPosition()) { |
|
135 | + if (null !== $contentListItem->getStickyPosition()) { |
|
136 | 136 | $contentListItem->setPosition($contentListItem->getStickyPosition()); |
137 | - } |
|
137 | + } |
|
138 | 138 | |
139 | - $this->entityManager->flush(); |
|
139 | + $this->entityManager->flush(); |
|
140 | 140 | |
141 | - return new SingleResourceResponse($contentListItem); |
|
141 | + return new SingleResourceResponse($contentListItem); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | return new SingleResourceResponse($form, new ResponseContext(400)); |
145 | - } |
|
146 | - |
|
147 | - /** |
|
148 | - * @Route("/api/{version}/content/lists/{listId}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_batch_update_lists_item", requirements={"listId"="\d+"}) |
|
149 | - */ |
|
150 | - public function batchUpdateAction( |
|
151 | - Request $request, |
|
152 | - FormFactoryInterface $formFactory, |
|
153 | - ContentListRepositoryInterface $contentListRepository, |
|
154 | - ArticleRepositoryInterface $articleRepository, |
|
155 | - EventDispatcherInterface $eventDispatcher, |
|
156 | - int $listId |
|
157 | - ): SingleResourceResponseInterface { |
|
145 | + } |
|
146 | + |
|
147 | + /** |
|
148 | + * @Route("/api/{version}/content/lists/{listId}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_batch_update_lists_item", requirements={"listId"="\d+"}) |
|
149 | + */ |
|
150 | + public function batchUpdateAction( |
|
151 | + Request $request, |
|
152 | + FormFactoryInterface $formFactory, |
|
153 | + ContentListRepositoryInterface $contentListRepository, |
|
154 | + ArticleRepositoryInterface $articleRepository, |
|
155 | + EventDispatcherInterface $eventDispatcher, |
|
156 | + int $listId |
|
157 | + ): SingleResourceResponseInterface { |
|
158 | 158 | /** @var ContentListInterface $list */ |
159 | 159 | $list = $contentListRepository->findOneBy(['id' => $listId]); |
160 | 160 | if (null === $list) { |
161 | - throw new NotFoundHttpException(sprintf('Content list with id "%s" was not found.', $list)); |
|
161 | + throw new NotFoundHttpException(sprintf('Content list with id "%s" was not found.', $list)); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | $form = $formFactory->createNamed('', ContentListItemsType::class, [], ['method' => $request->getMethod()]); |
165 | 165 | |
166 | 166 | $form->handleRequest($request); |
167 | 167 | if ($form->isSubmitted() && $form->isValid()) { |
168 | - $data = $form->getData(); |
|
169 | - $updatedAt = DateTime::createFromFormat(DateTime::RFC3339, $data['updatedAt'], new DateTimeZone('UTC')); |
|
170 | - $updatedAt->setTimezone(new DateTimeZone('UTC')); |
|
171 | - $listUpdatedAt = $list->getUpdatedAt(); |
|
172 | - $listUpdatedAt->setTimezone(new DateTimeZone('UTC')); |
|
173 | - if ($updatedAt < $listUpdatedAt) { |
|
168 | + $data = $form->getData(); |
|
169 | + $updatedAt = DateTime::createFromFormat(DateTime::RFC3339, $data['updatedAt'], new DateTimeZone('UTC')); |
|
170 | + $updatedAt->setTimezone(new DateTimeZone('UTC')); |
|
171 | + $listUpdatedAt = $list->getUpdatedAt(); |
|
172 | + $listUpdatedAt->setTimezone(new DateTimeZone('UTC')); |
|
173 | + if ($updatedAt < $listUpdatedAt) { |
|
174 | 174 | throw new ConflictHttpException('List was already updated'); |
175 | - } |
|
175 | + } |
|
176 | 176 | |
177 | - $updatedArticles = []; |
|
178 | - /** @var ContentListAction $item */ |
|
179 | - foreach ($data['items'] as $item) { |
|
177 | + $updatedArticles = []; |
|
178 | + /** @var ContentListAction $item */ |
|
179 | + foreach ($data['items'] as $item) { |
|
180 | 180 | $position = $item->getPosition(); |
181 | 181 | $isSticky = $item->isSticky(); |
182 | 182 | $contentId = $item->getContentId(); |
183 | 183 | |
184 | 184 | switch ($item->getAction()) { |
185 | - case ContentListAction::ACTION_MOVE: |
|
185 | + case ContentListAction::ACTION_MOVE: |
|
186 | 186 | $contentListItem = $this->findByContentOr404($list, $contentId); |
187 | 187 | |
188 | 188 | $this->ensureThereIsNoItemOnPositionOrThrow409($listId, $position, $isSticky); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | $updatedArticles[$contentId] = $contentListItem->getContent(); |
196 | 196 | |
197 | 197 | break; |
198 | - case ContentListAction::ACTION_ADD: |
|
198 | + case ContentListAction::ACTION_ADD: |
|
199 | 199 | $this->ensureThereIsNoItemOnPositionOrThrow409($listId, $position, $isSticky); |
200 | 200 | |
201 | 201 | $object = $articleRepository->findOneById($contentId); |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | $updatedArticles[$contentId] = $contentListItem->getContent(); |
205 | 205 | |
206 | 206 | break; |
207 | - case ContentListAction::ACTION_DELETE: |
|
207 | + case ContentListAction::ACTION_DELETE: |
|
208 | 208 | $contentListItem = $this->findByContentOr404($list, $contentId); |
209 | 209 | $this->entityManager->remove($contentListItem); |
210 | 210 | $list->setUpdatedAt(new DateTime('now')); |
@@ -213,25 +213,25 @@ discard block |
||
213 | 213 | |
214 | 214 | break; |
215 | 215 | } |
216 | - } |
|
216 | + } |
|
217 | 217 | |
218 | - $this->contentListService->repositionStickyItems($list); |
|
218 | + $this->contentListService->repositionStickyItems($list); |
|
219 | 219 | |
220 | - foreach ($updatedArticles as $updatedArticle) { |
|
220 | + foreach ($updatedArticles as $updatedArticle) { |
|
221 | 221 | $eventDispatcher->dispatch(new ArticleEvent( |
222 | 222 | $updatedArticle, |
223 | 223 | $updatedArticle->getPackage(), |
224 | 224 | ArticleEvents::POST_UPDATE |
225 | 225 | ), ArticleEvents::POST_UPDATE); |
226 | - } |
|
226 | + } |
|
227 | 227 | |
228 | - return new SingleResourceResponse($list, new ResponseContext(201)); |
|
228 | + return new SingleResourceResponse($list, new ResponseContext(201)); |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | return new SingleResourceResponse($form, new ResponseContext(400)); |
232 | - } |
|
232 | + } |
|
233 | 233 | |
234 | - private function findByContentOr404($listId, $contentId): ContentListItemInterface { |
|
234 | + private function findByContentOr404($listId, $contentId): ContentListItemInterface { |
|
235 | 235 | /** @var ContentListItemInterface $listItem */ |
236 | 236 | $listItem = $this->contentListItemRepository->findOneBy([ |
237 | 237 | 'contentList' => $listId, |
@@ -239,13 +239,13 @@ discard block |
||
239 | 239 | ]); |
240 | 240 | |
241 | 241 | if (null === $listItem) { |
242 | - throw new NotFoundHttpException(sprintf('Content list item with content_id "%s" was not found on that list. If You want to add new item - use action type "add".', $contentId)); |
|
242 | + throw new NotFoundHttpException(sprintf('Content list item with content_id "%s" was not found on that list. If You want to add new item - use action type "add".', $contentId)); |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | return $listItem; |
246 | - } |
|
246 | + } |
|
247 | 247 | |
248 | - private function findOr404($listId, $id): ContentListItemInterface { |
|
248 | + private function findOr404($listId, $id): ContentListItemInterface { |
|
249 | 249 | /** @var ContentListItemInterface $listItem */ |
250 | 250 | $listItem = $this->contentListItemRepository->findOneBy([ |
251 | 251 | 'contentList' => $listId, |
@@ -253,17 +253,17 @@ discard block |
||
253 | 253 | ]); |
254 | 254 | |
255 | 255 | if (null === $listItem) { |
256 | - throw new NotFoundHttpException(sprintf('Content list item with id "%s" was not found.', $id)); |
|
256 | + throw new NotFoundHttpException(sprintf('Content list item with id "%s" was not found.', $id)); |
|
257 | 257 | } |
258 | 258 | |
259 | 259 | return $listItem; |
260 | - } |
|
260 | + } |
|
261 | 261 | |
262 | - private function ensureThereIsNoItemOnPositionOrThrow409(int $listId, int $position, bool $isSticky): void { |
|
262 | + private function ensureThereIsNoItemOnPositionOrThrow409(int $listId, int $position, bool $isSticky): void { |
|
263 | 263 | $existingContentListItem = $this->contentListService->isAnyItemPinnedOnPosition($listId, $position); |
264 | 264 | |
265 | 265 | if (null !== $existingContentListItem && $isSticky && $existingContentListItem->isSticky()) { |
266 | - throw new ConflictHttpException('There is already an item pinned on that position. Unpin it first.'); |
|
266 | + throw new ConflictHttpException('There is already an item pinned on that position. Unpin it first.'); |
|
267 | + } |
|
267 | 268 | } |
268 | - } |
|
269 | 269 | } |
@@ -28,35 +28,35 @@ discard block |
||
28 | 28 | |
29 | 29 | class BodyListener |
30 | 30 | { |
31 | - private $decoderProvider; |
|
32 | - private $throwExceptionOnUnsupportedContentType; |
|
33 | - private $defaultFormat; |
|
34 | - private $arrayNormalizer; |
|
35 | - private $normalizeForms; |
|
36 | - |
|
37 | - public function __construct( |
|
38 | - DecoderProviderInterface $decoderProvider, |
|
39 | - bool $throwExceptionOnUnsupportedContentType = false, |
|
40 | - ArrayNormalizerInterface $arrayNormalizer = null, |
|
41 | - bool $normalizeForms = false |
|
42 | - ) { |
|
31 | + private $decoderProvider; |
|
32 | + private $throwExceptionOnUnsupportedContentType; |
|
33 | + private $defaultFormat; |
|
34 | + private $arrayNormalizer; |
|
35 | + private $normalizeForms; |
|
36 | + |
|
37 | + public function __construct( |
|
38 | + DecoderProviderInterface $decoderProvider, |
|
39 | + bool $throwExceptionOnUnsupportedContentType = false, |
|
40 | + ArrayNormalizerInterface $arrayNormalizer = null, |
|
41 | + bool $normalizeForms = false |
|
42 | + ) { |
|
43 | 43 | $this->decoderProvider = $decoderProvider; |
44 | 44 | $this->throwExceptionOnUnsupportedContentType = $throwExceptionOnUnsupportedContentType; |
45 | 45 | $this->arrayNormalizer = $arrayNormalizer; |
46 | 46 | $this->normalizeForms = true; |
47 | - } |
|
47 | + } |
|
48 | 48 | |
49 | - public function setDefaultFormat(?string $defaultFormat): void |
|
50 | - { |
|
49 | + public function setDefaultFormat(?string $defaultFormat): void |
|
50 | + { |
|
51 | 51 | $this->defaultFormat = $defaultFormat; |
52 | - } |
|
52 | + } |
|
53 | 53 | |
54 | - public function onKernelRequest(RequestEvent $event): void |
|
55 | - { |
|
54 | + public function onKernelRequest(RequestEvent $event): void |
|
55 | + { |
|
56 | 56 | $request = $event->getRequest(); |
57 | 57 | |
58 | 58 | if (!$request->attributes->get(FOSRestBundle::ZONE_ATTRIBUTE, true)) { |
59 | - return; |
|
59 | + return; |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | $method = $request->getMethod(); |
@@ -64,83 +64,83 @@ discard block |
||
64 | 64 | $normalizeRequest = $this->normalizeForms && $this->isFormRequest($request); |
65 | 65 | |
66 | 66 | if ($this->isDecodeable($request)) { |
67 | - $format = null === $contentType |
|
67 | + $format = null === $contentType |
|
68 | 68 | ? $request->getRequestFormat() |
69 | 69 | : $request->getFormat($contentType); |
70 | 70 | |
71 | - $format = $format ?: $this->defaultFormat; |
|
71 | + $format = $format ?: $this->defaultFormat; |
|
72 | 72 | |
73 | - $content = $request->getContent(); |
|
73 | + $content = $request->getContent(); |
|
74 | 74 | |
75 | - if (null === $format || !$this->decoderProvider->supports($format)) { |
|
75 | + if (null === $format || !$this->decoderProvider->supports($format)) { |
|
76 | 76 | if ($this->throwExceptionOnUnsupportedContentType |
77 | 77 | && $this->isNotAnEmptyDeleteRequestWithNoSetContentType($method, $content, $contentType) |
78 | 78 | ) { |
79 | - throw new UnsupportedMediaTypeHttpException("Request body format '$format' not supported"); |
|
79 | + throw new UnsupportedMediaTypeHttpException("Request body format '$format' not supported"); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | return; |
83 | - } |
|
83 | + } |
|
84 | 84 | |
85 | - if (!empty($content)) { |
|
85 | + if (!empty($content)) { |
|
86 | 86 | $decoder = $this->decoderProvider->getDecoder($format); |
87 | 87 | $data = $decoder->decode($content); |
88 | 88 | if (is_array($data)) { |
89 | - $request->request = new ParameterBag($data); |
|
90 | - $normalizeRequest = true; |
|
89 | + $request->request = new ParameterBag($data); |
|
90 | + $normalizeRequest = true; |
|
91 | 91 | } else { |
92 | - throw new BadRequestHttpException('Invalid '.$format.' message received'); |
|
92 | + throw new BadRequestHttpException('Invalid '.$format.' message received'); |
|
93 | + } |
|
93 | 94 | } |
94 | - } |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | if (null !== $this->arrayNormalizer && $normalizeRequest) { |
98 | - $data = $request->request->all(); |
|
98 | + $data = $request->request->all(); |
|
99 | 99 | |
100 | - try { |
|
100 | + try { |
|
101 | 101 | $data = $this->arrayNormalizer->normalize($data); |
102 | - } catch (NormalizationException $e) { |
|
102 | + } catch (NormalizationException $e) { |
|
103 | 103 | throw new BadRequestHttpException($e->getMessage()); |
104 | - } |
|
104 | + } |
|
105 | 105 | |
106 | - $request->request = new ParameterBag($data); |
|
106 | + $request->request = new ParameterBag($data); |
|
107 | 107 | |
108 | - if(!empty($request->files->all())) { |
|
108 | + if(!empty($request->files->all())) { |
|
109 | 109 | $data = $request->files->all(); |
110 | 110 | |
111 | 111 | try { |
112 | - $data = $this->arrayNormalizer->normalize($data); |
|
112 | + $data = $this->arrayNormalizer->normalize($data); |
|
113 | 113 | } catch (NormalizationException $e) { |
114 | - throw new BadRequestHttpException($e->getMessage()); |
|
114 | + throw new BadRequestHttpException($e->getMessage()); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | $request->files = new ParameterBag($data); |
118 | - } |
|
118 | + } |
|
119 | + } |
|
119 | 120 | } |
120 | - } |
|
121 | 121 | |
122 | - private function isNotAnEmptyDeleteRequestWithNoSetContentType(string $method, $content, ?string $contentType): bool |
|
123 | - { |
|
122 | + private function isNotAnEmptyDeleteRequestWithNoSetContentType(string $method, $content, ?string $contentType): bool |
|
123 | + { |
|
124 | 124 | return false === ('DELETE' === $method && empty($content) && empty($contentType)); |
125 | - } |
|
125 | + } |
|
126 | 126 | |
127 | - private function isDecodeable(Request $request): bool |
|
128 | - { |
|
127 | + private function isDecodeable(Request $request): bool |
|
128 | + { |
|
129 | 129 | if (!in_array($request->getMethod(), ['POST', 'PUT', 'PATCH', 'DELETE'])) { |
130 | - return false; |
|
130 | + return false; |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | return !$this->isFormRequest($request); |
134 | - } |
|
134 | + } |
|
135 | 135 | |
136 | - private function isFormRequest(Request $request): bool |
|
137 | - { |
|
136 | + private function isFormRequest(Request $request): bool |
|
137 | + { |
|
138 | 138 | $contentTypeParts = explode(';', $request->headers->get('Content-Type', '')); |
139 | 139 | |
140 | 140 | if (isset($contentTypeParts[0])) { |
141 | - return in_array($contentTypeParts[0], ['multipart/form-data', 'application/x-www-form-urlencoded']); |
|
141 | + return in_array($contentTypeParts[0], ['multipart/form-data', 'application/x-www-form-urlencoded']); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | return false; |
145 | - } |
|
145 | + } |
|
146 | 146 | } |
@@ -26,46 +26,46 @@ |
||
26 | 26 | |
27 | 27 | final class AmpController extends AbstractController { |
28 | 28 | |
29 | - private Environment $twig; |
|
30 | - private AmpConverterInterface $converter; |
|
31 | - private ThemeLoaderInterface $themeLoader; |
|
32 | - private CacheInterface $cacheService; |
|
29 | + private Environment $twig; |
|
30 | + private AmpConverterInterface $converter; |
|
31 | + private ThemeLoaderInterface $themeLoader; |
|
32 | + private CacheInterface $cacheService; |
|
33 | 33 | |
34 | - public function __construct( |
|
35 | - Environment $twig, |
|
36 | - AmpConverterInterface $ampConverter, |
|
37 | - ThemeLoaderInterface $ampThemeLoader, |
|
38 | - CacheInterface $cacheService |
|
39 | - ) { |
|
34 | + public function __construct( |
|
35 | + Environment $twig, |
|
36 | + AmpConverterInterface $ampConverter, |
|
37 | + ThemeLoaderInterface $ampThemeLoader, |
|
38 | + CacheInterface $cacheService |
|
39 | + ) { |
|
40 | 40 | $this->twig = $twig; |
41 | 41 | $this->converter = $ampConverter; |
42 | 42 | $this->themeLoader = $ampThemeLoader; |
43 | 43 | $this->cacheService = $cacheService; |
44 | - } |
|
44 | + } |
|
45 | 45 | |
46 | - public function viewAction(AmpInterface $object): Response { |
|
46 | + public function viewAction(AmpInterface $object): Response { |
|
47 | 47 | return $this->cacheService->get($this->getCacheKey($object), function () use ($object) { |
48 | - $this->themeLoader->load(); |
|
49 | - $content = $this->twig->render(sprintf('@%s/index.html.twig', ThemeLoaderInterface::THEME_NAMESPACE), [ |
|
50 | - 'object' => $object, |
|
51 | - ]); |
|
48 | + $this->themeLoader->load(); |
|
49 | + $content = $this->twig->render(sprintf('@%s/index.html.twig', ThemeLoaderInterface::THEME_NAMESPACE), [ |
|
50 | + 'object' => $object, |
|
51 | + ]); |
|
52 | 52 | |
53 | - $response = new Response(); |
|
54 | - $response->setContent($this->converter->convertToAmp($content)); |
|
55 | - return $response; |
|
53 | + $response = new Response(); |
|
54 | + $response->setContent($this->converter->convertToAmp($content)); |
|
55 | + return $response; |
|
56 | 56 | }); |
57 | - } |
|
57 | + } |
|
58 | 58 | |
59 | - private function getCacheKey(AmpInterface $object): string { |
|
59 | + private function getCacheKey(AmpInterface $object): string { |
|
60 | 60 | $elements = ['amp_article']; |
61 | 61 | if ($object instanceof PersistableInterface) { |
62 | - $elements[] = $object->getId(); |
|
62 | + $elements[] = $object->getId(); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | if ($object instanceof TimestampableInterface && null !== $object->getUpdatedAt()) { |
66 | - $elements[] = $object->getUpdatedAt()->getTimestamp(); |
|
66 | + $elements[] = $object->getUpdatedAt()->getTimestamp(); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | return md5(implode('__', $elements)); |
70 | - } |
|
70 | + } |
|
71 | 71 | } |
@@ -31,12 +31,12 @@ |
||
31 | 31 | */ |
32 | 32 | public function generate($name, $parameters = [], $referenceType = false) |
33 | 33 | { |
34 | - if (RouteObjectInterface::OBJECT_BASED_ROUTE_NAME === $name |
|
34 | + if (RouteObjectInterface::OBJECT_BASED_ROUTE_NAME === $name |
|
35 | 35 | && array_key_exists(RouteObjectInterface::ROUTE_OBJECT, $parameters) |
36 | - ) { |
|
36 | + ) { |
|
37 | 37 | $name = $parameters[RouteObjectInterface::ROUTE_OBJECT]; |
38 | 38 | unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
39 | - } |
|
39 | + } |
|
40 | 40 | |
41 | 41 | if (null === $name && isset($parameters['content_id'])) { |
42 | 42 | $contentId = $this->checkAndRemoveFirstSlash($parameters['content_id']); |
@@ -17,7 +17,7 @@ |
||
17 | 17 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
18 | 18 | |
19 | 19 | class TenantNotFoundException extends NotFoundHttpException { |
20 | - public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) { |
|
20 | + public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []) { |
|
21 | 21 | parent::__construct(sprintf('Tenant for host "%s" could not be found! Please check tenants configuration.', $message), $previous, $code, $headers); |
22 | - } |
|
22 | + } |
|
23 | 23 | } |
@@ -24,43 +24,43 @@ discard block |
||
24 | 24 | use Symfony\Component\Routing\Route as SymfonyRoute; |
25 | 25 | |
26 | 26 | class MetaRouter extends DynamicRouter { |
27 | - const OBJECT_BASED_ROUTE_NAME = "__meta_router_route_name__"; |
|
27 | + const OBJECT_BASED_ROUTE_NAME = "__meta_router_route_name__"; |
|
28 | 28 | |
29 | - protected $internalRoutesCache = []; |
|
29 | + protected $internalRoutesCache = []; |
|
30 | 30 | |
31 | - public function generate($name, $parameters = [], $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH) { |
|
31 | + public function generate($name, $parameters = [], $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH) { |
|
32 | 32 | if (self::OBJECT_BASED_ROUTE_NAME === $name |
33 | 33 | && array_key_exists(RouteObjectInterface::ROUTE_OBJECT, $parameters) |
34 | 34 | ) { |
35 | - $name = $parameters[RouteObjectInterface::ROUTE_OBJECT]; |
|
36 | - unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
|
35 | + $name = $parameters[RouteObjectInterface::ROUTE_OBJECT]; |
|
36 | + unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | $cacheKey = $this->getCacheKey($name, $parameters, $referenceType); |
40 | 40 | if (array_key_exists($cacheKey, $this->internalRoutesCache)) { |
41 | - return $this->internalRoutesCache[$cacheKey]; |
|
41 | + return $this->internalRoutesCache[$cacheKey]; |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | $route = $name; |
45 | 45 | if ($name instanceof Meta) { |
46 | - $object = $name->getValues(); |
|
47 | - if ($object instanceof ArticleInterface) { |
|
46 | + $object = $name->getValues(); |
|
47 | + if ($object instanceof ArticleInterface) { |
|
48 | 48 | $parameters['slug'] = $object->getSlug(); |
49 | 49 | $route = $object->getRoute(); |
50 | 50 | if (null === $route && $name->getContext()->getCurrentPage()) { |
51 | - $parameters['slug'] = null; |
|
52 | - $route = $name->getContext()->getCurrentPage()->getValues(); |
|
51 | + $parameters['slug'] = null; |
|
52 | + $route = $name->getContext()->getCurrentPage()->getValues(); |
|
53 | 53 | } |
54 | - } elseif ($name->getValues() instanceof RouteInterface) { |
|
54 | + } elseif ($name->getValues() instanceof RouteInterface) { |
|
55 | 55 | $route = $name->getValues(); |
56 | - } |
|
56 | + } |
|
57 | 57 | } elseif ($name instanceof ArticleInterface) { |
58 | - $route = $name->getRoute(); |
|
59 | - $parameters['slug'] = $name->getSlug(); |
|
58 | + $route = $name->getRoute(); |
|
59 | + $parameters['slug'] = $name->getSlug(); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | if (null === $route || is_array($route)) { |
63 | - throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', $name)); |
|
63 | + throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', $name)); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | $result = parent::generate($route, $parameters, $referenceType); |
@@ -68,29 +68,29 @@ discard block |
||
68 | 68 | unset($route); |
69 | 69 | |
70 | 70 | return $result; |
71 | - } |
|
71 | + } |
|
72 | 72 | |
73 | - private function getCacheKey($route, $parameters, $type) { |
|
73 | + private function getCacheKey($route, $parameters, $type) { |
|
74 | 74 | $name = $route; |
75 | 75 | if ($route instanceof Meta) { |
76 | - if ($route->getValues() instanceof ArticleInterface) { |
|
76 | + if ($route->getValues() instanceof ArticleInterface) { |
|
77 | 77 | $name = $route->getValues()->getId(); |
78 | - } elseif ($route->getValues() instanceof RouteInterface) { |
|
78 | + } elseif ($route->getValues() instanceof RouteInterface) { |
|
79 | 79 | $name = $route->getValues()->getName(); |
80 | - } |
|
80 | + } |
|
81 | 81 | } elseif ($route instanceof RouteInterface) { |
82 | - $name = $route->getName(); |
|
82 | + $name = $route->getName(); |
|
83 | 83 | } elseif ($route instanceof ArticleInterface) { |
84 | - $name = $route->getId(); |
|
84 | + $name = $route->getId(); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | return md5($name . serialize($parameters) . $type); |
88 | - } |
|
88 | + } |
|
89 | 89 | |
90 | - /** |
|
91 | - * {@inheritdoc} |
|
92 | - */ |
|
93 | - public function supports($name) { |
|
90 | + /** |
|
91 | + * {@inheritdoc} |
|
92 | + */ |
|
93 | + public function supports($name) { |
|
94 | 94 | return |
95 | 95 | ($name instanceof Meta && ( |
96 | 96 | $name->getValues() instanceof ArticleInterface || |
@@ -106,5 +106,5 @@ discard block |
||
106 | 106 | 'swp_media_get' !== $name && |
107 | 107 | false === strpos($name, 'swp_api_') |
108 | 108 | ); |
109 | - } |
|
109 | + } |
|
110 | 110 | } |
@@ -27,53 +27,53 @@ |
||
27 | 27 | |
28 | 28 | class ArticleAuthorMediaRouter extends Router implements VersatileGeneratorInterface { |
29 | 29 | |
30 | - const OBJECT_BASED_ROUTE_NAME = "__article_author_media_router_route_name__"; |
|
30 | + const OBJECT_BASED_ROUTE_NAME = "__article_author_media_router_route_name__"; |
|
31 | 31 | |
32 | - protected $authorMediaManager; |
|
32 | + protected $authorMediaManager; |
|
33 | 33 | |
34 | - public function __construct( |
|
35 | - ContainerInterface $container, |
|
36 | - $resource, |
|
37 | - array $options = [], |
|
38 | - RequestContext $context = null, |
|
39 | - ContainerInterface $parameters = null, |
|
40 | - LoggerInterface $logger = null, |
|
41 | - string $defaultLocale = null |
|
42 | - ) { |
|
34 | + public function __construct( |
|
35 | + ContainerInterface $container, |
|
36 | + $resource, |
|
37 | + array $options = [], |
|
38 | + RequestContext $context = null, |
|
39 | + ContainerInterface $parameters = null, |
|
40 | + LoggerInterface $logger = null, |
|
41 | + string $defaultLocale = null |
|
42 | + ) { |
|
43 | 43 | $this->authorMediaManager = $container->get('swp_core_bundle.manager.author_media'); |
44 | 44 | |
45 | 45 | parent::__construct($container, $resource, $options, $context, $parameters, $logger, $defaultLocale); |
46 | - } |
|
46 | + } |
|
47 | 47 | |
48 | - public function generate($meta, $parameters = [], $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH) { |
|
48 | + public function generate($meta, $parameters = [], $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH) { |
|
49 | 49 | if (self::OBJECT_BASED_ROUTE_NAME === $meta |
50 | 50 | && array_key_exists(RouteObjectInterface::ROUTE_OBJECT, $parameters) |
51 | 51 | ) { |
52 | - $meta = $parameters[RouteObjectInterface::ROUTE_OBJECT]; |
|
53 | - unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
|
52 | + $meta = $parameters[RouteObjectInterface::ROUTE_OBJECT]; |
|
53 | + unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | if ($meta instanceof Meta && ($meta->getValues() instanceof AuthorMediaInterface)) { |
57 | - return $this->authorMediaManager->getMediaPublicUrl($meta->getValues()->getImage()); |
|
57 | + return $this->authorMediaManager->getMediaPublicUrl($meta->getValues()->getImage()); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | return ''; |
61 | - } |
|
61 | + } |
|
62 | 62 | |
63 | - /** |
|
64 | - * {@inheritdoc} |
|
65 | - */ |
|
66 | - public function supports($name) { |
|
63 | + /** |
|
64 | + * {@inheritdoc} |
|
65 | + */ |
|
66 | + public function supports($name) { |
|
67 | 67 | return (is_string($name) && $name == self::OBJECT_BASED_ROUTE_NAME) || ($name instanceof Meta && ($name->getValues() instanceof AuthorMediaInterface)); |
68 | - } |
|
68 | + } |
|
69 | 69 | |
70 | - public function getRouteDebugMessage($name, array $parameters = []) { |
|
70 | + public function getRouteDebugMessage($name, array $parameters = []) { |
|
71 | 71 | if (self::OBJECT_BASED_ROUTE_NAME === $name |
72 | 72 | && array_key_exists(RouteObjectInterface::ROUTE_OBJECT, $parameters) |
73 | 73 | ) { |
74 | - $name = $parameters[RouteObjectInterface::ROUTE_OBJECT]; |
|
75 | - unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
|
74 | + $name = $parameters[RouteObjectInterface::ROUTE_OBJECT]; |
|
75 | + unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
|
76 | 76 | } |
77 | 77 | return 'Route for article author media ' . $name->getValues()->getId() . ' not found'; |
78 | - } |
|
78 | + } |
|
79 | 79 | } |