From de3be2e528984f5417d1dc4e60fe78e771679619 Mon Sep 17 00:00:00 2001 From: Nattfarinn Date: Wed, 7 Mar 2018 08:52:11 +0100 Subject: [PATCH] wip: cs --- src/bundle/Controller/ContentController.php | 5 +---- src/bundle/ParamConverter/ContentTypeParamConverter.php | 5 ++--- .../Dispatcher/ContentOnTheFlyDispatcher.php | 7 ++++++- .../Form/Processor/Content/ContentOnTheFlyProcessor.php | 7 ++++++- src/lib/RepositoryForms/View/ContentCreateOnTheFlyView.php | 7 ++++++- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/bundle/Controller/ContentController.php b/src/bundle/Controller/ContentController.php index 4507283e16..5034c2b728 100644 --- a/src/bundle/Controller/ContentController.php +++ b/src/bundle/Controller/ContentController.php @@ -27,7 +27,6 @@ use EzSystems\EzPlatformAdminUi\RepositoryForms\View\ContentCreateOnTheFlyView; use EzSystems\RepositoryForms\Content\View\ContentCreateView; use EzSystems\RepositoryForms\Data\Mapper\ContentCreateMapper; -use EzSystems\RepositoryForms\Form\ActionDispatcher\ContentDispatcher; use EzSystems\RepositoryForms\Form\Type\Content\ContentEditType; use Symfony\Component\Form\Form; use Symfony\Component\HttpFoundation\JsonResponse; @@ -144,7 +143,6 @@ public function createAction(Request $request): Response /** * @param Request $request - * * @param string $languageCode * @param ContentType $contentType * @param Location $parentLocation @@ -220,8 +218,7 @@ public function hasOnTheFlyCreateAccessAction(Request $request, string $language $response->setData([ 'access' => true, ]); - } - catch (ApiException\UnauthorizedException $exception) { + } catch (ApiException\UnauthorizedException $exception) { $response->setData([ 'access' => false, 'message' => $exception->getMessage(), diff --git a/src/bundle/ParamConverter/ContentTypeParamConverter.php b/src/bundle/ParamConverter/ContentTypeParamConverter.php index 3428fa80d1..6060eeaca2 100644 --- a/src/bundle/ParamConverter/ContentTypeParamConverter.php +++ b/src/bundle/ParamConverter/ContentTypeParamConverter.php @@ -48,14 +48,13 @@ public function apply(Request $request, ParamConverter $configuration) if ($request->get(self::PARAMETER_CONTENT_TYPE_ID)) { $id = (int)$request->get(self::PARAMETER_CONTENT_TYPE_ID); $contentType = $this->contentTypeService->loadContentType($id, $this->siteAccessLanguages); - } - else if ($request->get(self::PARAMETER_CONTENT_TYPE_IDENTIFIER)) { + } elseif ($request->get(self::PARAMETER_CONTENT_TYPE_IDENTIFIER)) { $identifier = $request->get(self::PARAMETER_CONTENT_TYPE_IDENTIFIER); $contentType = $this->contentTypeService->loadContentTypeByIdentifier($identifier, $this->siteAccessLanguages); } if (!$contentType) { - throw new NotFoundHttpException("ContentType " . $id ?? $identifier . " not found!"); + throw new NotFoundHttpException('ContentType ' . $id ?? $identifier . ' not found!'); } $request->attributes->set($configuration->getName(), $contentType); diff --git a/src/lib/RepositoryForms/Dispatcher/ContentOnTheFlyDispatcher.php b/src/lib/RepositoryForms/Dispatcher/ContentOnTheFlyDispatcher.php index b8077999b6..5274d74114 100644 --- a/src/lib/RepositoryForms/Dispatcher/ContentOnTheFlyDispatcher.php +++ b/src/lib/RepositoryForms/Dispatcher/ContentOnTheFlyDispatcher.php @@ -1,4 +1,9 @@