@@ -27,32 +27,32 @@ |
||
| 27 | 27 | |
| 28 | 28 | class AuthorController extends AbstractController { |
| 29 | 29 | |
| 30 | - private ArticleAuthorRepositoryInterface $articleAuthorRepository; // swp.repository.author |
|
| 30 | + private ArticleAuthorRepositoryInterface $articleAuthorRepository; // swp.repository.author |
|
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @param ArticleAuthorRepositoryInterface $articleAuthorRepository |
|
| 34 | - */ |
|
| 35 | - public function __construct(ArticleAuthorRepositoryInterface $articleAuthorRepository) { |
|
| 32 | + /** |
|
| 33 | + * @param ArticleAuthorRepositoryInterface $articleAuthorRepository |
|
| 34 | + */ |
|
| 35 | + public function __construct(ArticleAuthorRepositoryInterface $articleAuthorRepository) { |
|
| 36 | 36 | $this->articleAuthorRepository = $articleAuthorRepository; |
| 37 | - } |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @Route("/api/{version}/authors/{id}", methods={"DELETE"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_delete_author", requirements={"id"="\d+"}) |
|
| 41 | - */ |
|
| 42 | - public function deleteAction(int $id): SingleResourceResponseInterface { |
|
| 39 | + /** |
|
| 40 | + * @Route("/api/{version}/authors/{id}", methods={"DELETE"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_delete_author", requirements={"id"="\d+"}) |
|
| 41 | + */ |
|
| 42 | + public function deleteAction(int $id): SingleResourceResponseInterface { |
|
| 43 | 43 | $authorRepository = $this->articleAuthorRepository; |
| 44 | 44 | $author = $this->findOr404($id); |
| 45 | 45 | |
| 46 | 46 | $authorRepository->remove($author); |
| 47 | 47 | |
| 48 | 48 | return new SingleResourceResponse(null, new ResponseContext(204)); |
| 49 | - } |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - private function findOr404(int $id): ArticleAuthorInterface { |
|
| 51 | + private function findOr404(int $id): ArticleAuthorInterface { |
|
| 52 | 52 | if (null === $author = $this->articleAuthorRepository->findOneById($id)) { |
| 53 | - throw new NotFoundHttpException('Author was not found.'); |
|
| 53 | + throw new NotFoundHttpException('Author was not found.'); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | return $author; |
| 57 | - } |
|
| 57 | + } |
|
| 58 | 58 | } |
@@ -42,31 +42,31 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | class RouteController extends FOSRestController { |
| 44 | 44 | |
| 45 | - private FormFactoryInterface $formFactory; |
|
| 46 | - private EventDispatcherInterface $eventDispatcher; |
|
| 47 | - private RouteProviderInterface $routeProvider; // swp.provider.route |
|
| 48 | - private RouteRepositoryInterface $routeRepository; // swp.repository.route |
|
| 49 | - private RouteServiceInterface $routeService; // swp.service.route |
|
| 50 | - private RouteFactoryInterface $routeFactory; // swp.factory.route |
|
| 51 | - private KnpPaginatorRepresentationFactory $knpPaginatorRepresentationFactory; //swp_pagination_rep |
|
| 52 | - private EntityManagerInterface $entityManager; // swp.object_manager.route |
|
| 53 | - |
|
| 54 | - /** |
|
| 55 | - * @param FormFactoryInterface $formFactory |
|
| 56 | - * @param EventDispatcherInterface $eventDispatcher |
|
| 57 | - * @param RouteProviderInterface $routeProvider |
|
| 58 | - * @param RouteRepositoryInterface $routeRepository |
|
| 59 | - * @param RouteServiceInterface $routeService |
|
| 60 | - * @param RouteFactoryInterface $routeFactory |
|
| 61 | - * @param KnpPaginatorRepresentationFactory $knpPaginatorRepresentationFactory |
|
| 62 | - * @param EntityManagerInterface $entityManager |
|
| 63 | - */ |
|
| 64 | - public function __construct(FormFactoryInterface $formFactory, EventDispatcherInterface $eventDispatcher, |
|
| 65 | - RouteProviderInterface $routeProvider, |
|
| 66 | - RouteRepositoryInterface $routeRepository, RouteServiceInterface $routeService, |
|
| 67 | - RouteFactoryInterface $routeFactory, |
|
| 68 | - KnpPaginatorRepresentationFactory $knpPaginatorRepresentationFactory, |
|
| 69 | - EntityManagerInterface $entityManager) { |
|
| 45 | + private FormFactoryInterface $formFactory; |
|
| 46 | + private EventDispatcherInterface $eventDispatcher; |
|
| 47 | + private RouteProviderInterface $routeProvider; // swp.provider.route |
|
| 48 | + private RouteRepositoryInterface $routeRepository; // swp.repository.route |
|
| 49 | + private RouteServiceInterface $routeService; // swp.service.route |
|
| 50 | + private RouteFactoryInterface $routeFactory; // swp.factory.route |
|
| 51 | + private KnpPaginatorRepresentationFactory $knpPaginatorRepresentationFactory; //swp_pagination_rep |
|
| 52 | + private EntityManagerInterface $entityManager; // swp.object_manager.route |
|
| 53 | + |
|
| 54 | + /** |
|
| 55 | + * @param FormFactoryInterface $formFactory |
|
| 56 | + * @param EventDispatcherInterface $eventDispatcher |
|
| 57 | + * @param RouteProviderInterface $routeProvider |
|
| 58 | + * @param RouteRepositoryInterface $routeRepository |
|
| 59 | + * @param RouteServiceInterface $routeService |
|
| 60 | + * @param RouteFactoryInterface $routeFactory |
|
| 61 | + * @param KnpPaginatorRepresentationFactory $knpPaginatorRepresentationFactory |
|
| 62 | + * @param EntityManagerInterface $entityManager |
|
| 63 | + */ |
|
| 64 | + public function __construct(FormFactoryInterface $formFactory, EventDispatcherInterface $eventDispatcher, |
|
| 65 | + RouteProviderInterface $routeProvider, |
|
| 66 | + RouteRepositoryInterface $routeRepository, RouteServiceInterface $routeService, |
|
| 67 | + RouteFactoryInterface $routeFactory, |
|
| 68 | + KnpPaginatorRepresentationFactory $knpPaginatorRepresentationFactory, |
|
| 69 | + EntityManagerInterface $entityManager) { |
|
| 70 | 70 | $this->formFactory = $formFactory; |
| 71 | 71 | $this->eventDispatcher = $eventDispatcher; |
| 72 | 72 | $this->routeProvider = $routeProvider; |
@@ -75,13 +75,13 @@ discard block |
||
| 75 | 75 | $this->routeFactory = $routeFactory; |
| 76 | 76 | $this->knpPaginatorRepresentationFactory = $knpPaginatorRepresentationFactory; |
| 77 | 77 | $this->entityManager = $entityManager; |
| 78 | - } |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | 80 | |
| 81 | - /** |
|
| 82 | - * @Route("/api/{version}/content/routes/", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_list_routes") |
|
| 83 | - */ |
|
| 84 | - public function listAction(Request $request) { |
|
| 81 | + /** |
|
| 82 | + * @Route("/api/{version}/content/routes/", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_list_routes") |
|
| 83 | + */ |
|
| 84 | + public function listAction(Request $request) { |
|
| 85 | 85 | $routeRepository = $this->routeRepository; |
| 86 | 86 | |
| 87 | 87 | $routes = $routeRepository->getPaginatedByCriteria($this->eventDispatcher, new Criteria([ |
@@ -89,28 +89,28 @@ discard block |
||
| 89 | 89 | ]), $request->query->all('sorting'), new PaginationData($request)); |
| 90 | 90 | |
| 91 | 91 | return $this->handleView(View::create($this->knpPaginatorRepresentationFactory->createRepresentation($routes, $request), 200)); |
| 92 | - } |
|
| 92 | + } |
|
| 93 | 93 | |
| 94 | - /** |
|
| 95 | - * @Route("/api/{version}/content/routes/{id}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_show_routes", requirements={"id"=".+"}) |
|
| 96 | - */ |
|
| 97 | - public function getAction($id) { |
|
| 94 | + /** |
|
| 95 | + * @Route("/api/{version}/content/routes/{id}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_show_routes", requirements={"id"=".+"}) |
|
| 96 | + */ |
|
| 97 | + public function getAction($id) { |
|
| 98 | 98 | return new SingleResourceResponse($this->findOr404($id)); |
| 99 | - } |
|
| 99 | + } |
|
| 100 | 100 | |
| 101 | - /** |
|
| 102 | - * @Route("/api/{version}/content/routes/{id}", methods={"DELETE"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_delete_routes", requirements={"id"=".+"}) |
|
| 103 | - */ |
|
| 104 | - public function deleteAction(int $id): Response { |
|
| 101 | + /** |
|
| 102 | + * @Route("/api/{version}/content/routes/{id}", methods={"DELETE"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_delete_routes", requirements={"id"=".+"}) |
|
| 103 | + */ |
|
| 104 | + public function deleteAction(int $id): Response { |
|
| 105 | 105 | $repository = $this->routeRepository; |
| 106 | 106 | $route = $this->findOr404($id); |
| 107 | 107 | |
| 108 | 108 | if (null !== $route->getContent()) { |
| 109 | - throw new ConflictHttpException('Route has content attached to it.'); |
|
| 109 | + throw new ConflictHttpException('Route has content attached to it.'); |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | if (0 < $route->getChildren()->count()) { |
| 113 | - throw new ConflictHttpException('Remove route children before removing this route.'); |
|
| 113 | + throw new ConflictHttpException('Remove route children before removing this route.'); |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | $eventDispatcher = $this->eventDispatcher; |
@@ -119,12 +119,12 @@ discard block |
||
| 119 | 119 | $eventDispatcher->dispatch(new RouteEvent($route, RouteEvents::POST_DELETE), RouteEvents::POST_DELETE); |
| 120 | 120 | |
| 121 | 121 | return $this->handleView(View::create(true, 204)); |
| 122 | - } |
|
| 122 | + } |
|
| 123 | 123 | |
| 124 | - /** |
|
| 125 | - * @Route("/api/{version}/content/routes/", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_create_routes") |
|
| 126 | - */ |
|
| 127 | - public function createAction(Request $request): SingleResourceResponseInterface { |
|
| 124 | + /** |
|
| 125 | + * @Route("/api/{version}/content/routes/", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_create_routes") |
|
| 126 | + */ |
|
| 127 | + public function createAction(Request $request): SingleResourceResponseInterface { |
|
| 128 | 128 | /** @var RouteInterface $route */ |
| 129 | 129 | $route = $this->routeFactory->create(); |
| 130 | 130 | $form = $this->formFactory->createNamed('', RouteType::class, $route, ['method' => $request->getMethod()]); |
@@ -133,20 +133,20 @@ discard block |
||
| 133 | 133 | $this->ensureRouteExists($route->getName()); |
| 134 | 134 | |
| 135 | 135 | if ($form->isSubmitted() && $form->isValid()) { |
| 136 | - $route = $this->routeService->createRoute($form->getData()); |
|
| 136 | + $route = $this->routeService->createRoute($form->getData()); |
|
| 137 | 137 | |
| 138 | - $this->routeRepository->add($route); |
|
| 138 | + $this->routeRepository->add($route); |
|
| 139 | 139 | |
| 140 | - return new SingleResourceResponse($route, new ResponseContext(201)); |
|
| 140 | + return new SingleResourceResponse($route, new ResponseContext(201)); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | return new SingleResourceResponse($form, new ResponseContext(400)); |
| 144 | - } |
|
| 144 | + } |
|
| 145 | 145 | |
| 146 | - /** |
|
| 147 | - * @Route("/api/{version}/content/routes/{id}", methods={"PATCH"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_update_routes", requirements={"id"=".+"}) |
|
| 148 | - */ |
|
| 149 | - public function updateAction(Request $request, $id): Response { |
|
| 146 | + /** |
|
| 147 | + * @Route("/api/{version}/content/routes/{id}", methods={"PATCH"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_update_routes", requirements={"id"=".+"}) |
|
| 148 | + */ |
|
| 149 | + public function updateAction(Request $request, $id): Response { |
|
| 150 | 150 | $objectManager = $this->entityManager; |
| 151 | 151 | $route = $this->findOr404($id); |
| 152 | 152 | $previousRoute = clone $route; |
@@ -154,27 +154,27 @@ discard block |
||
| 154 | 154 | $form->handleRequest($request); |
| 155 | 155 | |
| 156 | 156 | if ($form->isSubmitted() && $form->isValid()) { |
| 157 | - $route = $this->routeService->updateRoute($previousRoute, $form->getData()); |
|
| 157 | + $route = $this->routeService->updateRoute($previousRoute, $form->getData()); |
|
| 158 | 158 | |
| 159 | - $objectManager->flush(); |
|
| 159 | + $objectManager->flush(); |
|
| 160 | 160 | |
| 161 | - return $this->handleView(View::create($route, 200)); |
|
| 161 | + return $this->handleView(View::create($route, 200)); |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | return $this->handleView(View::create($form, 400)); |
| 165 | - } |
|
| 165 | + } |
|
| 166 | 166 | |
| 167 | - private function findOr404($id) { |
|
| 167 | + private function findOr404($id) { |
|
| 168 | 168 | if (null === $route = $this->routeProvider->getOneById($id)) { |
| 169 | - throw new NotFoundHttpException('Route was not found.'); |
|
| 169 | + throw new NotFoundHttpException('Route was not found.'); |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | return $route; |
| 173 | - } |
|
| 173 | + } |
|
| 174 | 174 | |
| 175 | - private function ensureRouteExists($name) { |
|
| 175 | + private function ensureRouteExists($name) { |
|
| 176 | 176 | if (null !== $this->routeRepository->findOneByName($name)) { |
| 177 | - throw new ConflictHttpException(sprintf('Route "%s" already exists!', $name)); |
|
| 177 | + throw new ConflictHttpException(sprintf('Route "%s" already exists!', $name)); |
|
| 178 | + } |
|
| 178 | 179 | } |
| 179 | - } |
|
| 180 | 180 | } |
@@ -28,25 +28,25 @@ discard block |
||
| 28 | 28 | use Symfony\Component\HttpFoundation\Request; |
| 29 | 29 | |
| 30 | 30 | class RelatedArticleController extends AbstractController { |
| 31 | - private RelatedArticleRepositoryInterface $relatedArticleRepository; |
|
| 32 | - private ArticleProviderInterface $articleProvider; |
|
| 33 | - private EventDispatcherInterface $eventDispatcher; |
|
| 31 | + private RelatedArticleRepositoryInterface $relatedArticleRepository; |
|
| 32 | + private ArticleProviderInterface $articleProvider; |
|
| 33 | + private EventDispatcherInterface $eventDispatcher; |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @param RelatedArticleRepositoryInterface $relatedArticleRepository |
|
| 37 | - * @param ArticleProviderInterface $articleProvider |
|
| 38 | - * @param EventDispatcherInterface $eventDispatcher |
|
| 39 | - */ |
|
| 40 | - public function __construct(RelatedArticleRepositoryInterface $relatedArticleRepository, |
|
| 41 | - ArticleProviderInterface $articleProvider, |
|
| 42 | - EventDispatcherInterface $eventDispatcher) { |
|
| 35 | + /** |
|
| 36 | + * @param RelatedArticleRepositoryInterface $relatedArticleRepository |
|
| 37 | + * @param ArticleProviderInterface $articleProvider |
|
| 38 | + * @param EventDispatcherInterface $eventDispatcher |
|
| 39 | + */ |
|
| 40 | + public function __construct(RelatedArticleRepositoryInterface $relatedArticleRepository, |
|
| 41 | + ArticleProviderInterface $articleProvider, |
|
| 42 | + EventDispatcherInterface $eventDispatcher) { |
|
| 43 | 43 | $this->relatedArticleRepository = $relatedArticleRepository; |
| 44 | 44 | $this->articleProvider = $articleProvider; |
| 45 | 45 | $this->eventDispatcher = $eventDispatcher; |
| 46 | - } |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | 48 | |
| 49 | - public function listAction(Request $request, string $id) { |
|
| 49 | + public function listAction(Request $request, string $id) { |
|
| 50 | 50 | $article = $this->findOr404($id); |
| 51 | 51 | |
| 52 | 52 | $repository = $this->relatedArticleRepository; |
@@ -61,15 +61,15 @@ discard block |
||
| 61 | 61 | ); |
| 62 | 62 | |
| 63 | 63 | return new ResourcesListResponse($items); |
| 64 | - } |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - private function findOr404(string $id): ArticleInterface { |
|
| 66 | + private function findOr404(string $id): ArticleInterface { |
|
| 67 | 67 | $article = $this->articleProvider->getOneById($id); |
| 68 | 68 | |
| 69 | 69 | if (null === $article) { |
| 70 | - throw new NotFoundHttpException(sprintf('Article "%s" was not found.', $id)); |
|
| 70 | + throw new NotFoundHttpException(sprintf('Article "%s" was not found.', $id)); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | return $article; |
| 74 | - } |
|
| 74 | + } |
|
| 75 | 75 | } |
@@ -36,27 +36,27 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | class ArticleController extends AbstractController { |
| 38 | 38 | |
| 39 | - private FormFactoryInterface $formFactory; |
|
| 40 | - private RouteProviderInterface $routeProvider; // swp.provider.route |
|
| 41 | - private ArticleRepositoryInterface $articleRepository; //swp.repository.article |
|
| 42 | - private ArticleProviderInterface $articleProvider; //swp.provider.article |
|
| 43 | - private EventDispatcherInterface $eventDispatcher; |
|
| 44 | - private EntityManagerInterface $entityManager; // swp.object_manager.article |
|
| 45 | - private ArticleServiceInterface $articleService; // swp.service.article |
|
| 46 | - |
|
| 47 | - /** |
|
| 48 | - * @param FormFactoryInterface $formFactory |
|
| 49 | - * @param RouteProviderInterface $routeProvider |
|
| 50 | - * @param ArticleRepositoryInterface $articleRepository |
|
| 51 | - * @param ArticleProviderInterface $articleProvider |
|
| 52 | - * @param EventDispatcherInterface $eventDispatcher |
|
| 53 | - * @param EntityManagerInterface $entityManager |
|
| 54 | - * @param ArticleServiceInterface $articleService |
|
| 55 | - */ |
|
| 56 | - public function __construct(FormFactoryInterface $formFactory, RouteProviderInterface $routeProvider, |
|
| 57 | - ArticleRepositoryInterface $articleRepository, ArticleProviderInterface $articleProvider, |
|
| 58 | - EventDispatcherInterface $eventDispatcher, EntityManagerInterface $entityManager, |
|
| 59 | - ArticleServiceInterface $articleService) { |
|
| 39 | + private FormFactoryInterface $formFactory; |
|
| 40 | + private RouteProviderInterface $routeProvider; // swp.provider.route |
|
| 41 | + private ArticleRepositoryInterface $articleRepository; //swp.repository.article |
|
| 42 | + private ArticleProviderInterface $articleProvider; //swp.provider.article |
|
| 43 | + private EventDispatcherInterface $eventDispatcher; |
|
| 44 | + private EntityManagerInterface $entityManager; // swp.object_manager.article |
|
| 45 | + private ArticleServiceInterface $articleService; // swp.service.article |
|
| 46 | + |
|
| 47 | + /** |
|
| 48 | + * @param FormFactoryInterface $formFactory |
|
| 49 | + * @param RouteProviderInterface $routeProvider |
|
| 50 | + * @param ArticleRepositoryInterface $articleRepository |
|
| 51 | + * @param ArticleProviderInterface $articleProvider |
|
| 52 | + * @param EventDispatcherInterface $eventDispatcher |
|
| 53 | + * @param EntityManagerInterface $entityManager |
|
| 54 | + * @param ArticleServiceInterface $articleService |
|
| 55 | + */ |
|
| 56 | + public function __construct(FormFactoryInterface $formFactory, RouteProviderInterface $routeProvider, |
|
| 57 | + ArticleRepositoryInterface $articleRepository, ArticleProviderInterface $articleProvider, |
|
| 58 | + EventDispatcherInterface $eventDispatcher, EntityManagerInterface $entityManager, |
|
| 59 | + ArticleServiceInterface $articleService) { |
|
| 60 | 60 | $this->formFactory = $formFactory; |
| 61 | 61 | $this->routeProvider = $routeProvider; |
| 62 | 62 | $this->articleRepository = $articleRepository; |
@@ -64,30 +64,30 @@ discard block |
||
| 64 | 64 | $this->eventDispatcher = $eventDispatcher; |
| 65 | 65 | $this->entityManager = $entityManager; |
| 66 | 66 | $this->articleService = $articleService; |
| 67 | - } |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | 69 | |
| 70 | - /** |
|
| 71 | - * @Route("/api/{version}/content/articles/", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_list_articles") |
|
| 72 | - * |
|
| 73 | - * @throws \Exception |
|
| 74 | - */ |
|
| 75 | - public function listAction(Request $request): ResourcesListResponseInterface { |
|
| 70 | + /** |
|
| 71 | + * @Route("/api/{version}/content/articles/", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_list_articles") |
|
| 72 | + * |
|
| 73 | + * @throws \Exception |
|
| 74 | + */ |
|
| 75 | + public function listAction(Request $request): ResourcesListResponseInterface { |
|
| 76 | 76 | $authors = ''; |
| 77 | 77 | if (null !== $request->query->get('author', null)) { |
| 78 | - $authors = explode(', ', $request->query->get('author')); |
|
| 78 | + $authors = explode(', ', $request->query->get('author')); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | if ($request->query->get('route', false) && $request->query->get('includeSubRoutes', false)) { |
| 82 | - $routeObject = $this->routeProvider->getOneById($request->query->get('route')); |
|
| 82 | + $routeObject = $this->routeProvider->getOneById($request->query->get('route')); |
|
| 83 | 83 | |
| 84 | - if (null !== $routeObject) { |
|
| 84 | + if (null !== $routeObject) { |
|
| 85 | 85 | $ids = [$routeObject->getId()]; |
| 86 | 86 | foreach ($routeObject->getChildren() as $child) { |
| 87 | - $ids[] = $child->getId(); |
|
| 87 | + $ids[] = $child->getId(); |
|
| 88 | 88 | } |
| 89 | 89 | $request->query->set('route', $ids); |
| 90 | - } |
|
| 90 | + } |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | $articles = $this->articleRepository |
@@ -102,25 +102,25 @@ discard block |
||
| 102 | 102 | ]), $request->query->all('sorting'), new PaginationData($request)); |
| 103 | 103 | |
| 104 | 104 | return new ResourcesListResponse($articles); |
| 105 | - } |
|
| 105 | + } |
|
| 106 | 106 | |
| 107 | - /** |
|
| 108 | - * @Route("/api/{version}/content/articles/{id}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_show_articles", requirements={"id"=".+"}) |
|
| 109 | - */ |
|
| 110 | - public function getAction($id): SingleResourceResponseInterface { |
|
| 107 | + /** |
|
| 108 | + * @Route("/api/{version}/content/articles/{id}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_show_articles", requirements={"id"=".+"}) |
|
| 109 | + */ |
|
| 110 | + public function getAction($id): SingleResourceResponseInterface { |
|
| 111 | 111 | $article = $this->articleProvider->getOneById($id); |
| 112 | 112 | |
| 113 | 113 | if (null === $article) { |
| 114 | - throw new NotFoundHttpException('Article was not found.'); |
|
| 114 | + throw new NotFoundHttpException('Article was not found.'); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | return new SingleResourceResponse($article); |
| 118 | - } |
|
| 118 | + } |
|
| 119 | 119 | |
| 120 | - /** |
|
| 121 | - * @Route("/api/{version}/content/articles/{id}", methods={"PATCH"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_update_articles", requirements={"id"=".+"}) |
|
| 122 | - */ |
|
| 123 | - public function updateAction(Request $request, $id): SingleResourceResponseInterface { |
|
| 120 | + /** |
|
| 121 | + * @Route("/api/{version}/content/articles/{id}", methods={"PATCH"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_update_articles", requirements={"id"=".+"}) |
|
| 122 | + */ |
|
| 123 | + public function updateAction(Request $request, $id): SingleResourceResponseInterface { |
|
| 124 | 124 | $objectManager = $this->entityManager; |
| 125 | 125 | $article = $this->findOr404($id); |
| 126 | 126 | $originalArticleStatus = $article->getStatus(); |
@@ -129,32 +129,32 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | $form->handleRequest($request); |
| 131 | 131 | if ($form->isSubmitted() && $form->isValid()) { |
| 132 | - $this->articleService->reactOnStatusChange($originalArticleStatus, $article); |
|
| 133 | - $objectManager->flush(); |
|
| 134 | - $objectManager->refresh($article); |
|
| 132 | + $this->articleService->reactOnStatusChange($originalArticleStatus, $article); |
|
| 133 | + $objectManager->flush(); |
|
| 134 | + $objectManager->refresh($article); |
|
| 135 | 135 | |
| 136 | - return new SingleResourceResponse($article); |
|
| 136 | + return new SingleResourceResponse($article); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | return new SingleResourceResponse($form, new ResponseContext(500)); |
| 140 | - } |
|
| 140 | + } |
|
| 141 | 141 | |
| 142 | - /** |
|
| 143 | - * @Route("/api/{version}/content/articles/{id}", methods={"DELETE"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_delete_articles", requirements={"id"=".+"}) |
|
| 144 | - */ |
|
| 145 | - public function deleteAction($id): SingleResourceResponseInterface { |
|
| 142 | + /** |
|
| 143 | + * @Route("/api/{version}/content/articles/{id}", methods={"DELETE"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_delete_articles", requirements={"id"=".+"}) |
|
| 144 | + */ |
|
| 145 | + public function deleteAction($id): SingleResourceResponseInterface { |
|
| 146 | 146 | $objectManager = $this->entityManager; |
| 147 | 147 | $objectManager->remove($this->findOr404($id)); |
| 148 | 148 | $objectManager->flush(); |
| 149 | 149 | |
| 150 | 150 | return new SingleResourceResponse(null, new ResponseContext(204)); |
| 151 | - } |
|
| 151 | + } |
|
| 152 | 152 | |
| 153 | - private function findOr404($id) { |
|
| 153 | + private function findOr404($id) { |
|
| 154 | 154 | if (null === $article = $this->articleProvider->getOneById($id)) { |
| 155 | - throw new NotFoundHttpException('Article was not found.'); |
|
| 155 | + throw new NotFoundHttpException('Article was not found.'); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | return $article; |
| 159 | - } |
|
| 159 | + } |
|
| 160 | 160 | } |
@@ -32,59 +32,59 @@ |
||
| 32 | 32 | use Symfony\Component\HttpFoundation\Request; |
| 33 | 33 | |
| 34 | 34 | abstract class AbstractAPIController extends Controller { |
| 35 | - public function listWebhooks(EventDispatcherInterface $eventDispatcher, RepositoryInterface $repository, |
|
| 36 | - Request $request): ResourcesListResponse { |
|
| 35 | + public function listWebhooks(EventDispatcherInterface $eventDispatcher, RepositoryInterface $repository, |
|
| 36 | + Request $request): ResourcesListResponse { |
|
| 37 | 37 | $webhooks = $repository->getPaginatedByCriteria($eventDispatcher, new Criteria(), $request->query->all('sorting',), new PaginationData($request)); |
| 38 | 38 | |
| 39 | 39 | return new ResourcesListResponse($webhooks); |
| 40 | - } |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - public function getSingleWebhook(WebhookInterface $webhook): SingleResourceResponse { |
|
| 42 | + public function getSingleWebhook(WebhookInterface $webhook): SingleResourceResponse { |
|
| 43 | 43 | return new SingleResourceResponse($webhook); |
| 44 | - } |
|
| 45 | - |
|
| 46 | - public function createWebhook( |
|
| 47 | - RepositoryInterface $ruleRepository, |
|
| 48 | - FactoryInterface $ruleFactory, |
|
| 49 | - Request $request, |
|
| 50 | - FormFactoryInterface $formFactory |
|
| 51 | - ): SingleResourceResponse { |
|
| 44 | + } |
|
| 45 | + |
|
| 46 | + public function createWebhook( |
|
| 47 | + RepositoryInterface $ruleRepository, |
|
| 48 | + FactoryInterface $ruleFactory, |
|
| 49 | + Request $request, |
|
| 50 | + FormFactoryInterface $formFactory |
|
| 51 | + ): SingleResourceResponse { |
|
| 52 | 52 | $webhook = $ruleFactory->create(); |
| 53 | 53 | $form = $formFactory->createNamed('', WebhookType::class, $webhook); |
| 54 | 54 | $form->handleRequest($request); |
| 55 | 55 | |
| 56 | 56 | if ($form->isSubmitted() && $form->isValid()) { |
| 57 | - $ruleRepository->add($webhook); |
|
| 57 | + $ruleRepository->add($webhook); |
|
| 58 | 58 | |
| 59 | - return new SingleResourceResponse($webhook, new ResponseContext(201)); |
|
| 59 | + return new SingleResourceResponse($webhook, new ResponseContext(201)); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | return new SingleResourceResponse($form, new ResponseContext(400)); |
| 63 | - } |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - public function deleteWebhook(RepositoryInterface $webhookRepository, |
|
| 65 | + public function deleteWebhook(RepositoryInterface $webhookRepository, |
|
| 66 | 66 | WebhookInterface $webhook): SingleResourceResponse { |
| 67 | 67 | $webhookRepository->remove($webhook); |
| 68 | 68 | |
| 69 | 69 | return new SingleResourceResponse(null, new ResponseContext(204)); |
| 70 | - } |
|
| 71 | - |
|
| 72 | - public function updateWebhook( |
|
| 73 | - ObjectManager $objectManager, |
|
| 74 | - Request $request, |
|
| 75 | - WebhookInterface $webhook, |
|
| 76 | - FormFactoryInterface $formFactory |
|
| 77 | - ): SingleResourceResponse { |
|
| 70 | + } |
|
| 71 | + |
|
| 72 | + public function updateWebhook( |
|
| 73 | + ObjectManager $objectManager, |
|
| 74 | + Request $request, |
|
| 75 | + WebhookInterface $webhook, |
|
| 76 | + FormFactoryInterface $formFactory |
|
| 77 | + ): SingleResourceResponse { |
|
| 78 | 78 | $form = $formFactory->createNamed('', WebhookType::class, $webhook, ['method' => $request->getMethod()]); |
| 79 | 79 | |
| 80 | 80 | $form->handleRequest($request); |
| 81 | 81 | if ($form->isSubmitted() && $form->isValid()) { |
| 82 | - $objectManager->flush(); |
|
| 83 | - $objectManager->refresh($webhook); |
|
| 82 | + $objectManager->flush(); |
|
| 83 | + $objectManager->refresh($webhook); |
|
| 84 | 84 | |
| 85 | - return new SingleResourceResponse($webhook); |
|
| 85 | + return new SingleResourceResponse($webhook); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | return new SingleResourceResponse($form, new ResponseContext(400)); |
| 89 | - } |
|
| 89 | + } |
|
| 90 | 90 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | /** |
| 103 | 103 | * {@inheritdoc} |
| 104 | 104 | */ |
| 105 | - public function findChildrenAsTree(EventDispatcherInterface $eventDispatcher,MenuItemInterface $menuItem) |
|
| 105 | + public function findChildrenAsTree(EventDispatcherInterface $eventDispatcher, MenuItemInterface $menuItem) |
|
| 106 | 106 | { |
| 107 | 107 | $queryBuilder = $this->createQueryBuilder('m'); |
| 108 | 108 | $queryBuilder |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | ->orderBy('m.lft', 'asc') |
| 115 | 115 | ; |
| 116 | 116 | |
| 117 | - return $this->getPaginator($eventDispatcher,$queryBuilder, new PaginationData()); |
|
| 117 | + return $this->getPaginator($eventDispatcher, $queryBuilder, new PaginationData()); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
@@ -128,19 +128,19 @@ |
||
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | |
| 131 | - /** |
|
| 132 | - * @param MenuItemInterface $node |
|
| 133 | - * @param MenuItemInterface $parent |
|
| 134 | - */ |
|
| 135 | - public function persistAsFirstChildOf(MenuItemInterface $node, MenuItemInterface $parent) { |
|
| 131 | + /** |
|
| 132 | + * @param MenuItemInterface $node |
|
| 133 | + * @param MenuItemInterface $parent |
|
| 134 | + */ |
|
| 135 | + public function persistAsFirstChildOf(MenuItemInterface $node, MenuItemInterface $parent) { |
|
| 136 | 136 | parent::persistAsFirstChildOf($node, $parent); |
| 137 | - } |
|
| 137 | + } |
|
| 138 | 138 | |
| 139 | - /** |
|
| 140 | - * @param MenuItemInterface $node |
|
| 141 | - * @param MenuItemInterface $sibling |
|
| 142 | - */ |
|
| 143 | - public function persistAsNextSiblingOf(MenuItemInterface $node, MenuItemInterface $sibling) { |
|
| 139 | + /** |
|
| 140 | + * @param MenuItemInterface $node |
|
| 141 | + * @param MenuItemInterface $sibling |
|
| 142 | + */ |
|
| 143 | + public function persistAsNextSiblingOf(MenuItemInterface $node, MenuItemInterface $sibling) { |
|
| 144 | 144 | parent::persistAsNextSiblingOf($node, $sibling); |
| 145 | - } |
|
| 145 | + } |
|
| 146 | 146 | } |
@@ -32,122 +32,122 @@ |
||
| 32 | 32 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
| 33 | 33 | |
| 34 | 34 | class ContentListsItemLoader extends PaginatedLoader implements LoaderInterface { |
| 35 | - protected ContentListRepositoryInterface $contentListRepository; |
|
| 36 | - protected ContentListItemRepositoryInterface $contentListItemsRepository; |
|
| 37 | - protected MetaFactoryInterface $metaFactory; |
|
| 38 | - private CacheBlockTagsCollectorInterface $cacheBlocksTagsCollector; |
|
| 39 | - private EventDispatcherInterface $eventDispatcher; |
|
| 40 | - |
|
| 41 | - public function __construct( |
|
| 42 | - ContentListRepositoryInterface $contentListRepository, |
|
| 43 | - ContentListItemRepositoryInterface $contentListItemRepository, |
|
| 44 | - MetaFactoryInterface $metaFactory, |
|
| 45 | - CacheBlockTagsCollectorInterface $cacheBlocksTagsCollector, |
|
| 46 | - EventDispatcherInterface $eventDispatcher |
|
| 47 | - ) { |
|
| 35 | + protected ContentListRepositoryInterface $contentListRepository; |
|
| 36 | + protected ContentListItemRepositoryInterface $contentListItemsRepository; |
|
| 37 | + protected MetaFactoryInterface $metaFactory; |
|
| 38 | + private CacheBlockTagsCollectorInterface $cacheBlocksTagsCollector; |
|
| 39 | + private EventDispatcherInterface $eventDispatcher; |
|
| 40 | + |
|
| 41 | + public function __construct( |
|
| 42 | + ContentListRepositoryInterface $contentListRepository, |
|
| 43 | + ContentListItemRepositoryInterface $contentListItemRepository, |
|
| 44 | + MetaFactoryInterface $metaFactory, |
|
| 45 | + CacheBlockTagsCollectorInterface $cacheBlocksTagsCollector, |
|
| 46 | + EventDispatcherInterface $eventDispatcher |
|
| 47 | + ) { |
|
| 48 | 48 | $this->contentListRepository = $contentListRepository; |
| 49 | 49 | $this->contentListItemsRepository = $contentListItemRepository; |
| 50 | 50 | $this->metaFactory = $metaFactory; |
| 51 | 51 | $this->cacheBlocksTagsCollector = $cacheBlocksTagsCollector; |
| 52 | 52 | $this->eventDispatcher = $eventDispatcher; |
| 53 | - } |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - public function load($type, $parameters = [], $withoutParameters = [], $responseType = LoaderInterface::SINGLE) { |
|
| 55 | + public function load($type, $parameters = [], $withoutParameters = [], $responseType = LoaderInterface::SINGLE) { |
|
| 56 | 56 | $criteria = new Criteria(); |
| 57 | 57 | if (LoaderInterface::COLLECTION === $responseType) { |
| 58 | - if (array_key_exists('contentListId', $parameters) && is_numeric($parameters['contentListId'])) { |
|
| 58 | + if (array_key_exists('contentListId', $parameters) && is_numeric($parameters['contentListId'])) { |
|
| 59 | 59 | $contentList = $this->contentListRepository->findOneBy(['id' => $parameters['contentListId']]); |
| 60 | 60 | $criteria->set('contentList', $contentList); |
| 61 | - } elseif (array_key_exists('contentListName', $parameters) && is_string($parameters['contentListName'])) { |
|
| 61 | + } elseif (array_key_exists('contentListName', $parameters) && is_string($parameters['contentListName'])) { |
|
| 62 | 62 | $contentList = $this->contentListRepository->findOneBy(['name' => $parameters['contentListName']]); |
| 63 | 63 | $criteria->set('contentList', $contentList); |
| 64 | - } elseif ( |
|
| 65 | - array_key_exists('contentList', $parameters) && |
|
| 64 | + } elseif ( |
|
| 65 | + array_key_exists('contentList', $parameters) && |
|
| 66 | 66 | $parameters['contentList'] instanceof Meta && |
| 67 | 67 | $parameters['contentList']->getValues() instanceof ContentListInterface |
| 68 | - ) { |
|
| 68 | + ) { |
|
| 69 | 69 | $criteria->set('contentList', $parameters['contentList']->getValues()); |
| 70 | - } |
|
| 70 | + } |
|
| 71 | 71 | |
| 72 | - if (!$criteria->has('contentList')) { |
|
| 72 | + if (!$criteria->has('contentList')) { |
|
| 73 | 73 | return false; |
| 74 | - } |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | - if (array_key_exists('sticky', $parameters) && is_bool($parameters['sticky'])) { |
|
| 76 | + if (array_key_exists('sticky', $parameters) && is_bool($parameters['sticky'])) { |
|
| 77 | 77 | $criteria->set('sticky', $parameters['sticky']); |
| 78 | - } |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - if (isset($withoutParameters['content']) && !empty($withoutParameters['content'])) { |
|
| 80 | + if (isset($withoutParameters['content']) && !empty($withoutParameters['content'])) { |
|
| 81 | 81 | $criteria->set('exclude_content', $withoutParameters['content']); |
| 82 | - } |
|
| 83 | - |
|
| 84 | - $criteria = $this->applyPaginationToCriteria($criteria, $parameters); |
|
| 85 | - $contentListItems = $this->contentListItemsRepository->getPaginatedByCriteria($this->eventDispatcher, $criteria, $criteria->get('order', [ |
|
| 86 | - 'sticky' => 'desc', |
|
| 87 | - ])); |
|
| 88 | - $itemsCollection = new ArrayCollection($contentListItems->getItems()); |
|
| 89 | - if ($itemsCollection->count() > 0) { |
|
| 82 | + } |
|
| 83 | + |
|
| 84 | + $criteria = $this->applyPaginationToCriteria($criteria, $parameters); |
|
| 85 | + $contentListItems = $this->contentListItemsRepository->getPaginatedByCriteria($this->eventDispatcher, $criteria, $criteria->get('order', [ |
|
| 86 | + 'sticky' => 'desc', |
|
| 87 | + ])); |
|
| 88 | + $itemsCollection = new ArrayCollection($contentListItems->getItems()); |
|
| 89 | + if ($itemsCollection->count() > 0) { |
|
| 90 | 90 | $metaCollection = new MetaCollection(); |
| 91 | 91 | $metaCollection->setTotalItemsCount($contentListItems->getTotalItemCount()); |
| 92 | 92 | foreach ($itemsCollection as $item) { |
| 93 | - $itemMeta = $this->getItemMeta($item); |
|
| 94 | - if (null !== $itemMeta) { |
|
| 93 | + $itemMeta = $this->getItemMeta($item); |
|
| 94 | + if (null !== $itemMeta) { |
|
| 95 | 95 | $metaCollection->add($itemMeta); |
| 96 | - } |
|
| 96 | + } |
|
| 97 | 97 | } |
| 98 | 98 | unset($itemsCollection, $criteria); |
| 99 | 99 | |
| 100 | 100 | return $metaCollection; |
| 101 | - } |
|
| 101 | + } |
|
| 102 | 102 | } elseif (LoaderInterface::SINGLE === $responseType) { |
| 103 | - if (array_key_exists('contentListName', $parameters) && is_string($parameters['contentListName'])) { |
|
| 103 | + if (array_key_exists('contentListName', $parameters) && is_string($parameters['contentListName'])) { |
|
| 104 | 104 | $contentList = $this->contentListRepository->findOneBy(['name' => $parameters['contentListName']]); |
| 105 | 105 | $criteria->set('contentList', $contentList); |
| 106 | - } elseif ( |
|
| 107 | - array_key_exists('contentList', $parameters) && |
|
| 106 | + } elseif ( |
|
| 107 | + array_key_exists('contentList', $parameters) && |
|
| 108 | 108 | $parameters['contentList'] instanceof Meta && |
| 109 | 109 | $parameters['contentList']->getValues() instanceof ContentListInterface |
| 110 | - ) { |
|
| 110 | + ) { |
|
| 111 | 111 | $criteria->set('contentList', $parameters['contentList']->getValues()); |
| 112 | - } |
|
| 112 | + } |
|
| 113 | 113 | |
| 114 | - if ( |
|
| 115 | - isset($contentList) |
|
| 114 | + if ( |
|
| 115 | + isset($contentList) |
|
| 116 | 116 | && array_key_exists('article', $parameters) |
| 117 | 117 | && $parameters['article'] instanceof Meta |
| 118 | 118 | && $parameters['article']->getValues() instanceof ArticleInterface |
| 119 | - ) { |
|
| 119 | + ) { |
|
| 120 | 120 | /** @var ContentListItemInterface $currentContentListItem */ |
| 121 | 121 | $currentContentListItem = $this->contentListItemsRepository->getQueryByCriteria(new Criteria([ |
| 122 | 122 | 'contentList' => $contentList, |
| 123 | 123 | 'content' => $parameters['article']->getValues(), |
| 124 | 124 | ]), [], 'n')->getQuery()->getOneOrNullResult(); |
| 125 | 125 | $position = $currentContentListItem->getPosition(); |
| 126 | - } |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | - if (isset($position) && array_key_exists('prev', $parameters) && true === $parameters['prev']) { |
|
| 128 | + if (isset($position) && array_key_exists('prev', $parameters) && true === $parameters['prev']) { |
|
| 129 | 129 | ++$position; |
| 130 | - } elseif (isset($position) && array_key_exists('next', $parameters) && true === $parameters['next']) { |
|
| 130 | + } elseif (isset($position) && array_key_exists('next', $parameters) && true === $parameters['next']) { |
|
| 131 | 131 | --$position; |
| 132 | - } else { |
|
| 132 | + } else { |
|
| 133 | 133 | return null; |
| 134 | - } |
|
| 134 | + } |
|
| 135 | 135 | |
| 136 | - return $this->getItemMeta($this->contentListItemsRepository->getOneOrNullByPosition($criteria, $position)); |
|
| 136 | + return $this->getItemMeta($this->contentListItemsRepository->getOneOrNullByPosition($criteria, $position)); |
|
| 137 | + } |
|
| 137 | 138 | } |
| 138 | - } |
|
| 139 | 139 | |
| 140 | - public function isSupported(string $type): bool { |
|
| 140 | + public function isSupported(string $type): bool { |
|
| 141 | 141 | return in_array($type, ['contentListItems', 'contentListItem']); |
| 142 | - } |
|
| 142 | + } |
|
| 143 | 143 | |
| 144 | - private function getItemMeta($item) { |
|
| 144 | + private function getItemMeta($item) { |
|
| 145 | 145 | if (null !== $item) { |
| 146 | - if ($item instanceof ContentListItemInterface) { |
|
| 146 | + if ($item instanceof ContentListItemInterface) { |
|
| 147 | 147 | $this->cacheBlocksTagsCollector->addTagToCurrentCacheBlock('a-' . $item->getContent()->getId()); |
| 148 | - } |
|
| 148 | + } |
|
| 149 | 149 | |
| 150 | - return $this->metaFactory->create($item); |
|
| 150 | + return $this->metaFactory->create($item); |
|
| 151 | + } |
|
| 151 | 152 | } |
| 152 | - } |
|
| 153 | 153 | } |
@@ -144,7 +144,7 @@ |
||
| 144 | 144 | private function getItemMeta($item) { |
| 145 | 145 | if (null !== $item) { |
| 146 | 146 | if ($item instanceof ContentListItemInterface) { |
| 147 | - $this->cacheBlocksTagsCollector->addTagToCurrentCacheBlock('a-' . $item->getContent()->getId()); |
|
| 147 | + $this->cacheBlocksTagsCollector->addTagToCurrentCacheBlock('a-'.$item->getContent()->getId()); |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | return $this->metaFactory->create($item); |
@@ -121,7 +121,7 @@ |
||
| 121 | 121 | */ |
| 122 | 122 | public function verifyUserEmail(Request $request, GuardAuthenticatorHandler $guardHandler, |
| 123 | 123 | LoginAuthenticator $authenticator): Response { |
| 124 | - $id = (int)$request->get('id'); // retrieve the user id from the url |
|
| 124 | + $id = (int) $request->get('id'); // retrieve the user id from the url |
|
| 125 | 125 | |
| 126 | 126 | if ($request->isXmlHttpRequest()) { |
| 127 | 127 | return $this->verifyUserEmailFromPWA($id, $request); |
@@ -40,43 +40,43 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | class RegistrationController extends AbstractController { |
| 42 | 42 | |
| 43 | - private SettingsManagerInterface $settingsManager; |
|
| 44 | - private ScopeContextInterface $scopeContext; |
|
| 45 | - private EmailVerifier $emailVerifier; |
|
| 46 | - private UserManagerInterface $userManager; |
|
| 47 | - private EntityManagerInterface $entityManager; |
|
| 48 | - |
|
| 49 | - /** |
|
| 50 | - * @param SettingsManagerInterface $settingsManager |
|
| 51 | - * @param ScopeContextInterface $scopeContext |
|
| 52 | - * @param EmailVerifier $emailVerifier |
|
| 53 | - * @param UserManagerInterface $userManager |
|
| 54 | - * @param EntityManagerInterface $entityManager |
|
| 55 | - */ |
|
| 56 | - public function __construct(SettingsManagerInterface $settingsManager, ScopeContextInterface $scopeContext, |
|
| 57 | - EmailVerifier $emailVerifier, UserManagerInterface $userManager, |
|
| 58 | - EntityManagerInterface $entityManager) { |
|
| 43 | + private SettingsManagerInterface $settingsManager; |
|
| 44 | + private ScopeContextInterface $scopeContext; |
|
| 45 | + private EmailVerifier $emailVerifier; |
|
| 46 | + private UserManagerInterface $userManager; |
|
| 47 | + private EntityManagerInterface $entityManager; |
|
| 48 | + |
|
| 49 | + /** |
|
| 50 | + * @param SettingsManagerInterface $settingsManager |
|
| 51 | + * @param ScopeContextInterface $scopeContext |
|
| 52 | + * @param EmailVerifier $emailVerifier |
|
| 53 | + * @param UserManagerInterface $userManager |
|
| 54 | + * @param EntityManagerInterface $entityManager |
|
| 55 | + */ |
|
| 56 | + public function __construct(SettingsManagerInterface $settingsManager, ScopeContextInterface $scopeContext, |
|
| 57 | + EmailVerifier $emailVerifier, UserManagerInterface $userManager, |
|
| 58 | + EntityManagerInterface $entityManager) { |
|
| 59 | 59 | $this->settingsManager = $settingsManager; |
| 60 | 60 | $this->scopeContext = $scopeContext; |
| 61 | 61 | $this->emailVerifier = $emailVerifier; |
| 62 | 62 | $this->userManager = $userManager; |
| 63 | 63 | $this->entityManager = $entityManager; |
| 64 | - } |
|
| 65 | - |
|
| 66 | - |
|
| 67 | - /** |
|
| 68 | - * @FOSRoute("/api/{version}/users/register/", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_register_user") |
|
| 69 | - */ |
|
| 70 | - public function registerAction( |
|
| 71 | - Request $request, |
|
| 72 | - UserPasswordEncoderInterface $passwordEncoder, |
|
| 73 | - UserManagerInterface $userManager, |
|
| 74 | - MailerInterface $mailer |
|
| 75 | - ) { |
|
| 64 | + } |
|
| 65 | + |
|
| 66 | + |
|
| 67 | + /** |
|
| 68 | + * @FOSRoute("/api/{version}/users/register/", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_register_user") |
|
| 69 | + */ |
|
| 70 | + public function registerAction( |
|
| 71 | + Request $request, |
|
| 72 | + UserPasswordEncoderInterface $passwordEncoder, |
|
| 73 | + UserManagerInterface $userManager, |
|
| 74 | + MailerInterface $mailer |
|
| 75 | + ) { |
|
| 76 | 76 | try { |
| 77 | - $this->ensureThatRegistrationIsEnabled(); |
|
| 77 | + $this->ensureThatRegistrationIsEnabled(); |
|
| 78 | 78 | } catch (NotFoundHttpException $e) { |
| 79 | - return new SingleResourceResponse(null, new ResponseContext(404)); |
|
| 79 | + return new SingleResourceResponse(null, new ResponseContext(404)); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | $user = $userManager->createUser(); |
@@ -85,66 +85,66 @@ discard block |
||
| 85 | 85 | $form->handleRequest($request); |
| 86 | 86 | |
| 87 | 87 | if ($form->isSubmitted() && $form->isValid()) { |
| 88 | - $user->addRole('ROLE_USER'); |
|
| 89 | - // encode the plain password |
|
| 90 | - $user->setPassword( |
|
| 91 | - $passwordEncoder->encodePassword( |
|
| 92 | - $user, |
|
| 93 | - $form->get('plainPassword')->getData() |
|
| 94 | - ) |
|
| 95 | - ); |
|
| 96 | - |
|
| 97 | - $entityManager = $this->entityManager; |
|
| 98 | - $entityManager->persist($user); |
|
| 99 | - $entityManager->flush(); |
|
| 100 | - |
|
| 101 | - $signatureComponents = $this->emailVerifier->getSignatureComponents('swp_user_verify_email', $user); |
|
| 102 | - $url = $signatureComponents->getSignedUrl(); |
|
| 103 | - |
|
| 104 | - $mailer->sendConfirmationEmail($user, $url); |
|
| 105 | - |
|
| 106 | - return new JsonResponse([ |
|
| 107 | - 'message' => sprintf( |
|
| 108 | - 'The user has been created successfully. |
|
| 88 | + $user->addRole('ROLE_USER'); |
|
| 89 | + // encode the plain password |
|
| 90 | + $user->setPassword( |
|
| 91 | + $passwordEncoder->encodePassword( |
|
| 92 | + $user, |
|
| 93 | + $form->get('plainPassword')->getData() |
|
| 94 | + ) |
|
| 95 | + ); |
|
| 96 | + |
|
| 97 | + $entityManager = $this->entityManager; |
|
| 98 | + $entityManager->persist($user); |
|
| 99 | + $entityManager->flush(); |
|
| 100 | + |
|
| 101 | + $signatureComponents = $this->emailVerifier->getSignatureComponents('swp_user_verify_email', $user); |
|
| 102 | + $url = $signatureComponents->getSignedUrl(); |
|
| 103 | + |
|
| 104 | + $mailer->sendConfirmationEmail($user, $url); |
|
| 105 | + |
|
| 106 | + return new JsonResponse([ |
|
| 107 | + 'message' => sprintf( |
|
| 108 | + 'The user has been created successfully. |
|
| 109 | 109 | An email has been sent to %s. It contains an activation link you must click to activate your account.', |
| 110 | - $user->getEmail() |
|
| 111 | - ), |
|
| 112 | - 'url' => $url, |
|
| 113 | - ]); |
|
| 110 | + $user->getEmail() |
|
| 111 | + ), |
|
| 112 | + 'url' => $url, |
|
| 113 | + ]); |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | return new SingleResourceResponse($form, new ResponseContext(400)); |
| 117 | - } |
|
| 117 | + } |
|
| 118 | 118 | |
| 119 | - /** |
|
| 120 | - * @Route("/verify/email", name="swp_user_verify_email") |
|
| 121 | - */ |
|
| 122 | - public function verifyUserEmail(Request $request, GuardAuthenticatorHandler $guardHandler, |
|
| 123 | - LoginAuthenticator $authenticator): Response { |
|
| 119 | + /** |
|
| 120 | + * @Route("/verify/email", name="swp_user_verify_email") |
|
| 121 | + */ |
|
| 122 | + public function verifyUserEmail(Request $request, GuardAuthenticatorHandler $guardHandler, |
|
| 123 | + LoginAuthenticator $authenticator): Response { |
|
| 124 | 124 | $id = (int)$request->get('id'); // retrieve the user id from the url |
| 125 | 125 | |
| 126 | 126 | if ($request->isXmlHttpRequest()) { |
| 127 | - return $this->verifyUserEmailFromPWA($id, $request); |
|
| 127 | + return $this->verifyUserEmailFromPWA($id, $request); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | // Verify the user id exists and is not null |
| 131 | 131 | if (null === $id) { |
| 132 | - return $this->redirectToRoute('homepage'); |
|
| 132 | + return $this->redirectToRoute('homepage'); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | $user = $this->userManager->find($id); |
| 136 | 136 | |
| 137 | 137 | // Ensure the user exists in persistence |
| 138 | 138 | if (null === $user) { |
| 139 | - return $this->redirectToRoute('homepage'); |
|
| 139 | + return $this->redirectToRoute('homepage'); |
|
| 140 | 140 | } |
| 141 | 141 | // validate email confirmation link, sets User::isVerified=true and persists |
| 142 | 142 | try { |
| 143 | - $this->emailVerifier->handleEmailConfirmation($request, $user); |
|
| 143 | + $this->emailVerifier->handleEmailConfirmation($request, $user); |
|
| 144 | 144 | } catch (VerifyEmailExceptionInterface $exception) { |
| 145 | - $this->addFlash('verify_email_error', $exception->getReason()); |
|
| 145 | + $this->addFlash('verify_email_error', $exception->getReason()); |
|
| 146 | 146 | |
| 147 | - return $this->redirectToRoute('homepage'); |
|
| 147 | + return $this->redirectToRoute('homepage'); |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | $guardHandler->authenticateUserAndHandleSuccess( |
@@ -157,63 +157,63 @@ discard block |
||
| 157 | 157 | $this->addFlash('success', 'The user has been created successfully.'); |
| 158 | 158 | |
| 159 | 159 | return $this->redirectToRoute('swp_user_registration_confirmed'); |
| 160 | - } |
|
| 160 | + } |
|
| 161 | 161 | |
| 162 | - /** |
|
| 163 | - * Tell the user his account is now confirmed. |
|
| 164 | - */ |
|
| 165 | - public function confirmedAction(Request $request) { |
|
| 162 | + /** |
|
| 163 | + * Tell the user his account is now confirmed. |
|
| 164 | + */ |
|
| 165 | + public function confirmedAction(Request $request) { |
|
| 166 | 166 | $user = $this->getUser(); |
| 167 | 167 | if (!is_object($user) || !$user instanceof UserInterface) { |
| 168 | - $this->createAccessDeniedException('This user does not have access to this section.'); |
|
| 168 | + $this->createAccessDeniedException('This user does not have access to this section.'); |
|
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | return $this->render('@SWPUser/Registration/confirmed.html.twig', [ |
| 172 | 172 | 'user' => $user, |
| 173 | 173 | ]); |
| 174 | - } |
|
| 174 | + } |
|
| 175 | 175 | |
| 176 | - /** |
|
| 177 | - * @throws NotFoundHttpException |
|
| 178 | - */ |
|
| 179 | - private function ensureThatRegistrationIsEnabled() { |
|
| 176 | + /** |
|
| 177 | + * @throws NotFoundHttpException |
|
| 178 | + */ |
|
| 179 | + private function ensureThatRegistrationIsEnabled() { |
|
| 180 | 180 | $settingName = 'registration_enabled'; |
| 181 | 181 | $setting = $this->settingsManager->getOneSettingByName($settingName); |
| 182 | 182 | $registrationEnabled = $this->settingsManager |
| 183 | 183 | ->get($settingName, $setting['scope'], $this->scopeContext->getScopeOwner($setting['scope'])); |
| 184 | 184 | if (!$registrationEnabled) { |
| 185 | - throw new NotFoundHttpException('Registration is disabled.'); |
|
| 185 | + throw new NotFoundHttpException('Registration is disabled.'); |
|
| 186 | + } |
|
| 186 | 187 | } |
| 187 | - } |
|
| 188 | 188 | |
| 189 | - private function verifyUserEmailFromPWA(int $id, Request $request): JsonResponse { |
|
| 189 | + private function verifyUserEmailFromPWA(int $id, Request $request): JsonResponse { |
|
| 190 | 190 | // Verify the user id exists and is not null |
| 191 | 191 | if (null === $id) { |
| 192 | - return new JsonResponse( |
|
| 193 | - ['error' => 'User does not exist'] |
|
| 194 | - ); |
|
| 192 | + return new JsonResponse( |
|
| 193 | + ['error' => 'User does not exist'] |
|
| 194 | + ); |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | $user = $this->userManager->find($id); |
| 198 | 198 | |
| 199 | 199 | // Ensure the user exists in persistence |
| 200 | 200 | if (null === $user) { |
| 201 | - return new JsonResponse( |
|
| 202 | - ['error' => 'User does not exist'] |
|
| 203 | - ); |
|
| 201 | + return new JsonResponse( |
|
| 202 | + ['error' => 'User does not exist'] |
|
| 203 | + ); |
|
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | // validate email confirmation link, sets User::isVerified=true and persists |
| 207 | 207 | try { |
| 208 | - $this->emailVerifier->handleEmailConfirmation($request, $user); |
|
| 208 | + $this->emailVerifier->handleEmailConfirmation($request, $user); |
|
| 209 | 209 | } catch (VerifyEmailExceptionInterface $exception) { |
| 210 | - return new JsonResponse( |
|
| 211 | - ['error' => 'Registration confirmation invalid'] |
|
| 212 | - ); |
|
| 210 | + return new JsonResponse( |
|
| 211 | + ['error' => 'Registration confirmation invalid'] |
|
| 212 | + ); |
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | return new JsonResponse( |
| 216 | 216 | ['message' => 'The user has been created successfully.'] |
| 217 | 217 | ); |
| 218 | - } |
|
| 218 | + } |
|
| 219 | 219 | } |
@@ -32,44 +32,44 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | class ProfileController extends AbstractController { |
| 34 | 34 | |
| 35 | - private EntityManagerInterface $entityManager; |
|
| 36 | - private AuthorizationCheckerInterface $authorizationChecker; |
|
| 37 | - private UserRepository $userRepository; |
|
| 38 | - |
|
| 39 | - /** |
|
| 40 | - * @param EntityManagerInterface $entityManager |
|
| 41 | - * @param AuthorizationCheckerInterface $authorizationChecker |
|
| 42 | - * @param UserRepository $userRepository |
|
| 43 | - */ |
|
| 44 | - public function __construct(EntityManagerInterface $entityManager, |
|
| 45 | - AuthorizationCheckerInterface $authorizationChecker, UserRepository $userRepository) { |
|
| 35 | + private EntityManagerInterface $entityManager; |
|
| 36 | + private AuthorizationCheckerInterface $authorizationChecker; |
|
| 37 | + private UserRepository $userRepository; |
|
| 38 | + |
|
| 39 | + /** |
|
| 40 | + * @param EntityManagerInterface $entityManager |
|
| 41 | + * @param AuthorizationCheckerInterface $authorizationChecker |
|
| 42 | + * @param UserRepository $userRepository |
|
| 43 | + */ |
|
| 44 | + public function __construct(EntityManagerInterface $entityManager, |
|
| 45 | + AuthorizationCheckerInterface $authorizationChecker, UserRepository $userRepository) { |
|
| 46 | 46 | $this->entityManager = $entityManager; |
| 47 | 47 | $this->authorizationChecker = $authorizationChecker; |
| 48 | 48 | $this->userRepository = $userRepository; |
| 49 | - } |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * @Route("/api/{version}/users/profile/{id}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_user_get_user_profile") |
|
| 54 | - */ |
|
| 55 | - public function getAction($id) { |
|
| 52 | + /** |
|
| 53 | + * @Route("/api/{version}/users/profile/{id}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_user_get_user_profile") |
|
| 54 | + */ |
|
| 55 | + public function getAction($id) { |
|
| 56 | 56 | $requestedUser = $this->userRepository->find($id); |
| 57 | 57 | if (!is_object($requestedUser) || !$requestedUser instanceof UserInterface) { |
| 58 | - throw new NotFoundHttpException('Requested user don\'t exists'); |
|
| 58 | + throw new NotFoundHttpException('Requested user don\'t exists'); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | $this->checkIfCanAccess($requestedUser); |
| 62 | 62 | |
| 63 | 63 | return new SingleResourceResponse($requestedUser); |
| 64 | - } |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - /** |
|
| 67 | - * @Route("/api/{version}/users/profile/{id}", methods={"PATCH"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_user_edit_user_profile") |
|
| 68 | - */ |
|
| 69 | - public function editAction(Request $request, $id, UserPasswordEncoderInterface $passwordEncoder) { |
|
| 66 | + /** |
|
| 67 | + * @Route("/api/{version}/users/profile/{id}", methods={"PATCH"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_user_edit_user_profile") |
|
| 68 | + */ |
|
| 69 | + public function editAction(Request $request, $id, UserPasswordEncoderInterface $passwordEncoder) { |
|
| 70 | 70 | $requestedUser = $this->userRepository->find($id); |
| 71 | 71 | if (!is_object($requestedUser) || !$requestedUser instanceof UserInterface) { |
| 72 | - throw new NotFoundHttpException('Requested user don\'t exists'); |
|
| 72 | + throw new NotFoundHttpException('Requested user don\'t exists'); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | $this->checkIfCanAccess($requestedUser); |
@@ -80,32 +80,32 @@ discard block |
||
| 80 | 80 | $form->handleRequest($request); |
| 81 | 81 | |
| 82 | 82 | if ($form->isSubmitted() && $form->isValid()) { |
| 83 | - if (!empty($form->get('plainPassword')->getData())) { |
|
| 83 | + if (!empty($form->get('plainPassword')->getData())) { |
|
| 84 | 84 | $requestedUser->setPassword( |
| 85 | 85 | $passwordEncoder->encodePassword( |
| 86 | 86 | $requestedUser, |
| 87 | 87 | $form->get('plainPassword')->getData() |
| 88 | 88 | ) |
| 89 | 89 | ); |
| 90 | - } |
|
| 90 | + } |
|
| 91 | 91 | |
| 92 | - $entityManager = $this->entityManager; |
|
| 93 | - $entityManager->flush(); |
|
| 92 | + $entityManager = $this->entityManager; |
|
| 93 | + $entityManager->flush(); |
|
| 94 | 94 | |
| 95 | - return new SingleResourceResponse($requestedUser); |
|
| 95 | + return new SingleResourceResponse($requestedUser); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | return new SingleResourceResponse($form, new ResponseContext(400)); |
| 99 | - } |
|
| 99 | + } |
|
| 100 | 100 | |
| 101 | - private function checkIfCanAccess($requestedUser) { |
|
| 101 | + private function checkIfCanAccess($requestedUser) { |
|
| 102 | 102 | /** @var UserInterface $currentUser */ |
| 103 | 103 | $currentUser = $this->getUser(); |
| 104 | 104 | if ( |
| 105 | 105 | !$this->authorizationChecker->isGranted('ROLE_ADMIN') && |
| 106 | 106 | $requestedUser->getId() !== $currentUser->getId() |
| 107 | 107 | ) { |
| 108 | - throw new AccessDeniedException('This user does not have access to this section. profile'); |
|
| 108 | + throw new AccessDeniedException('This user does not have access to this section. profile'); |
|
| 109 | + } |
|
| 109 | 110 | } |
| 110 | - } |
|
| 111 | 111 | } |