@@ -36,7 +36,7 @@ |
||
36 | 36 | |
37 | 37 | private function getPaths() : array |
38 | 38 | { |
39 | - return [$this->themeUploader->getAvailableThemesPath()]; |
|
39 | + return [$this->themeUploader->getAvailableThemesPath()]; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | /** |
@@ -25,62 +25,62 @@ discard block |
||
25 | 25 | use Symfony\Component\HttpFoundation\RequestStack; |
26 | 26 | |
27 | 27 | class Paginator implements PaginatorInterface { |
28 | - private EventDispatcherInterface $eventDispatcher; |
|
29 | - private ?RequestStack $requestStack; |
|
30 | - |
|
31 | - private array $defaultOptions = [ |
|
32 | - self::PAGE_PARAMETER_NAME => 'page', |
|
33 | - self::SORT_FIELD_PARAMETER_NAME => 'sort', |
|
34 | - self::SORT_DIRECTION_PARAMETER_NAME => 'direction', |
|
35 | - self::FILTER_FIELD_PARAMETER_NAME => 'filterParam', |
|
36 | - self::FILTER_VALUE_PARAMETER_NAME => 'filterValue', |
|
37 | - self::DISTINCT => true, |
|
38 | - self::PAGE_OUT_OF_RANGE => self::PAGE_OUT_OF_RANGE_IGNORE, |
|
39 | - self::DEFAULT_LIMIT => self::DEFAULT_LIMIT_VALUE, |
|
40 | - ]; |
|
41 | - |
|
42 | - |
|
43 | - public function __construct(EventDispatcherInterface $eventDispatcher, ?RequestStack $requestStack = null) { |
|
28 | + private EventDispatcherInterface $eventDispatcher; |
|
29 | + private ?RequestStack $requestStack; |
|
30 | + |
|
31 | + private array $defaultOptions = [ |
|
32 | + self::PAGE_PARAMETER_NAME => 'page', |
|
33 | + self::SORT_FIELD_PARAMETER_NAME => 'sort', |
|
34 | + self::SORT_DIRECTION_PARAMETER_NAME => 'direction', |
|
35 | + self::FILTER_FIELD_PARAMETER_NAME => 'filterParam', |
|
36 | + self::FILTER_VALUE_PARAMETER_NAME => 'filterValue', |
|
37 | + self::DISTINCT => true, |
|
38 | + self::PAGE_OUT_OF_RANGE => self::PAGE_OUT_OF_RANGE_IGNORE, |
|
39 | + self::DEFAULT_LIMIT => self::DEFAULT_LIMIT_VALUE, |
|
40 | + ]; |
|
41 | + |
|
42 | + |
|
43 | + public function __construct(EventDispatcherInterface $eventDispatcher, ?RequestStack $requestStack = null) { |
|
44 | 44 | $this->eventDispatcher = $eventDispatcher; |
45 | 45 | $this->requestStack = $requestStack; |
46 | - } |
|
46 | + } |
|
47 | 47 | |
48 | - public function setDefaultPaginatorOptions(array $options): void { |
|
48 | + public function setDefaultPaginatorOptions(array $options): void { |
|
49 | 49 | $this->defaultOptions = \array_merge($this->defaultOptions, $options); |
50 | - } |
|
51 | - |
|
52 | - /** |
|
53 | - * {@inheritdoc} |
|
54 | - * |
|
55 | - * IMPORTANT: This method expects OFFSET value instead PAGE |
|
56 | - */ |
|
57 | - public function paginate($target, int $offset = 1, $limit = 10, array $options = array()) : PaginationInterface { |
|
50 | + } |
|
51 | + |
|
52 | + /** |
|
53 | + * {@inheritdoc} |
|
54 | + * |
|
55 | + * IMPORTANT: This method expects OFFSET value instead PAGE |
|
56 | + */ |
|
57 | + public function paginate($target, int $offset = 1, $limit = 10, array $options = array()) : PaginationInterface { |
|
58 | 58 | $limit = intval(abs($limit)); |
59 | 59 | if (!$limit) { |
60 | - throw new \LogicException('Invalid item per page number, must be a positive number'); |
|
60 | + throw new \LogicException('Invalid item per page number, must be a positive number'); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | $page = intval(round($offset / $limit), 10); |
64 | 64 | if ($page < 1) { |
65 | - $page = 1; |
|
65 | + $page = 1; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | $options = \array_merge($this->defaultOptions, $options); |
69 | 69 | |
70 | 70 | // normalize default sort field |
71 | 71 | if (isset($options[PaginatorInterface::DEFAULT_SORT_FIELD_NAME]) && is_array($options[PaginatorInterface::DEFAULT_SORT_FIELD_NAME])) { |
72 | - $options[PaginatorInterface::DEFAULT_SORT_FIELD_NAME] = implode('+', $options[PaginatorInterface::DEFAULT_SORT_FIELD_NAME]); |
|
72 | + $options[PaginatorInterface::DEFAULT_SORT_FIELD_NAME] = implode('+', $options[PaginatorInterface::DEFAULT_SORT_FIELD_NAME]); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | $request = null === $this->requestStack ? Request::createFromGlobals() : $this->requestStack->getCurrentRequest(); |
76 | 76 | |
77 | 77 | // default sort field and direction are set based on options (if available) |
78 | 78 | if (isset($options[self::DEFAULT_SORT_FIELD_NAME]) && !$request->query->has($options[self::SORT_FIELD_PARAMETER_NAME])) { |
79 | - $request->query->set($options[self::SORT_FIELD_PARAMETER_NAME], $options[self::DEFAULT_SORT_FIELD_NAME]); |
|
79 | + $request->query->set($options[self::SORT_FIELD_PARAMETER_NAME], $options[self::DEFAULT_SORT_FIELD_NAME]); |
|
80 | 80 | |
81 | - if (!$request->query->has($options[PaginatorInterface::SORT_DIRECTION_PARAMETER_NAME])) { |
|
81 | + if (!$request->query->has($options[PaginatorInterface::SORT_DIRECTION_PARAMETER_NAME])) { |
|
82 | 82 | $request->query->set($options[PaginatorInterface::SORT_DIRECTION_PARAMETER_NAME], $options[PaginatorInterface::DEFAULT_SORT_DIRECTION] ?? 'asc'); |
83 | - } |
|
83 | + } |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | // before pagination start |
@@ -92,20 +92,20 @@ discard block |
||
92 | 92 | $itemsEvent->target = &$target; |
93 | 93 | $this->eventDispatcher->dispatch($itemsEvent, 'knp_pager.items'); |
94 | 94 | if (!$itemsEvent->isPropagationStopped()) { |
95 | - throw new \RuntimeException('One of listeners must count and slice given target'); |
|
95 | + throw new \RuntimeException('One of listeners must count and slice given target'); |
|
96 | 96 | } |
97 | 97 | if ($page > ceil($itemsEvent->count / $limit)) { |
98 | - $pageOutOfRangeOption = $options[PaginatorInterface::PAGE_OUT_OF_RANGE] ?? $this->defaultOptions[PaginatorInterface::PAGE_OUT_OF_RANGE]; |
|
99 | - if ($pageOutOfRangeOption === PaginatorInterface::PAGE_OUT_OF_RANGE_FIX && $itemsEvent->count > 0) { |
|
98 | + $pageOutOfRangeOption = $options[PaginatorInterface::PAGE_OUT_OF_RANGE] ?? $this->defaultOptions[PaginatorInterface::PAGE_OUT_OF_RANGE]; |
|
99 | + if ($pageOutOfRangeOption === PaginatorInterface::PAGE_OUT_OF_RANGE_FIX && $itemsEvent->count > 0) { |
|
100 | 100 | // replace page number out of range with max page |
101 | 101 | return $this->paginate($target, (int) ceil($itemsEvent->count / $limit), $limit, $options); |
102 | - } |
|
103 | - if ($pageOutOfRangeOption === self::PAGE_OUT_OF_RANGE_THROW_EXCEPTION && $page > 1) { |
|
102 | + } |
|
103 | + if ($pageOutOfRangeOption === self::PAGE_OUT_OF_RANGE_THROW_EXCEPTION && $page > 1) { |
|
104 | 104 | throw new PageNumberOutOfRangeException( |
105 | 105 | sprintf('Page number: %d is out of range.', $page), |
106 | 106 | (int) ceil($itemsEvent->count / $limit) |
107 | 107 | ); |
108 | - } |
|
108 | + } |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | // pagination initialization event |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $paginationEvent->options = &$options; |
115 | 115 | $this->eventDispatcher->dispatch($paginationEvent, 'knp_pager.pagination'); |
116 | 116 | if (!$paginationEvent->isPropagationStopped()) { |
117 | - throw new \RuntimeException('One of listeners must create pagination view'); |
|
117 | + throw new \RuntimeException('One of listeners must create pagination view'); |
|
118 | 118 | } |
119 | 119 | // pagination class can be different, with different rendering methods |
120 | 120 | $paginationView = $paginationEvent->getPagination(); |
@@ -130,5 +130,5 @@ discard block |
||
130 | 130 | $this->eventDispatcher->dispatch($afterEvent, 'knp_pager.after'); |
131 | 131 | |
132 | 132 | return $paginationView; |
133 | - } |
|
133 | + } |
|
134 | 134 | } |
@@ -129,7 +129,7 @@ |
||
129 | 129 | $name = ""; |
130 | 130 | $params = ['slug' => $article->getSlug()]; |
131 | 131 | DecoratingRoutingExtension::setupParams($article->getRoute(), $name, $params); |
132 | - $url = $this->urlGenerator->generate($name, $params , UrlGeneratorInterface::ABSOLUTE_URL); |
|
132 | + $url = $this->urlGenerator->generate($name, $params, UrlGeneratorInterface::ABSOLUTE_URL); |
|
133 | 133 | |
134 | 134 | return $this->getClient($feed)->removeArticle($url); |
135 | 135 | } |
@@ -6,8 +6,8 @@ |
||
6 | 6 | |
7 | 7 | final class BypassFinalHook implements BeforeTestHook |
8 | 8 | { |
9 | - public function executeBeforeTest(string $test): void |
|
10 | - { |
|
9 | + public function executeBeforeTest(string $test): void |
|
10 | + { |
|
11 | 11 | BypassFinals::enable(); |
12 | - } |
|
12 | + } |
|
13 | 13 | } |
@@ -37,83 +37,83 @@ discard block |
||
37 | 37 | |
38 | 38 | class MenuController extends AbstractFOSRestController { |
39 | 39 | |
40 | - private FormFactoryInterface $formFactory; |
|
41 | - private EventDispatcherInterface $eventDispatcher; |
|
42 | - private MenuItemRepositoryInterface $menuItemRepository; |
|
43 | - private MenuItemManager $menuItemManager; |
|
44 | - private MenuFactoryInterface $menuFactory; |
|
45 | - |
|
46 | - /** |
|
47 | - * @param FormFactoryInterface $formFactory |
|
48 | - * @param EventDispatcherInterface $eventDispatcher |
|
49 | - * @param MenuItemRepositoryInterface $menuItemRepository |
|
50 | - * @param MenuItemManager $menuItemManager |
|
51 | - * @param MenuFactoryInterface $menuFactory |
|
52 | - */ |
|
53 | - public function __construct(FormFactoryInterface $formFactory, EventDispatcherInterface $eventDispatcher, |
|
54 | - MenuItemRepositoryInterface $menuItemRepository, MenuItemManager $menuItemManager, |
|
55 | - MenuFactoryInterface $menuFactory) { |
|
40 | + private FormFactoryInterface $formFactory; |
|
41 | + private EventDispatcherInterface $eventDispatcher; |
|
42 | + private MenuItemRepositoryInterface $menuItemRepository; |
|
43 | + private MenuItemManager $menuItemManager; |
|
44 | + private MenuFactoryInterface $menuFactory; |
|
45 | + |
|
46 | + /** |
|
47 | + * @param FormFactoryInterface $formFactory |
|
48 | + * @param EventDispatcherInterface $eventDispatcher |
|
49 | + * @param MenuItemRepositoryInterface $menuItemRepository |
|
50 | + * @param MenuItemManager $menuItemManager |
|
51 | + * @param MenuFactoryInterface $menuFactory |
|
52 | + */ |
|
53 | + public function __construct(FormFactoryInterface $formFactory, EventDispatcherInterface $eventDispatcher, |
|
54 | + MenuItemRepositoryInterface $menuItemRepository, MenuItemManager $menuItemManager, |
|
55 | + MenuFactoryInterface $menuFactory) { |
|
56 | 56 | $this->formFactory = $formFactory; |
57 | 57 | $this->eventDispatcher = $eventDispatcher; |
58 | 58 | $this->menuItemRepository = $menuItemRepository; |
59 | 59 | $this->menuItemManager = $menuItemManager; |
60 | 60 | $this->menuFactory = $menuFactory; |
61 | - } |
|
61 | + } |
|
62 | 62 | |
63 | 63 | |
64 | - /** |
|
65 | - * @Route("/api/{version}/menus/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_menu") |
|
66 | - */ |
|
67 | - public function listAction(Request $request): ResourcesListResponseInterface { |
|
64 | + /** |
|
65 | + * @Route("/api/{version}/menus/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_menu") |
|
66 | + */ |
|
67 | + public function listAction(Request $request): ResourcesListResponseInterface { |
|
68 | 68 | $menuRepository = $this->menuItemRepository; |
69 | 69 | $page = $request->query->get('page', 1); |
70 | 70 | $limit = $request->query->get('limit', 10); |
71 | 71 | |
72 | 72 | return new ResourcesListResponse($menuRepository->findRootNodes($this->eventDispatcher, $page, $limit)); |
73 | - } |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * @Route("/api/{version}/menus/{id}/children/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_children_menu") |
|
77 | - */ |
|
78 | - public function listChildrenAction($id): ResourcesListResponseInterface { |
|
75 | + /** |
|
76 | + * @Route("/api/{version}/menus/{id}/children/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_children_menu") |
|
77 | + */ |
|
78 | + public function listChildrenAction($id): ResourcesListResponseInterface { |
|
79 | 79 | $menuRepository = $this->menuItemRepository; |
80 | 80 | |
81 | 81 | $menus = $menuRepository->findChildrenAsTree($this->eventDispatcher, $this->findOr404($id)); |
82 | 82 | |
83 | 83 | return new ResourcesListResponse($menus); |
84 | - } |
|
84 | + } |
|
85 | 85 | |
86 | - /** |
|
87 | - * @Route("/api/{version}/menus/{id}/move/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_move_menu", requirements={"id"="\d+"}) |
|
88 | - */ |
|
89 | - public function moveAction(Request $request, $id): SingleResourceResponseInterface { |
|
86 | + /** |
|
87 | + * @Route("/api/{version}/menus/{id}/move/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_move_menu", requirements={"id"="\d+"}) |
|
88 | + */ |
|
89 | + public function moveAction(Request $request, $id): SingleResourceResponseInterface { |
|
90 | 90 | $menuItem = $this->findOr404($id); |
91 | 91 | $form = $this->formFactory->createNamed('', MenuItemMoveType::class, [], ['method' => $request->getMethod()]); |
92 | 92 | $form->handleRequest($request); |
93 | 93 | |
94 | 94 | if ($form->isSubmitted() && $form->isValid()) { |
95 | - $menuItemManager = $this->menuItemManager; |
|
96 | - $formData = $form->getData(); |
|
95 | + $menuItemManager = $this->menuItemManager; |
|
96 | + $formData = $form->getData(); |
|
97 | 97 | |
98 | - $menuItemManager->move($menuItem, $formData['parent'], $formData['position']); |
|
98 | + $menuItemManager->move($menuItem, $formData['parent'], $formData['position']); |
|
99 | 99 | |
100 | - return new SingleResourceResponse($menuItem); |
|
100 | + return new SingleResourceResponse($menuItem); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | return new SingleResourceResponse($form, new ResponseContext(400)); |
104 | - } |
|
104 | + } |
|
105 | 105 | |
106 | - /** |
|
107 | - * @Route("/api/{version}/menus/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_get_menu") |
|
108 | - */ |
|
109 | - public function getAction($id): SingleResourceResponseInterface { |
|
106 | + /** |
|
107 | + * @Route("/api/{version}/menus/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_get_menu") |
|
108 | + */ |
|
109 | + public function getAction($id): SingleResourceResponseInterface { |
|
110 | 110 | return new SingleResourceResponse($this->findOr404($id)); |
111 | - } |
|
111 | + } |
|
112 | 112 | |
113 | - /** |
|
114 | - * @Route("/api/{version}/menus/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_create_menu") |
|
115 | - */ |
|
116 | - public function createAction(Request $request): SingleResourceResponseInterface { |
|
113 | + /** |
|
114 | + * @Route("/api/{version}/menus/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_create_menu") |
|
115 | + */ |
|
116 | + public function createAction(Request $request): SingleResourceResponseInterface { |
|
117 | 117 | /* @var MenuItemInterface $menu */ |
118 | 118 | $menu = $this->menuFactory->create(); |
119 | 119 | $form = $this->formFactory->createNamed('', MenuType::class, $menu, ['method' => $request->getMethod()]); |
@@ -121,20 +121,20 @@ discard block |
||
121 | 121 | $form->handleRequest($request); |
122 | 122 | |
123 | 123 | if ($form->isSubmitted() && $form->isValid()) { |
124 | - $this->menuItemManager->update($menu); |
|
125 | - $this->menuItemRepository->add($menu); |
|
126 | - $this->eventDispatcher->dispatch(new GenericEvent($menu), MenuEvents::MENU_CREATED); |
|
124 | + $this->menuItemManager->update($menu); |
|
125 | + $this->menuItemRepository->add($menu); |
|
126 | + $this->eventDispatcher->dispatch(new GenericEvent($menu), MenuEvents::MENU_CREATED); |
|
127 | 127 | |
128 | - return new SingleResourceResponse($menu, new ResponseContext(201)); |
|
128 | + return new SingleResourceResponse($menu, new ResponseContext(201)); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | return new SingleResourceResponse($form, new ResponseContext(400)); |
132 | - } |
|
132 | + } |
|
133 | 133 | |
134 | - /** |
|
135 | - * @Route("/api/{version}/menus/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_core_delete_menu") |
|
136 | - */ |
|
137 | - public function deleteAction(int $id) { |
|
134 | + /** |
|
135 | + * @Route("/api/{version}/menus/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_core_delete_menu") |
|
136 | + */ |
|
137 | + public function deleteAction(int $id) { |
|
138 | 138 | $repository = $this->menuItemRepository; |
139 | 139 | $menu = $this->findOr404($id); |
140 | 140 | |
@@ -142,35 +142,35 @@ discard block |
||
142 | 142 | $this->eventDispatcher->dispatch(new GenericEvent($menu), MenuEvents::MENU_DELETED); |
143 | 143 | |
144 | 144 | return new SingleResourceResponse(null, new ResponseContext(204)); |
145 | - } |
|
145 | + } |
|
146 | 146 | |
147 | - /** |
|
148 | - * @Route("/api/{version}/menus/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_menu") |
|
149 | - */ |
|
150 | - public function updateAction(Request $request, $id): SingleResourceResponseInterface { |
|
147 | + /** |
|
148 | + * @Route("/api/{version}/menus/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_menu") |
|
149 | + */ |
|
150 | + public function updateAction(Request $request, $id): SingleResourceResponseInterface { |
|
151 | 151 | $menu = $this->findOr404($id); |
152 | 152 | $parent = $menu->getParent(); |
153 | 153 | $form = $this->formFactory->createNamed('', MenuType::class, $menu, ['method' => $request->getMethod()]); |
154 | 154 | $form->handleRequest($request); |
155 | 155 | if ($form->isSubmitted() && $form->isValid()) { |
156 | - $this->menuItemManager->update($menu); |
|
157 | - if($parent !== $menu->getParent()) { |
|
158 | - $this->menuItemManager->update($parent); |
|
159 | - } |
|
160 | - $this->menuItemRepository->flush(); |
|
161 | - $this->eventDispatcher->dispatch(new GenericEvent($menu), MenuEvents::MENU_UPDATED); |
|
162 | - return new SingleResourceResponse($menu); |
|
156 | + $this->menuItemManager->update($menu); |
|
157 | + if($parent !== $menu->getParent()) { |
|
158 | + $this->menuItemManager->update($parent); |
|
159 | + } |
|
160 | + $this->menuItemRepository->flush(); |
|
161 | + $this->eventDispatcher->dispatch(new GenericEvent($menu), MenuEvents::MENU_UPDATED); |
|
162 | + return new SingleResourceResponse($menu); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | return new SingleResourceResponse($form, new ResponseContext(400)); |
166 | - } |
|
166 | + } |
|
167 | 167 | |
168 | - private function findOr404($id): MenuItemInterface { |
|
168 | + private function findOr404($id): MenuItemInterface { |
|
169 | 169 | /* @var MenuItemInterface $menu */ |
170 | 170 | if (null === $menu = $this->menuItemRepository->findOneBy(['id' => $id])) { |
171 | - throw new NotFoundHttpException('Menu item was not found.'); |
|
171 | + throw new NotFoundHttpException('Menu item was not found.'); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | return $menu; |
175 | - } |
|
175 | + } |
|
176 | 176 | } |
@@ -154,7 +154,7 @@ |
||
154 | 154 | $form->handleRequest($request); |
155 | 155 | if ($form->isSubmitted() && $form->isValid()) { |
156 | 156 | $this->menuItemManager->update($menu); |
157 | - if($parent !== $menu->getParent()) { |
|
157 | + if ($parent !== $menu->getParent()) { |
|
158 | 158 | $this->menuItemManager->update($parent); |
159 | 159 | } |
160 | 160 | $this->menuItemRepository->flush(); |
@@ -21,58 +21,58 @@ |
||
21 | 21 | use Twig\TwigFunction; |
22 | 22 | |
23 | 23 | class MenuExtension extends KnpMenuExtension { |
24 | - /** |
|
25 | - * {@inheritdoc} |
|
26 | - */ |
|
27 | - public function getMy($menu, array $path = [], array $options = []): ?ItemInterface { |
|
24 | + /** |
|
25 | + * {@inheritdoc} |
|
26 | + */ |
|
27 | + public function getMy($menu, array $path = [], array $options = []): ?ItemInterface { |
|
28 | 28 | try { |
29 | - return parent::get($menu, $path, $options); |
|
29 | + return parent::get($menu, $path, $options); |
|
30 | 30 | } catch (\InvalidArgumentException $e) { |
31 | - return null; |
|
31 | + return null; |
|
32 | + } |
|
32 | 33 | } |
33 | - } |
|
34 | 34 | |
35 | - /** |
|
36 | - * {@inheritdoc} |
|
37 | - */ |
|
38 | - public function render($menu, array $options = [], $renderer = null): string { |
|
35 | + /** |
|
36 | + * {@inheritdoc} |
|
37 | + */ |
|
38 | + public function render($menu, array $options = [], $renderer = null): string { |
|
39 | 39 | try { |
40 | - return parent::render($menu, $options, $renderer); |
|
40 | + return parent::render($menu, $options, $renderer); |
|
41 | 41 | } catch (\InvalidArgumentException $e) { |
42 | - // allow to render empty value |
|
43 | - return ""; |
|
42 | + // allow to render empty value |
|
43 | + return ""; |
|
44 | + } |
|
44 | 45 | } |
45 | - } |
|
46 | 46 | |
47 | - /** |
|
48 | - * {@inheritdoc} |
|
49 | - */ |
|
50 | - public function getBreadcrumbsArrayMy($menu, $subItem = null): ?array { |
|
47 | + /** |
|
48 | + * {@inheritdoc} |
|
49 | + */ |
|
50 | + public function getBreadcrumbsArrayMy($menu, $subItem = null): ?array { |
|
51 | 51 | try { |
52 | - return parent::getBreadcrumbsArray($menu, $subItem); |
|
52 | + return parent::getBreadcrumbsArray($menu, $subItem); |
|
53 | 53 | } catch (\InvalidArgumentException $e) { |
54 | - // allow to render empty value |
|
55 | - return null; |
|
54 | + // allow to render empty value |
|
55 | + return null; |
|
56 | + } |
|
56 | 57 | } |
57 | - } |
|
58 | 58 | |
59 | - /** |
|
60 | - * {@inheritdoc} |
|
61 | - */ |
|
62 | - public function getCurrentItemMy($menu): ?ItemInterface { |
|
59 | + /** |
|
60 | + * {@inheritdoc} |
|
61 | + */ |
|
62 | + public function getCurrentItemMy($menu): ?ItemInterface { |
|
63 | 63 | try { |
64 | - return parent::getCurrentItem($menu); |
|
64 | + return parent::getCurrentItem($menu); |
|
65 | 65 | } catch (\InvalidArgumentException $e) { |
66 | - return null; |
|
66 | + return null; |
|
67 | + } |
|
67 | 68 | } |
68 | - } |
|
69 | 69 | |
70 | - public function getFunctions(): array { |
|
70 | + public function getFunctions(): array { |
|
71 | 71 | return [ |
72 | 72 | new TwigFunction('knp_menu_get', [$this, 'getMy']), |
73 | 73 | new TwigFunction('knp_menu_render', [$this, 'render'], ['is_safe' => ['html']]), |
74 | 74 | new TwigFunction('knp_menu_get_breadcrumbs_array', [$this, 'getBreadcrumbsArrayMy']), |
75 | 75 | new TwigFunction('knp_menu_get_current_item', [$this, 'getCurrentItemMy']), |
76 | 76 | ]; |
77 | - } |
|
77 | + } |
|
78 | 78 | } |
@@ -102,7 +102,7 @@ |
||
102 | 102 | } |
103 | 103 | $this->load($name); |
104 | 104 | if (array_key_exists($name, $this->copiedValues)) { |
105 | - return $this->copiedValues[$name]; |
|
105 | + return $this->copiedValues[$name]; |
|
106 | 106 | } |
107 | 107 | return null; |
108 | 108 | } |
@@ -40,30 +40,30 @@ discard block |
||
40 | 40 | use FOS\RestBundle\Controller\Annotations\Route; |
41 | 41 | |
42 | 42 | class ContentPushController extends AbstractController { |
43 | - private EventDispatcherInterface $eventDispatcher; |
|
44 | - private FormFactoryInterface $formFactory; |
|
45 | - private MessageBusInterface $messageBus;//swp_multi_tenancy.tenant_context |
|
46 | - private DataTransformerInterface $dataTransformer; // swp_bridge.transformer.json_to_package |
|
47 | - private MediaManagerInterface $mediaManager; // swp_content_bundle.manager.media |
|
48 | - private EntityManagerInterface $entityManager; // swp.object_manager.media |
|
49 | - private PackageRepository $packageRepository;//swp.repository.package |
|
50 | - private FileProviderInterface $fileProvider; |
|
51 | - |
|
52 | - /** |
|
53 | - * @param EventDispatcherInterface $eventDispatcher |
|
54 | - * @param FormFactoryInterface $formFactory |
|
55 | - * @param MessageBusInterface $messageBus |
|
56 | - * @param DataTransformerInterface $dataTransformer |
|
57 | - * @param MediaManagerInterface $mediaManager |
|
58 | - * @param EntityManagerInterface $entityManager |
|
59 | - * @param PackageRepositoryInterface $packageRepository |
|
60 | - * @param FileProviderInterface $fileProvider |
|
61 | - */ |
|
62 | - public function __construct(EventDispatcherInterface $eventDispatcher, FormFactoryInterface $formFactory, |
|
63 | - MessageBusInterface $messageBus, |
|
64 | - DataTransformerInterface $dataTransformer, MediaManagerInterface $mediaManager, |
|
65 | - EntityManagerInterface $entityManager, PackageRepository $packageRepository, |
|
66 | - FileProviderInterface $fileProvider) { |
|
43 | + private EventDispatcherInterface $eventDispatcher; |
|
44 | + private FormFactoryInterface $formFactory; |
|
45 | + private MessageBusInterface $messageBus;//swp_multi_tenancy.tenant_context |
|
46 | + private DataTransformerInterface $dataTransformer; // swp_bridge.transformer.json_to_package |
|
47 | + private MediaManagerInterface $mediaManager; // swp_content_bundle.manager.media |
|
48 | + private EntityManagerInterface $entityManager; // swp.object_manager.media |
|
49 | + private PackageRepository $packageRepository;//swp.repository.package |
|
50 | + private FileProviderInterface $fileProvider; |
|
51 | + |
|
52 | + /** |
|
53 | + * @param EventDispatcherInterface $eventDispatcher |
|
54 | + * @param FormFactoryInterface $formFactory |
|
55 | + * @param MessageBusInterface $messageBus |
|
56 | + * @param DataTransformerInterface $dataTransformer |
|
57 | + * @param MediaManagerInterface $mediaManager |
|
58 | + * @param EntityManagerInterface $entityManager |
|
59 | + * @param PackageRepositoryInterface $packageRepository |
|
60 | + * @param FileProviderInterface $fileProvider |
|
61 | + */ |
|
62 | + public function __construct(EventDispatcherInterface $eventDispatcher, FormFactoryInterface $formFactory, |
|
63 | + MessageBusInterface $messageBus, |
|
64 | + DataTransformerInterface $dataTransformer, MediaManagerInterface $mediaManager, |
|
65 | + EntityManagerInterface $entityManager, PackageRepository $packageRepository, |
|
66 | + FileProviderInterface $fileProvider) { |
|
67 | 67 | $this->eventDispatcher = $eventDispatcher; |
68 | 68 | $this->formFactory = $formFactory; |
69 | 69 | $this->messageBus = $messageBus; |
@@ -72,13 +72,13 @@ discard block |
||
72 | 72 | $this->entityManager = $entityManager; |
73 | 73 | $this->packageRepository = $packageRepository; |
74 | 74 | $this->fileProvider = $fileProvider; |
75 | - } |
|
75 | + } |
|
76 | 76 | |
77 | 77 | |
78 | - /** |
|
79 | - * @Route("/api/{version}/content/push", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_push") |
|
80 | - */ |
|
81 | - public function pushContentAction(Request $request, TenantContextInterface $tenantContext): SingleResourceResponseInterface { |
|
78 | + /** |
|
79 | + * @Route("/api/{version}/content/push", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_push") |
|
80 | + */ |
|
81 | + public function pushContentAction(Request $request, TenantContextInterface $tenantContext): SingleResourceResponseInterface { |
|
82 | 82 | $package = $this->dataTransformer->transform($request->getContent()); |
83 | 83 | $this->eventDispatcher->dispatch(new GenericEvent($package), Events::SWP_VALIDATION); |
84 | 84 | |
@@ -87,27 +87,27 @@ discard block |
||
87 | 87 | $this->messageBus->dispatch(new ContentPushMessage($currentTenant->getId(), $request->getContent())); |
88 | 88 | |
89 | 89 | return new SingleResourceResponse(['status' => 'OK'], new ResponseContext(201)); |
90 | - } |
|
90 | + } |
|
91 | 91 | |
92 | - /** |
|
93 | - * @Route("/api/{version}/assets/push", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_assets_push") |
|
94 | - */ |
|
95 | - public function pushAssetsAction(Request $request): SingleResourceResponseInterface { |
|
92 | + /** |
|
93 | + * @Route("/api/{version}/assets/push", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_assets_push") |
|
94 | + */ |
|
95 | + public function pushAssetsAction(Request $request): SingleResourceResponseInterface { |
|
96 | 96 | $form = $this->formFactory->createNamed('', MediaFileType::class); |
97 | 97 | $form->handleRequest($request); |
98 | 98 | |
99 | 99 | if ($form->isSubmitted() && $form->isValid()) { |
100 | - $mediaManager = $this->mediaManager; |
|
101 | - $uploadedFile = $form->getData()['media']; |
|
102 | - $mediaId = $request->request->get('mediaId'); |
|
100 | + $mediaManager = $this->mediaManager; |
|
101 | + $uploadedFile = $form->getData()['media']; |
|
102 | + $mediaId = $request->request->get('mediaId'); |
|
103 | 103 | |
104 | - if ($uploadedFile->isValid()) { |
|
104 | + if ($uploadedFile->isValid()) { |
|
105 | 105 | $fileProvider = $this->fileProvider; |
106 | 106 | $file = $fileProvider->getFile(ArticleMedia::handleMediaId($mediaId), $uploadedFile->guessExtension()); |
107 | 107 | |
108 | 108 | if (null === $file) { |
109 | - $file = $mediaManager->handleUploadedFile($uploadedFile, $mediaId); |
|
110 | - $this->entityManager->flush(); |
|
109 | + $file = $mediaManager->handleUploadedFile($uploadedFile, $mediaId); |
|
110 | + $this->entityManager->flush(); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | return new SingleResourceResponse( |
@@ -120,23 +120,23 @@ discard block |
||
120 | 120 | ], |
121 | 121 | new ResponseContext(201) |
122 | 122 | ); |
123 | - } |
|
123 | + } |
|
124 | 124 | |
125 | - throw new \Exception('Uploaded file is not valid:' . $uploadedFile->getErrorMessage()); |
|
125 | + throw new \Exception('Uploaded file is not valid:' . $uploadedFile->getErrorMessage()); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | return new SingleResourceResponse($form); |
129 | - } |
|
129 | + } |
|
130 | 130 | |
131 | - /** |
|
132 | - * @Route("/api/{version}/assets/{action}/{mediaId}.{extension}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, requirements={"mediaId"=".+", "action"="get|push"}, name="swp_api_assets_get") |
|
133 | - */ |
|
134 | - public function getAssetsAction(string $mediaId, string $extension): SingleResourceResponseInterface { |
|
131 | + /** |
|
132 | + * @Route("/api/{version}/assets/{action}/{mediaId}.{extension}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, requirements={"mediaId"=".+", "action"="get|push"}, name="swp_api_assets_get") |
|
133 | + */ |
|
134 | + public function getAssetsAction(string $mediaId, string $extension): SingleResourceResponseInterface { |
|
135 | 135 | $fileProvider = $this->fileProvider; |
136 | 136 | $file = $fileProvider->getFile(ArticleMedia::handleMediaId($mediaId), $extension); |
137 | 137 | |
138 | 138 | if (null === $file) { |
139 | - throw new NotFoundHttpException('Media don\'t exist in storage'); |
|
139 | + throw new NotFoundHttpException('Media don\'t exist in storage'); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | $mediaManager = $this->mediaManager; |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | 'mime_type' => Mime::getMimeFromExtension($file->getFileExtension()), |
149 | 149 | 'filemeta' => [], |
150 | 150 | ]); |
151 | - } |
|
151 | + } |
|
152 | 152 | |
153 | - protected function getPackageRepository() { |
|
153 | + protected function getPackageRepository() { |
|
154 | 154 | return $this->packageRepository; |
155 | - } |
|
155 | + } |
|
156 | 156 | } |
@@ -42,11 +42,11 @@ discard block |
||
42 | 42 | class ContentPushController extends AbstractController { |
43 | 43 | private EventDispatcherInterface $eventDispatcher; |
44 | 44 | private FormFactoryInterface $formFactory; |
45 | - private MessageBusInterface $messageBus;//swp_multi_tenancy.tenant_context |
|
45 | + private MessageBusInterface $messageBus; //swp_multi_tenancy.tenant_context |
|
46 | 46 | private DataTransformerInterface $dataTransformer; // swp_bridge.transformer.json_to_package |
47 | 47 | private MediaManagerInterface $mediaManager; // swp_content_bundle.manager.media |
48 | 48 | private EntityManagerInterface $entityManager; // swp.object_manager.media |
49 | - private PackageRepository $packageRepository;//swp.repository.package |
|
49 | + private PackageRepository $packageRepository; //swp.repository.package |
|
50 | 50 | private FileProviderInterface $fileProvider; |
51 | 51 | |
52 | 52 | /** |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | ); |
123 | 123 | } |
124 | 124 | |
125 | - throw new \Exception('Uploaded file is not valid:' . $uploadedFile->getErrorMessage()); |
|
125 | + throw new \Exception('Uploaded file is not valid:'.$uploadedFile->getErrorMessage()); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | return new SingleResourceResponse($form); |
@@ -131,14 +131,14 @@ discard block |
||
131 | 131 | $finder->in($configsPath)->files()->name('*.{yaml,yml}'); |
132 | 132 | $files = []; |
133 | 133 | foreach ($finder as $file) { |
134 | - $files[] = $file->getRealPath(); |
|
134 | + $files[] = $file->getRealPath(); |
|
135 | 135 | } |
136 | 136 | return $files; |
137 | 137 | }); |
138 | 138 | |
139 | - foreach ($files as $file) { |
|
139 | + foreach ($files as $file) { |
|
140 | 140 | $this->addNewConfig($file); |
141 | - } |
|
141 | + } |
|
142 | 142 | } |
143 | 143 | } |
144 | 144 | |
@@ -190,11 +190,11 @@ discard block |
||
190 | 190 | { |
191 | 191 | $cacheKey = md5($filePath); |
192 | 192 | $configuration = $this->metadataCache->get($cacheKey, function () use ($filePath) { |
193 | - if (!is_readable($filePath)) { |
|
194 | - throw new \InvalidArgumentException('Configuration file is not readable for parser'); |
|
195 | - } |
|
196 | - $parser = new Parser(); |
|
197 | - return $parser->parse(file_get_contents($filePath)); |
|
193 | + if (!is_readable($filePath)) { |
|
194 | + throw new \InvalidArgumentException('Configuration file is not readable for parser'); |
|
195 | + } |
|
196 | + $parser = new Parser(); |
|
197 | + return $parser->parse(file_get_contents($filePath)); |
|
198 | 198 | }); |
199 | 199 | $this->addAvailableConfig($configuration); |
200 | 200 | $this->supportedCache = []; |
@@ -222,15 +222,15 @@ discard block |
||
222 | 222 | { |
223 | 223 | $configuration = $meta->getConfiguration(); |
224 | 224 | if(array_key_exists("name" ,$configuration)) { |
225 | - $name = $configuration['name']; |
|
226 | - if (!array_key_exists($name, $this->registeredMeta)) { |
|
225 | + $name = $configuration['name']; |
|
226 | + if (!array_key_exists($name, $this->registeredMeta)) { |
|
227 | 227 | $this->registeredMeta[$name] = $configuration; |
228 | 228 | if (null !== $meta) { |
229 | - $this[$name] = $meta; |
|
229 | + $this[$name] = $meta; |
|
230 | 230 | } |
231 | 231 | |
232 | 232 | return true; |
233 | - } |
|
233 | + } |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | return false; |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | public function loadConfigsFromPath($configsPath) |
127 | 127 | { |
128 | 128 | if (file_exists($configsPath)) { |
129 | - $files = $this->metadataCache->get('metadata_config_files', function () use ($configsPath) { |
|
129 | + $files = $this->metadataCache->get('metadata_config_files', function() use ($configsPath) { |
|
130 | 130 | $finder = new Finder(); |
131 | 131 | $finder->in($configsPath)->files()->name('*.{yaml,yml}'); |
132 | 132 | $files = []; |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | public function addNewConfig(string $filePath) |
190 | 190 | { |
191 | 191 | $cacheKey = md5($filePath); |
192 | - $configuration = $this->metadataCache->get($cacheKey, function () use ($filePath) { |
|
192 | + $configuration = $this->metadataCache->get($cacheKey, function() use ($filePath) { |
|
193 | 193 | if (!is_readable($filePath)) { |
194 | 194 | throw new \InvalidArgumentException('Configuration file is not readable for parser'); |
195 | 195 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | public function registerMeta(Meta $meta = null) |
222 | 222 | { |
223 | 223 | $configuration = $meta->getConfiguration(); |
224 | - if(array_key_exists("name" ,$configuration)) { |
|
224 | + if (array_key_exists("name", $configuration)) { |
|
225 | 225 | $name = $configuration['name']; |
226 | 226 | if (!array_key_exists($name, $this->registeredMeta)) { |
227 | 227 | $this->registeredMeta[$name] = $configuration; |