@@ -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 | } |
@@ -44,7 +44,7 @@ |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | public function viewAction(AmpInterface $object): Response { |
47 | - return $this->cacheService->get($this->getCacheKey($object), function () use ($object) { |
|
47 | + return $this->cacheService->get($this->getCacheKey($object), function() use ($object) { |
|
48 | 48 | $this->themeLoader->load(); |
49 | 49 | $content = $this->twig->render(sprintf('@%s/index.html.twig', ThemeLoaderInterface::THEME_NAMESPACE), [ |
50 | 50 | 'object' => $object, |
@@ -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 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $redirectRoute = $this->redirectRouteRepository->findOneBy(['staticPrefix' => $candidates[0]]); |
73 | 73 | |
74 | 74 | if (null !== $redirectRoute) { |
75 | - $collection->add($redirectRoute->getRouteName() ?? '', $redirectRoute); |
|
75 | + $collection->add($redirectRoute->getRouteName() ?? '', $redirectRoute); |
|
76 | 76 | |
77 | 77 | return $collection; |
78 | 78 | } |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | */ |
250 | 250 | private function getArrayOfIdsFromRoutesArray(array $routes): array |
251 | 251 | { |
252 | - return array_map(function ($route) { |
|
252 | + return array_map(function($route) { |
|
253 | 253 | return $route->getId(); |
254 | 254 | }, $routes); |
255 | 255 | } |
@@ -50,6 +50,6 @@ |
||
50 | 50 | unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
51 | 51 | } |
52 | 52 | |
53 | - return 'Route for media ' . $name->getValues()->getId() . ' not found'; |
|
53 | + return 'Route for media '.$name->getValues()->getId().' not found'; |
|
54 | 54 | } |
55 | 55 | } |
@@ -26,15 +26,15 @@ discard block |
||
26 | 26 | |
27 | 27 | class SeoMediaRouter extends Router implements VersatileGeneratorInterface { |
28 | 28 | |
29 | - const OBJECT_BASED_ROUTE_NAME = "__seo_media_router_route_name__"; |
|
29 | + const OBJECT_BASED_ROUTE_NAME = "__seo_media_router_route_name__"; |
|
30 | 30 | |
31 | - /** |
|
32 | - * {@inheritdoc} |
|
33 | - */ |
|
34 | - public function generate($name, $parameters = [], $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH) { |
|
31 | + /** |
|
32 | + * {@inheritdoc} |
|
33 | + */ |
|
34 | + public function generate($name, $parameters = [], $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH) { |
|
35 | 35 | if (self::OBJECT_BASED_ROUTE_NAME === $name && array_key_exists(RouteObjectInterface::ROUTE_OBJECT, $parameters)) { |
36 | - $name = $parameters[RouteObjectInterface::ROUTE_OBJECT]; |
|
37 | - unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
|
36 | + $name = $parameters[RouteObjectInterface::ROUTE_OBJECT]; |
|
37 | + unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $item = $name->getValues()->getImage(); |
@@ -43,18 +43,18 @@ discard block |
||
43 | 43 | $parameters['extension'] = $item->getFileExtension(); |
44 | 44 | |
45 | 45 | return parent::generate('swp_seo_media_get', $parameters, $referenceType); |
46 | - } |
|
46 | + } |
|
47 | 47 | |
48 | - public function supports($name): bool { |
|
48 | + public function supports($name): bool { |
|
49 | 49 | return (is_string($name) && $name == self::OBJECT_BASED_ROUTE_NAME) || ($name instanceof Meta && $name->getValues() instanceof ArticleSeoMediaInterface); |
50 | - } |
|
50 | + } |
|
51 | 51 | |
52 | - public function getRouteDebugMessage($name, array $parameters = array()): string { |
|
52 | + public function getRouteDebugMessage($name, array $parameters = array()): string { |
|
53 | 53 | if (self::OBJECT_BASED_ROUTE_NAME === $name && array_key_exists(RouteObjectInterface::ROUTE_OBJECT, $parameters)) { |
54 | - $name = $parameters[RouteObjectInterface::ROUTE_OBJECT]; |
|
55 | - unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
|
54 | + $name = $parameters[RouteObjectInterface::ROUTE_OBJECT]; |
|
55 | + unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | return 'Route for media ' . $name->getValues()->getId() . ' not found'; |
59 | - } |
|
59 | + } |
|
60 | 60 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | try { |
46 | 46 | return $this->routingExtension->getPath($name, $parameters, $relative); |
47 | - } catch (RouteNotFoundException|MissingMandatoryParametersException|InvalidParameterException $e) { |
|
47 | + } catch (RouteNotFoundException | MissingMandatoryParametersException | InvalidParameterException $e) { |
|
48 | 48 | // allow empty path |
49 | 49 | } |
50 | 50 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | try { |
66 | 66 | return $this->routingExtension->getUrl($name, $parameters, $schemeRelative); |
67 | - } catch (RouteNotFoundException|MissingMandatoryParametersException|InvalidParameterException $e) { |
|
67 | + } catch (RouteNotFoundException | MissingMandatoryParametersException | InvalidParameterException $e) { |
|
68 | 68 | // allow empty url |
69 | 69 | } |
70 | 70 |
@@ -36,88 +36,88 @@ |
||
36 | 36 | use Twig\TwigFunction; |
37 | 37 | |
38 | 38 | final class DecoratingRoutingExtension extends AbstractExtension { |
39 | - private RoutingExtension $routingExtension; |
|
39 | + private RoutingExtension $routingExtension; |
|
40 | 40 | |
41 | - public function __construct(RoutingExtension $routingExtension) { |
|
41 | + public function __construct(RoutingExtension $routingExtension) { |
|
42 | 42 | $this->routingExtension = $routingExtension; |
43 | - } |
|
43 | + } |
|
44 | 44 | |
45 | - public function getPath($name, $parameters = [], $relative = false): ?string { |
|
45 | + public function getPath($name, $parameters = [], $relative = false): ?string { |
|
46 | 46 | if ($name == null) { |
47 | - return null; |
|
47 | + return null; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | if (is_object($name)) { |
51 | - $object = $name; |
|
52 | - $name = null; |
|
53 | - self::setupParams($object, $name, $parameters); |
|
51 | + $object = $name; |
|
52 | + $name = null; |
|
53 | + self::setupParams($object, $name, $parameters); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | try { |
57 | - return $this->routingExtension->getPath($name, $parameters, $relative); |
|
57 | + return $this->routingExtension->getPath($name, $parameters, $relative); |
|
58 | 58 | } catch (RouteNotFoundException|MissingMandatoryParametersException|InvalidParameterException $e) { |
59 | - // allow empty path |
|
59 | + // allow empty path |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | return null; |
63 | - } |
|
63 | + } |
|
64 | 64 | |
65 | - public function getUrl($name, $parameters = [], $schemeRelative = false): ?string { |
|
65 | + public function getUrl($name, $parameters = [], $schemeRelative = false): ?string { |
|
66 | 66 | if ($name == null) { |
67 | - return null; |
|
67 | + return null; |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | if (is_object($name)) { |
71 | - $object = $name; |
|
72 | - $name = null; |
|
73 | - self::setupParams($object, $name, $parameters); |
|
71 | + $object = $name; |
|
72 | + $name = null; |
|
73 | + self::setupParams($object, $name, $parameters); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | try { |
77 | - return $this->routingExtension->getUrl($name, $parameters, $schemeRelative); |
|
77 | + return $this->routingExtension->getUrl($name, $parameters, $schemeRelative); |
|
78 | 78 | } catch (RouteNotFoundException|MissingMandatoryParametersException|InvalidParameterException $e) { |
79 | - // allow empty url |
|
79 | + // allow empty url |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | return null; |
83 | - } |
|
83 | + } |
|
84 | 84 | |
85 | - public static function setupParams(object $object, &$name, &$parameters) { |
|
85 | + public static function setupParams(object $object, &$name, &$parameters) { |
|
86 | 86 | $name = RouteObjectInterface::OBJECT_BASED_ROUTE_NAME; |
87 | 87 | $parameters[RouteObjectInterface::ROUTE_OBJECT] = $object; |
88 | 88 | |
89 | 89 | if ($object instanceof Meta) { |
90 | - $values = $object->getValues(); |
|
91 | - if (($values instanceof ArticleMediaInterface || $values instanceof ImageRenditionInterface)) { |
|
90 | + $values = $object->getValues(); |
|
91 | + if (($values instanceof ArticleMediaInterface || $values instanceof ImageRenditionInterface)) { |
|
92 | 92 | $name = MediaRouter::OBJECT_BASED_ROUTE_NAME; |
93 | 93 | return; |
94 | - } |
|
94 | + } |
|
95 | 95 | |
96 | - if ($values instanceof ArticleSeoMediaInterface) { |
|
96 | + if ($values instanceof ArticleSeoMediaInterface) { |
|
97 | 97 | $name = SeoMediaRouter::OBJECT_BASED_ROUTE_NAME; |
98 | 98 | return; |
99 | - } |
|
99 | + } |
|
100 | 100 | |
101 | - if ($values instanceof AuthorMediaInterface) { |
|
101 | + if ($values instanceof AuthorMediaInterface) { |
|
102 | 102 | $name = ArticleAuthorMediaRouter::OBJECT_BASED_ROUTE_NAME; |
103 | 103 | return; |
104 | - } |
|
104 | + } |
|
105 | 105 | |
106 | - if ($values instanceof ArticleInterface || $values instanceof RouteInterface) { |
|
106 | + if ($values instanceof ArticleInterface || $values instanceof RouteInterface) { |
|
107 | 107 | $name = MetaRouter::OBJECT_BASED_ROUTE_NAME; |
108 | 108 | return; |
109 | - } |
|
109 | + } |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | if ($object instanceof RouteInterface || $object instanceof ArticleInterface) { |
113 | - $name = MetaRouter::OBJECT_BASED_ROUTE_NAME; |
|
113 | + $name = MetaRouter::OBJECT_BASED_ROUTE_NAME; |
|
114 | + } |
|
114 | 115 | } |
115 | - } |
|
116 | 116 | |
117 | - public function getFunctions(): array { |
|
117 | + public function getFunctions(): array { |
|
118 | 118 | return [ |
119 | 119 | new TwigFunction('url', [$this, 'getUrl'], ['is_safe_callback' => [$this->routingExtension, 'isUrlGenerationSafe']]), |
120 | 120 | new TwigFunction('path', [$this, 'getPath'], ['is_safe_callback' => [$this->routingExtension, 'isUrlGenerationSafe']]), |
121 | 121 | ]; |
122 | - } |
|
122 | + } |
|
123 | 123 | } |
@@ -83,7 +83,7 @@ |
||
83 | 83 | $name = $route->getId(); |
84 | 84 | } |
85 | 85 | |
86 | - return md5($name . serialize($parameters) . $type); |
|
86 | + return md5($name.serialize($parameters).$type); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | /** |
@@ -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 | } |
@@ -123,8 +123,8 @@ |
||
123 | 123 | /** @var SlidingPagination $pagination */ |
124 | 124 | $pagination = $this->paginator->paginate( |
125 | 125 | $queryBuilder, |
126 | - (int) $input->getOption('page'), |
|
127 | - (int) $input->getOption('limit') |
|
126 | + (int) $input->getOption('page'), |
|
127 | + (int) $input->getOption('limit') |
|
128 | 128 | ); |
129 | 129 | |
130 | 130 | $output->writeln(sprintf('<bg=green;options=bold>Packages found: %s</>', $pagination->getTotalItemCount())); |
@@ -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']); |
@@ -71,6 +71,6 @@ |
||
71 | 71 | $name = $parameters[RouteObjectInterface::ROUTE_OBJECT]; |
72 | 72 | unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); |
73 | 73 | } |
74 | - return 'Route for article author media ' . $name->getValues()->getId() . ' not found'; |
|
74 | + return 'Route for article author media '.$name->getValues()->getId().' not found'; |
|
75 | 75 | } |
76 | 76 | } |
@@ -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 | } |