superdesk / web-publisher

src/SWP/Bundle/ContentBundle/Controller/RelatedArticleController.php

Indentation +17 added lines, -17 removed lines

@@ -28,25 +28,25 @@ 
 use Symfony\Component\HttpFoundation\Request;
 
 class RelatedArticleController extends AbstractController {
-  private RelatedArticleRepositoryInterface $relatedArticleRepository;
-  private ArticleProviderInterface $articleProvider;
-  private EventDispatcherInterface $eventDispatcher;
+    private RelatedArticleRepositoryInterface $relatedArticleRepository;
+    private ArticleProviderInterface $articleProvider;
+    private EventDispatcherInterface $eventDispatcher;
 
-  /**
-   * @param RelatedArticleRepositoryInterface $relatedArticleRepository
-   * @param ArticleProviderInterface $articleProvider
-   * @param EventDispatcherInterface $eventDispatcher
-   */
-  public function __construct(RelatedArticleRepositoryInterface $relatedArticleRepository,
-                              ArticleProviderInterface          $articleProvider,
-                              EventDispatcherInterface          $eventDispatcher) {
+    /**
+     * @param RelatedArticleRepositoryInterface $relatedArticleRepository
+     * @param ArticleProviderInterface $articleProvider
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(RelatedArticleRepositoryInterface $relatedArticleRepository,
+                                ArticleProviderInterface          $articleProvider,
+                                EventDispatcherInterface          $eventDispatcher) {
     $this->relatedArticleRepository = $relatedArticleRepository;
     $this->articleProvider = $articleProvider;
     $this->eventDispatcher = $eventDispatcher;
-  }
+    }
 
 
-  public function listAction(Request $request, string $id) {
+    public function listAction(Request $request, string $id) {
     $article = $this->findOr404($id);
 
     $repository = $this->relatedArticleRepository;
@@ -61,15 +61,15 @@ 
     );
 
     return new ResourcesListResponse($items);
-  }
+    }
 
-  private function findOr404(string $id): ArticleInterface {
+    private function findOr404(string $id): ArticleInterface {
     $article = $this->articleProvider->getOneById($id);
 
     if (null === $article) {
-      throw new NotFoundHttpException(sprintf('Article "%s" was not found.', $id));
+        throw new NotFoundHttpException(sprintf('Article "%s" was not found.', $id));
     }
 
     return $article;
-  }
+    }
 }

src/SWP/Bundle/ContentBundle/Controller/ArticleController.php

Indentation +57 added lines, -57 removed lines

@@ -36,27 +36,27 @@ 
 
 class ArticleController extends AbstractController {
 
-  private FormFactoryInterface $formFactory;
-  private RouteProviderInterface $routeProvider; // swp.provider.route
-  private ArticleRepositoryInterface $articleRepository; //swp.repository.article
-  private ArticleProviderInterface $articleProvider; //swp.provider.article
-  private EventDispatcherInterface  $eventDispatcher;
-  private EntityManagerInterface $entityManager; // swp.object_manager.article
-  private ArticleServiceInterface $articleService; // swp.service.article
-
-  /**
-   * @param FormFactoryInterface $formFactory
-   * @param RouteProviderInterface $routeProvider
-   * @param ArticleRepositoryInterface $articleRepository
-   * @param ArticleProviderInterface $articleProvider
-   * @param EventDispatcherInterface $eventDispatcher
-   * @param EntityManagerInterface $entityManager
-   * @param ArticleServiceInterface $articleService
-   */
-  public function __construct(FormFactoryInterface       $formFactory, RouteProviderInterface $routeProvider,
-                              ArticleRepositoryInterface $articleRepository, ArticleProviderInterface $articleProvider,
-                              EventDispatcherInterface   $eventDispatcher, EntityManagerInterface $entityManager,
-                              ArticleServiceInterface    $articleService) {
+    private FormFactoryInterface $formFactory;
+    private RouteProviderInterface $routeProvider; // swp.provider.route
+    private ArticleRepositoryInterface $articleRepository; //swp.repository.article
+    private ArticleProviderInterface $articleProvider; //swp.provider.article
+    private EventDispatcherInterface  $eventDispatcher;
+    private EntityManagerInterface $entityManager; // swp.object_manager.article
+    private ArticleServiceInterface $articleService; // swp.service.article
+
+    /**
+     * @param FormFactoryInterface $formFactory
+     * @param RouteProviderInterface $routeProvider
+     * @param ArticleRepositoryInterface $articleRepository
+     * @param ArticleProviderInterface $articleProvider
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param EntityManagerInterface $entityManager
+     * @param ArticleServiceInterface $articleService
+     */
+    public function __construct(FormFactoryInterface       $formFactory, RouteProviderInterface $routeProvider,
+                                ArticleRepositoryInterface $articleRepository, ArticleProviderInterface $articleProvider,
+                                EventDispatcherInterface   $eventDispatcher, EntityManagerInterface $entityManager,
+                                ArticleServiceInterface    $articleService) {
     $this->formFactory = $formFactory;
     $this->routeProvider = $routeProvider;
     $this->articleRepository = $articleRepository;
@@ -64,30 +64,30 @@ 
     $this->eventDispatcher = $eventDispatcher;
     $this->entityManager = $entityManager;
     $this->articleService = $articleService;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/content/articles/", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_list_articles")
-   *
-   * @throws \Exception
-   */
-  public function listAction(Request $request): ResourcesListResponseInterface {
+    /**
+     * @Route("/api/{version}/content/articles/", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_list_articles")
+     *
+     * @throws \Exception
+     */
+    public function listAction(Request $request): ResourcesListResponseInterface {
     $authors = '';
     if (null !== $request->query->get('author', null)) {
-      $authors = explode(', ', $request->query->get('author'));
+        $authors = explode(', ', $request->query->get('author'));
     }
 
     if ($request->query->get('route', false) && $request->query->get('includeSubRoutes', false)) {
-      $routeObject = $this->routeProvider->getOneById($request->query->get('route'));
+        $routeObject = $this->routeProvider->getOneById($request->query->get('route'));
 
-      if (null !== $routeObject) {
+        if (null !== $routeObject) {
         $ids = [$routeObject->getId()];
         foreach ($routeObject->getChildren() as $child) {
-          $ids[] = $child->getId();
+            $ids[] = $child->getId();
         }
         $request->query->set('route', $ids);
-      }
+        }
     }
 
     $articles = $this->articleRepository
@@ -102,25 +102,25 @@ 
         ]), $request->query->all('sorting'), new PaginationData($request));
 
     return new ResourcesListResponse($articles);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/articles/{id}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_show_articles", requirements={"id"=".+"})
-   */
-  public function getAction($id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/articles/{id}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_show_articles", requirements={"id"=".+"})
+     */
+    public function getAction($id): SingleResourceResponseInterface {
     $article = $this->articleProvider->getOneById($id);
 
     if (null === $article) {
-      throw new NotFoundHttpException('Article was not found.');
+        throw new NotFoundHttpException('Article was not found.');
     }
 
     return new SingleResourceResponse($article);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/articles/{id}", methods={"PATCH"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_update_articles", requirements={"id"=".+"})
-   */
-  public function updateAction(Request $request, $id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/articles/{id}", methods={"PATCH"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_update_articles", requirements={"id"=".+"})
+     */
+    public function updateAction(Request $request, $id): SingleResourceResponseInterface {
     $objectManager = $this->entityManager;
     $article = $this->findOr404($id);
     $originalArticleStatus = $article->getStatus();
@@ -129,32 +129,32 @@ 
 
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $this->articleService->reactOnStatusChange($originalArticleStatus, $article);
-      $objectManager->flush();
-      $objectManager->refresh($article);
+        $this->articleService->reactOnStatusChange($originalArticleStatus, $article);
+        $objectManager->flush();
+        $objectManager->refresh($article);
 
-      return new SingleResourceResponse($article);
+        return new SingleResourceResponse($article);
     }
 
     return new SingleResourceResponse($form, new ResponseContext(500));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/articles/{id}", methods={"DELETE"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_delete_articles", requirements={"id"=".+"})
-   */
-  public function deleteAction($id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/articles/{id}", methods={"DELETE"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_delete_articles", requirements={"id"=".+"})
+     */
+    public function deleteAction($id): SingleResourceResponseInterface {
     $objectManager = $this->entityManager;
     $objectManager->remove($this->findOr404($id));
     $objectManager->flush();
 
     return new SingleResourceResponse(null, new ResponseContext(204));
-  }
+    }
 
-  private function findOr404($id) {
+    private function findOr404($id) {
     if (null === $article = $this->articleProvider->getOneById($id)) {
-      throw new NotFoundHttpException('Article was not found.');
+        throw new NotFoundHttpException('Article was not found.');
     }
 
     return $article;
-  }
+    }
 }

src/SWP/Bundle/WebhookBundle/Controller/AbstractAPIController.php

Indentation +28 added lines, -28 removed lines

@@ -32,59 +32,59 @@
 use Symfony\Component\HttpFoundation\Request;
 
 abstract class AbstractAPIController extends Controller {
-  public function listWebhooks(EventDispatcherInterface $eventDispatcher, RepositoryInterface $repository,
-                               Request         $request): ResourcesListResponse {
+    public function listWebhooks(EventDispatcherInterface $eventDispatcher, RepositoryInterface $repository,
+                                Request         $request): ResourcesListResponse {
     $webhooks = $repository->getPaginatedByCriteria($eventDispatcher, new Criteria(), $request->query->all('sorting',), new PaginationData($request));
 
     return new ResourcesListResponse($webhooks);
-  }
+    }
 
-  public function getSingleWebhook(WebhookInterface $webhook): SingleResourceResponse {
+    public function getSingleWebhook(WebhookInterface $webhook): SingleResourceResponse {
     return new SingleResourceResponse($webhook);
-  }
-
-  public function createWebhook(
-      RepositoryInterface  $ruleRepository,
-      FactoryInterface     $ruleFactory,
-      Request              $request,
-      FormFactoryInterface $formFactory
-  ): SingleResourceResponse {
+    }
+
+    public function createWebhook(
+        RepositoryInterface  $ruleRepository,
+        FactoryInterface     $ruleFactory,
+        Request              $request,
+        FormFactoryInterface $formFactory
+    ): SingleResourceResponse {
     $webhook = $ruleFactory->create();
     $form = $formFactory->createNamed('', WebhookType::class, $webhook);
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $ruleRepository->add($webhook);
+        $ruleRepository->add($webhook);
 
-      return new SingleResourceResponse($webhook, new ResponseContext(201));
+        return new SingleResourceResponse($webhook, new ResponseContext(201));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  public function deleteWebhook(RepositoryInterface $webhookRepository,
+    public function deleteWebhook(RepositoryInterface $webhookRepository,
                                 WebhookInterface    $webhook): SingleResourceResponse {
     $webhookRepository->remove($webhook);
 
     return new SingleResourceResponse(null, new ResponseContext(204));
-  }
-
-  public function updateWebhook(
-      ObjectManager        $objectManager,
-      Request              $request,
-      WebhookInterface     $webhook,
-      FormFactoryInterface $formFactory
-  ): SingleResourceResponse {
+    }
+
+    public function updateWebhook(
+        ObjectManager        $objectManager,
+        Request              $request,
+        WebhookInterface     $webhook,
+        FormFactoryInterface $formFactory
+    ): SingleResourceResponse {
     $form = $formFactory->createNamed('', WebhookType::class, $webhook, ['method' => $request->getMethod()]);
 
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $objectManager->flush();
-      $objectManager->refresh($webhook);
+        $objectManager->flush();
+        $objectManager->refresh($webhook);
 
-      return new SingleResourceResponse($webhook);
+        return new SingleResourceResponse($webhook);
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 }

src/SWP/Bundle/MenuBundle/Doctrine/ORM/MenuItemRepository.php

Spacing +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function findChildrenAsTree(EventDispatcherInterface $eventDispatcher,MenuItemInterface $menuItem)
+    public function findChildrenAsTree(EventDispatcherInterface $eventDispatcher, MenuItemInterface $menuItem)
     {
         $queryBuilder = $this->createQueryBuilder('m');
         $queryBuilder
@@ -114,7 +114,7 @@ 
             ->orderBy('m.lft', 'asc')
         ;
 
-        return $this->getPaginator($eventDispatcher,$queryBuilder, new PaginationData());
+        return $this->getPaginator($eventDispatcher, $queryBuilder, new PaginationData());
     }
 
     /**

src/SWP/Bundle/ContentListBundle/Loader/ContentListsItemLoader.php

Indentation +60 added lines, -60 removed lines

@@ -32,122 +32,122 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class ContentListsItemLoader extends PaginatedLoader implements LoaderInterface {
-  protected ContentListRepositoryInterface $contentListRepository;
-  protected ContentListItemRepositoryInterface $contentListItemsRepository;
-  protected MetaFactoryInterface $metaFactory;
-  private CacheBlockTagsCollectorInterface $cacheBlocksTagsCollector;
-  private EventDispatcherInterface $eventDispatcher;
-
-  public function __construct(
-      ContentListRepositoryInterface     $contentListRepository,
-      ContentListItemRepositoryInterface $contentListItemRepository,
-      MetaFactoryInterface               $metaFactory,
-      CacheBlockTagsCollectorInterface   $cacheBlocksTagsCollector,
-      EventDispatcherInterface           $eventDispatcher
-  ) {
+    protected ContentListRepositoryInterface $contentListRepository;
+    protected ContentListItemRepositoryInterface $contentListItemsRepository;
+    protected MetaFactoryInterface $metaFactory;
+    private CacheBlockTagsCollectorInterface $cacheBlocksTagsCollector;
+    private EventDispatcherInterface $eventDispatcher;
+
+    public function __construct(
+        ContentListRepositoryInterface     $contentListRepository,
+        ContentListItemRepositoryInterface $contentListItemRepository,
+        MetaFactoryInterface               $metaFactory,
+        CacheBlockTagsCollectorInterface   $cacheBlocksTagsCollector,
+        EventDispatcherInterface           $eventDispatcher
+    ) {
     $this->contentListRepository = $contentListRepository;
     $this->contentListItemsRepository = $contentListItemRepository;
     $this->metaFactory = $metaFactory;
     $this->cacheBlocksTagsCollector = $cacheBlocksTagsCollector;
     $this->eventDispatcher = $eventDispatcher;
-  }
+    }
 
-  public function load($type, $parameters = [], $withoutParameters = [], $responseType = LoaderInterface::SINGLE) {
+    public function load($type, $parameters = [], $withoutParameters = [], $responseType = LoaderInterface::SINGLE) {
     $criteria = new Criteria();
     if (LoaderInterface::COLLECTION === $responseType) {
-      if (array_key_exists('contentListId', $parameters) && is_numeric($parameters['contentListId'])) {
+        if (array_key_exists('contentListId', $parameters) && is_numeric($parameters['contentListId'])) {
         $contentList = $this->contentListRepository->findOneBy(['id' => $parameters['contentListId']]);
         $criteria->set('contentList', $contentList);
-      } elseif (array_key_exists('contentListName', $parameters) && is_string($parameters['contentListName'])) {
+        } elseif (array_key_exists('contentListName', $parameters) && is_string($parameters['contentListName'])) {
         $contentList = $this->contentListRepository->findOneBy(['name' => $parameters['contentListName']]);
         $criteria->set('contentList', $contentList);
-      } elseif (
-          array_key_exists('contentList', $parameters) &&
+        } elseif (
+            array_key_exists('contentList', $parameters) &&
           $parameters['contentList'] instanceof Meta &&
           $parameters['contentList']->getValues() instanceof ContentListInterface
-      ) {
+        ) {
         $criteria->set('contentList', $parameters['contentList']->getValues());
-      }
+        }
 
-      if (!$criteria->has('contentList')) {
+        if (!$criteria->has('contentList')) {
         return false;
-      }
+        }
 
-      if (array_key_exists('sticky', $parameters) && is_bool($parameters['sticky'])) {
+        if (array_key_exists('sticky', $parameters) && is_bool($parameters['sticky'])) {
         $criteria->set('sticky', $parameters['sticky']);
-      }
+        }
 
-      if (isset($withoutParameters['content']) && !empty($withoutParameters['content'])) {
+        if (isset($withoutParameters['content']) && !empty($withoutParameters['content'])) {
         $criteria->set('exclude_content', $withoutParameters['content']);
-      }
-
-      $criteria = $this->applyPaginationToCriteria($criteria, $parameters);
-      $contentListItems = $this->contentListItemsRepository->getPaginatedByCriteria($this->eventDispatcher, $criteria, $criteria->get('order', [
-          'sticky' => 'desc',
-      ]));
-      $itemsCollection = new ArrayCollection($contentListItems->getItems());
-      if ($itemsCollection->count() > 0) {
+        }
+
+        $criteria = $this->applyPaginationToCriteria($criteria, $parameters);
+        $contentListItems = $this->contentListItemsRepository->getPaginatedByCriteria($this->eventDispatcher, $criteria, $criteria->get('order', [
+            'sticky' => 'desc',
+        ]));
+        $itemsCollection = new ArrayCollection($contentListItems->getItems());
+        if ($itemsCollection->count() > 0) {
         $metaCollection = new MetaCollection();
         $metaCollection->setTotalItemsCount($contentListItems->getTotalItemCount());
         foreach ($itemsCollection as $item) {
-          $itemMeta = $this->getItemMeta($item);
-          if (null !== $itemMeta) {
+            $itemMeta = $this->getItemMeta($item);
+            if (null !== $itemMeta) {
             $metaCollection->add($itemMeta);
-          }
+            }
         }
         unset($itemsCollection, $criteria);
 
         return $metaCollection;
-      }
+        }
     } elseif (LoaderInterface::SINGLE === $responseType) {
-      if (array_key_exists('contentListName', $parameters) && is_string($parameters['contentListName'])) {
+        if (array_key_exists('contentListName', $parameters) && is_string($parameters['contentListName'])) {
         $contentList = $this->contentListRepository->findOneBy(['name' => $parameters['contentListName']]);
         $criteria->set('contentList', $contentList);
-      } elseif (
-          array_key_exists('contentList', $parameters) &&
+        } elseif (
+            array_key_exists('contentList', $parameters) &&
           $parameters['contentList'] instanceof Meta &&
           $parameters['contentList']->getValues() instanceof ContentListInterface
-      ) {
+        ) {
         $criteria->set('contentList', $parameters['contentList']->getValues());
-      }
+        }
 
-      if (
-          isset($contentList)
+        if (
+            isset($contentList)
           && array_key_exists('article', $parameters)
           && $parameters['article'] instanceof Meta
           && $parameters['article']->getValues() instanceof ArticleInterface
-      ) {
+        ) {
         /** @var ContentListItemInterface $currentContentListItem */
         $currentContentListItem = $this->contentListItemsRepository->getQueryByCriteria(new Criteria([
             'contentList' => $contentList,
             'content' => $parameters['article']->getValues(),
         ]), [], 'n')->getQuery()->getOneOrNullResult();
         $position = $currentContentListItem->getPosition();
-      }
+        }
 
-      if (isset($position) && array_key_exists('prev', $parameters) && true === $parameters['prev']) {
+        if (isset($position) && array_key_exists('prev', $parameters) && true === $parameters['prev']) {
         ++$position;
-      } elseif (isset($position) && array_key_exists('next', $parameters) && true === $parameters['next']) {
+        } elseif (isset($position) && array_key_exists('next', $parameters) && true === $parameters['next']) {
         --$position;
-      } else {
+        } else {
         return null;
-      }
+        }
 
-      return $this->getItemMeta($this->contentListItemsRepository->getOneOrNullByPosition($criteria, $position));
+        return $this->getItemMeta($this->contentListItemsRepository->getOneOrNullByPosition($criteria, $position));
+    }
     }
-  }
 
-  public function isSupported(string $type): bool {
+    public function isSupported(string $type): bool {
     return in_array($type, ['contentListItems', 'contentListItem']);
-  }
+    }
 
-  private function getItemMeta($item) {
+    private function getItemMeta($item) {
     if (null !== $item) {
-      if ($item instanceof ContentListItemInterface) {
+        if ($item instanceof ContentListItemInterface) {
         $this->cacheBlocksTagsCollector->addTagToCurrentCacheBlock('a-' . $item->getContent()->getId());
-      }
+        }
 
-      return $this->metaFactory->create($item);
+        return $this->metaFactory->create($item);
+    }
     }
-  }
 }

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
   private function getItemMeta($item) {
     if (null !== $item) {
       if ($item instanceof ContentListItemInterface) {
-        $this->cacheBlocksTagsCollector->addTagToCurrentCacheBlock('a-' . $item->getContent()->getId());
+        $this->cacheBlocksTagsCollector->addTagToCurrentCacheBlock('a-'.$item->getContent()->getId());
       }
 
       return $this->metaFactory->create($item);

src/SWP/Bundle/UserBundle/Controller/RegistrationController.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
    */
   public function verifyUserEmail(Request            $request, GuardAuthenticatorHandler $guardHandler,
                                   LoginAuthenticator $authenticator): Response {
-    $id = (int)$request->get('id'); // retrieve the user id from the url
+    $id = (int) $request->get('id'); // retrieve the user id from the url
 
     if ($request->isXmlHttpRequest()) {
       return $this->verifyUserEmailFromPWA($id, $request);

Indentation +92 added lines, -92 removed lines

@@ -41,43 +41,43 @@ 
 
 class RegistrationController extends AbstractController {
 
-  private SettingsManagerInterface $settingsManager;
-  private ScopeContextInterface $scopeContext;
-  private EmailVerifier $emailVerifier;
-  private UserManagerInterface $userManager;
-  private EntityManagerInterface $entityManager;
-
-  /**
-   * @param SettingsManagerInterface $settingsManager
-   * @param ScopeContextInterface $scopeContext
-   * @param EmailVerifier $emailVerifier
-   * @param UserManagerInterface $userManager
-   * @param EntityManagerInterface $entityManager
-   */
-  public function __construct(SettingsManagerInterface $settingsManager, ScopeContextInterface $scopeContext,
-                              EmailVerifier            $emailVerifier, UserManagerInterface $userManager,
-                              EntityManagerInterface   $entityManager) {
+    private SettingsManagerInterface $settingsManager;
+    private ScopeContextInterface $scopeContext;
+    private EmailVerifier $emailVerifier;
+    private UserManagerInterface $userManager;
+    private EntityManagerInterface $entityManager;
+
+    /**
+     * @param SettingsManagerInterface $settingsManager
+     * @param ScopeContextInterface $scopeContext
+     * @param EmailVerifier $emailVerifier
+     * @param UserManagerInterface $userManager
+     * @param EntityManagerInterface $entityManager
+     */
+    public function __construct(SettingsManagerInterface $settingsManager, ScopeContextInterface $scopeContext,
+                                EmailVerifier            $emailVerifier, UserManagerInterface $userManager,
+                                EntityManagerInterface   $entityManager) {
     $this->settingsManager = $settingsManager;
     $this->scopeContext = $scopeContext;
     $this->emailVerifier = $emailVerifier;
     $this->userManager = $userManager;
     $this->entityManager = $entityManager;
-  }
-
-
-  /**
-   * @FOSRoute("/api/{version}/users/register/", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_register_user")
-   */
-  public function registerAction(
-      Request                     $request,
-      UserPasswordHasherInterface $passwordEncoder,
-      UserManagerInterface        $userManager,
-      MailerInterface             $mailer
-  ) {
+    }
+
+
+    /**
+     * @FOSRoute("/api/{version}/users/register/", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_register_user")
+     */
+    public function registerAction(
+        Request                     $request,
+        UserPasswordHasherInterface $passwordEncoder,
+        UserManagerInterface        $userManager,
+        MailerInterface             $mailer
+    ) {
     try {
-      $this->ensureThatRegistrationIsEnabled();
+        $this->ensureThatRegistrationIsEnabled();
     } catch (NotFoundHttpException $e) {
-      return new SingleResourceResponse(null, new ResponseContext(404));
+        return new SingleResourceResponse(null, new ResponseContext(404));
     }
 
     $user = $userManager->createUser();
@@ -86,66 +86,66 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $user->addRole('ROLE_USER');
-      // encode the plain password
-      $user->setPassword(
-          $passwordEncoder->hashPassword(
-              $user,
-              $form->get('plainPassword')->getData()
-          )
-      );
-
-      $entityManager = $this->entityManager;
-      $entityManager->persist($user);
-      $entityManager->flush();
-
-      $signatureComponents = $this->emailVerifier->getSignatureComponents('swp_user_verify_email', $user);
-      $url = $signatureComponents->getSignedUrl();
-
-      $mailer->sendConfirmationEmail($user, $url);
-
-      return new JsonResponse([
-          'message' => sprintf(
-              'The user has been created successfully.
+        $user->addRole('ROLE_USER');
+        // encode the plain password
+        $user->setPassword(
+            $passwordEncoder->hashPassword(
+                $user,
+                $form->get('plainPassword')->getData()
+            )
+        );
+
+        $entityManager = $this->entityManager;
+        $entityManager->persist($user);
+        $entityManager->flush();
+
+        $signatureComponents = $this->emailVerifier->getSignatureComponents('swp_user_verify_email', $user);
+        $url = $signatureComponents->getSignedUrl();
+
+        $mailer->sendConfirmationEmail($user, $url);
+
+        return new JsonResponse([
+            'message' => sprintf(
+                'The user has been created successfully.
                  An email has been sent to %s. It contains an activation link you must click to activate your account.',
-              $user->getEmail()
-          ),
-          'url' => $url,
-      ]);
+                $user->getEmail()
+            ),
+            'url' => $url,
+        ]);
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  /**
-   * @Route("/verify/email", name="swp_user_verify_email")
-   */
-  public function verifyUserEmail(Request            $request, GuardAuthenticatorHandler $guardHandler,
-                                  LoginAuthenticator $authenticator): Response {
+    /**
+     * @Route("/verify/email", name="swp_user_verify_email")
+     */
+    public function verifyUserEmail(Request            $request, GuardAuthenticatorHandler $guardHandler,
+                                    LoginAuthenticator $authenticator): Response {
     $id = (int)$request->get('id'); // retrieve the user id from the url
 
     if ($request->isXmlHttpRequest()) {
-      return $this->verifyUserEmailFromPWA($id, $request);
+        return $this->verifyUserEmailFromPWA($id, $request);
     }
 
     // Verify the user id exists and is not null
     if (null === $id) {
-      return $this->redirectToRoute('homepage');
+        return $this->redirectToRoute('homepage');
     }
 
     $user = $this->userManager->find($id);
 
     // Ensure the user exists in persistence
     if (null === $user) {
-      return $this->redirectToRoute('homepage');
+        return $this->redirectToRoute('homepage');
     }
     // validate email confirmation link, sets User::isVerified=true and persists
     try {
-      $this->emailVerifier->handleEmailConfirmation($request, $user);
+        $this->emailVerifier->handleEmailConfirmation($request, $user);
     } catch (VerifyEmailExceptionInterface $exception) {
-      $this->addFlash('verify_email_error', $exception->getReason());
+        $this->addFlash('verify_email_error', $exception->getReason());
 
-      return $this->redirectToRoute('homepage');
+        return $this->redirectToRoute('homepage');
     }
 
     $guardHandler->authenticateUserAndHandleSuccess(
@@ -158,63 +158,63 @@ 
     $this->addFlash('success', 'The user has been created successfully.');
 
     return $this->redirectToRoute('swp_user_registration_confirmed');
-  }
+    }
 
-  /**
-   * Tell the user his account is now confirmed.
-   */
-  public function confirmedAction(Request $request) {
+    /**
+     * Tell the user his account is now confirmed.
+     */
+    public function confirmedAction(Request $request) {
     $user = $this->getUser();
     if (!is_object($user) || !$user instanceof UserInterface) {
-      $this->createAccessDeniedException('This user does not have access to this section.');
+        $this->createAccessDeniedException('This user does not have access to this section.');
     }
 
     return $this->render('@SWPUser/Registration/confirmed.html.twig', [
         'user' => $user,
     ]);
-  }
+    }
 
-  /**
-   * @throws NotFoundHttpException
-   */
-  private function ensureThatRegistrationIsEnabled() {
+    /**
+     * @throws NotFoundHttpException
+     */
+    private function ensureThatRegistrationIsEnabled() {
     $settingName = 'registration_enabled';
     $setting = $this->settingsManager->getOneSettingByName($settingName);
     $registrationEnabled = $this->settingsManager
         ->get($settingName, $setting['scope'], $this->scopeContext->getScopeOwner($setting['scope']));
     if (!$registrationEnabled) {
-      throw new NotFoundHttpException('Registration is disabled.');
+        throw new NotFoundHttpException('Registration is disabled.');
+    }
     }
-  }
 
-  private function verifyUserEmailFromPWA(int $id, Request $request): JsonResponse {
+    private function verifyUserEmailFromPWA(int $id, Request $request): JsonResponse {
     // Verify the user id exists and is not null
     if (null === $id) {
-      return new JsonResponse(
-          ['error' => 'User does not exist']
-      );
+        return new JsonResponse(
+            ['error' => 'User does not exist']
+        );
     }
 
     $user = $this->userManager->find($id);
 
     // Ensure the user exists in persistence
     if (null === $user) {
-      return new JsonResponse(
-          ['error' => 'User does not exist']
-      );
+        return new JsonResponse(
+            ['error' => 'User does not exist']
+        );
     }
 
     // validate email confirmation link, sets User::isVerified=true and persists
     try {
-      $this->emailVerifier->handleEmailConfirmation($request, $user);
+        $this->emailVerifier->handleEmailConfirmation($request, $user);
     } catch (VerifyEmailExceptionInterface $exception) {
-      return new JsonResponse(
-          ['error' => 'Registration confirmation invalid']
-      );
+        return new JsonResponse(
+            ['error' => 'Registration confirmation invalid']
+        );
     }
 
     return new JsonResponse(
         ['message' => 'The user has been created successfully.']
     );
-  }
+    }
 }

src/SWP/Bundle/UserBundle/Controller/ProfileController.php

Indentation +32 added lines, -32 removed lines

@@ -32,44 +32,44 @@ 
 
 class ProfileController extends AbstractController {
 
-  private EntityManagerInterface $entityManager;
-  private AuthorizationCheckerInterface $authorizationChecker;
-  private UserRepository $userRepository;
-
-  /**
-   * @param EntityManagerInterface $entityManager
-   * @param AuthorizationCheckerInterface $authorizationChecker
-   * @param UserRepository $userRepository
-   */
-  public function __construct(EntityManagerInterface        $entityManager,
-                              AuthorizationCheckerInterface $authorizationChecker, UserRepository $userRepository) {
+    private EntityManagerInterface $entityManager;
+    private AuthorizationCheckerInterface $authorizationChecker;
+    private UserRepository $userRepository;
+
+    /**
+     * @param EntityManagerInterface $entityManager
+     * @param AuthorizationCheckerInterface $authorizationChecker
+     * @param UserRepository $userRepository
+     */
+    public function __construct(EntityManagerInterface        $entityManager,
+                                AuthorizationCheckerInterface $authorizationChecker, UserRepository $userRepository) {
     $this->entityManager = $entityManager;
     $this->authorizationChecker = $authorizationChecker;
     $this->userRepository = $userRepository;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/users/profile/{id}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_user_get_user_profile")
-   */
-  public function getAction($id) {
+    /**
+     * @Route("/api/{version}/users/profile/{id}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_user_get_user_profile")
+     */
+    public function getAction($id) {
     $requestedUser = $this->userRepository->find($id);
     if (!is_object($requestedUser) || !$requestedUser instanceof UserInterface) {
-      throw new NotFoundHttpException('Requested user don\'t exists');
+        throw new NotFoundHttpException('Requested user don\'t exists');
     }
 
     $this->checkIfCanAccess($requestedUser);
 
     return new SingleResourceResponse($requestedUser);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/users/profile/{id}", methods={"PATCH"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_user_edit_user_profile")
-   */
-  public function editAction(Request $request, $id, UserPasswordEncoderInterface $passwordEncoder) {
+    /**
+     * @Route("/api/{version}/users/profile/{id}", methods={"PATCH"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_user_edit_user_profile")
+     */
+    public function editAction(Request $request, $id, UserPasswordEncoderInterface $passwordEncoder) {
     $requestedUser = $this->userRepository->find($id);
     if (!is_object($requestedUser) || !$requestedUser instanceof UserInterface) {
-      throw new NotFoundHttpException('Requested user don\'t exists');
+        throw new NotFoundHttpException('Requested user don\'t exists');
     }
 
     $this->checkIfCanAccess($requestedUser);
@@ -80,32 +80,32 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      if (!empty($form->get('plainPassword')->getData())) {
+        if (!empty($form->get('plainPassword')->getData())) {
         $requestedUser->setPassword(
             $passwordEncoder->encodePassword(
                 $requestedUser,
                 $form->get('plainPassword')->getData()
             )
         );
-      }
+        }
 
-      $entityManager = $this->entityManager;
-      $entityManager->flush();
+        $entityManager = $this->entityManager;
+        $entityManager->flush();
 
-      return new SingleResourceResponse($requestedUser);
+        return new SingleResourceResponse($requestedUser);
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  private function checkIfCanAccess($requestedUser) {
+    private function checkIfCanAccess($requestedUser) {
     /** @var UserInterface $currentUser */
     $currentUser = $this->getUser();
     if (
         !$this->authorizationChecker->isGranted('ROLE_ADMIN') &&
         $requestedUser->getId() !== $currentUser->getId()
     ) {
-      throw new AccessDeniedException('This user does not have access to this section. profile');
+        throw new AccessDeniedException('This user does not have access to this section. profile');
+    }
     }
-  }
 }

src/SWP/Bundle/UserBundle/Controller/ResetPasswordController.php

Indentation +70 added lines, -70 removed lines

@@ -36,88 +36,88 @@ 
  * @Route("/reset-password")
  */
 class ResetPasswordController extends AbstractController {
-  use ResetPasswordControllerTrait;
+    use ResetPasswordControllerTrait;
 
-  private ResetPasswordHelperInterface $resetPasswordHelper;
-  private EntityManagerInterface  $entityManager;
+    private ResetPasswordHelperInterface $resetPasswordHelper;
+    private EntityManagerInterface  $entityManager;
 
-  /**
-   * @param ResetPasswordHelperInterface $resetPasswordHelper
-   * @param EntityManagerInterface $entityManager
-   */
-  public function __construct(ResetPasswordHelperInterface $resetPasswordHelper,
-                              EntityManagerInterface       $entityManager) {
+    /**
+     * @param ResetPasswordHelperInterface $resetPasswordHelper
+     * @param EntityManagerInterface $entityManager
+     */
+    public function __construct(ResetPasswordHelperInterface $resetPasswordHelper,
+                                EntityManagerInterface       $entityManager) {
     $this->resetPasswordHelper = $resetPasswordHelper;
     $this->entityManager = $entityManager;
-  }
+    }
 
 
-  /**
-   * Display & process form to request a password reset.
-   *
-   * @Route("", name="swp_user_forgot_password_request")
-   */
-  public function request(Request $request, MailerInterface $mailer): Response {
+    /**
+     * Display & process form to request a password reset.
+     *
+     * @Route("", name="swp_user_forgot_password_request")
+     */
+    public function request(Request $request, MailerInterface $mailer): Response {
     $form = $this->createForm(ResetPasswordRequestFormType::class);
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      return $this->processSendingPasswordResetEmail(
-          $form->get('email')->getData(),
-          $mailer
-      );
+        return $this->processSendingPasswordResetEmail(
+            $form->get('email')->getData(),
+            $mailer
+        );
     }
 
     return $this->render('@SWPUser/reset_password/request.html.twig', [
         'requestForm' => $form->createView(),
     ]);
-  }
-
-  /**
-   * Confirmation page after a user has requested a password reset.
-   *
-   * @Route("/check-email", name="swp_user_check_email")
-   */
-  public function checkEmail(): Response {
+    }
+
+    /**
+     * Confirmation page after a user has requested a password reset.
+     *
+     * @Route("/check-email", name="swp_user_check_email")
+     */
+    public function checkEmail(): Response {
     // We prevent users from directly accessing this page
     if (!$this->canCheckEmail()) {
-      return $this->redirectToRoute('swp_user_forgot_password_request');
+        return $this->redirectToRoute('swp_user_forgot_password_request');
     }
 
     return $this->render('@SWPUser/reset_password/check_email.html.twig', [
         'tokenLifetime' => $this->resetPasswordHelper->getTokenLifetime(),
     ]);
-  }
-
-  /**
-   * Validates and process the reset URL that the user clicked in their email.
-   *
-   * @Route("/reset/{token}", name="swp_user_reset_password")
-   */
-  public function reset(Request $request, UserPasswordHasherInterface $passwordEncoder,
+    }
+
+    /**
+     * Validates and process the reset URL that the user clicked in their email.
+     *
+     * @Route("/reset/{token}", name="swp_user_reset_password")
+     */
+    public function reset(Request $request, UserPasswordHasherInterface $passwordEncoder,
                         string  $token = null): Response {
     if ($token) {
-      // We store the token in session and remove it from the URL, to avoid the URL being
-      // loaded in a browser and potentially leaking the token to 3rd party JavaScript.
-      $this->storeTokenInSession($token);
+        // We store the token in session and remove it from the URL, to avoid the URL being
+        // loaded in a browser and potentially leaking the token to 3rd party JavaScript.
+        $this->storeTokenInSession($token);
 
-      return $this->redirectToRoute('swp_user_reset_password');
+        return $this->redirectToRoute('swp_user_reset_password');
     }
 
     $token = $this->getTokenFromSession();
     if (null === $token) {
-      throw $this->createNotFoundException('No reset password token found in the URL or in the session.');
+        throw $this->createNotFoundException('No reset password token found in the URL or in the session.');
     }
 
     try {
-      $user = $this->resetPasswordHelper->validateTokenAndFetchUser($token);
+        $user = $this->resetPasswordHelper->validateTokenAndFetchUser($token);
     } catch (ResetPasswordExceptionInterface $e) {
-      $this->addFlash('reset_password_error', sprintf(
-          'There was a problem validating your reset request - %s',
-          $e->getReason()
-      ));
+        $this->addFlash('reset_password_error', sprintf(
+            'There was a problem validating your reset request - %s',
+            $e->getReason()
+        ));
 
-      return $this->redirectToRoute('swp_user_forgot_password_request');
+        return $this->redirectToRoute('swp_user_forgot_password_request');
     }
 
     // The token is valid; allow the user to change their password.
@@ -125,30 +125,30 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      // A password reset token should be used only once, remove it.
-      $this->resetPasswordHelper->removeResetRequest($token);
+        // A password reset token should be used only once, remove it.
+        $this->resetPasswordHelper->removeResetRequest($token);
 
-      // Encode the plain password, and set it.
-      $encodedPassword = $passwordEncoder->hashPassword(
-          $user,
-          $form->get('plainPassword')->getData()
-      );
+        // Encode the plain password, and set it.
+        $encodedPassword = $passwordEncoder->hashPassword(
+            $user,
+            $form->get('plainPassword')->getData()
+        );
 
-      $user->setPassword($encodedPassword);
-      $this->entityManager->flush();
+        $user->setPassword($encodedPassword);
+        $this->entityManager->flush();
 
-      // The session is cleaned up after the password has been changed.
-      $this->cleanSessionAfterReset();
+        // The session is cleaned up after the password has been changed.
+        $this->cleanSessionAfterReset();
 
-      return $this->redirectToRoute('homepage');
+        return $this->redirectToRoute('homepage');
     }
 
     return $this->render('@SWPUser/reset_password/reset.html.twig', [
         'resetForm' => $form->createView(),
     ]);
-  }
+    }
 
-  private function processSendingPasswordResetEmail(string $emailFormData, MailerInterface $mailer): RedirectResponse {
+    private function processSendingPasswordResetEmail(string $emailFormData, MailerInterface $mailer): RedirectResponse {
     $user = $this->entityManager->getRepository(User::class)->findOneBy([
         'email' => $emailFormData,
     ]);
@@ -158,22 +158,22 @@ 
 
     // Do not reveal whether a user account was found or not.
     if (!$user) {
-      return $this->redirectToRoute('swp_user_check_email');
+        return $this->redirectToRoute('swp_user_check_email');
     }
 
     try {
-      $resetToken = $this->resetPasswordHelper->generateResetToken($user);
+        $resetToken = $this->resetPasswordHelper->generateResetToken($user);
     } catch (ResetPasswordExceptionInterface $e) {
-      $this->addFlash('reset_password_error', sprintf(
-          'There was a problem handling your password reset request - %s',
-          $e->getReason()
-      ));
+        $this->addFlash('reset_password_error', sprintf(
+            'There was a problem handling your password reset request - %s',
+            $e->getReason()
+        ));
 
-      return $this->redirectToRoute('swp_user_check_email');
+        return $this->redirectToRoute('swp_user_check_email');
     }
 
     $mailer->sendResetPasswordEmail($user, $resetToken);
 
     return $this->redirectToRoute('swp_user_check_email');
-  }
+    }
 }

src/SWP/Bundle/CoreBundle/Theme/Uploader/OrganizationAwareThemeUploader.php

Indentation +48 added lines, -48 removed lines

@@ -24,33 +24,33 @@ 
  * Class OrganizationAwareThemeUploader.
  */
 final class OrganizationAwareThemeUploader implements ThemeUploaderInterface {
-  /**
-   * @var TenantContextInterface
-   */
-  private $tenantContext;
-
-  /**
-   * @var string
-   */
-  private $baseDir;
-
-  /**
-   * OrganizationAwareThemeUploader constructor.
-   *
-   * @param TenantContextInterface $tenantContext
-   * @param string $baseDir
-   */
-  public function __construct(TenantContextInterface $tenantContext, string $baseDir) {
+    /**
+     * @var TenantContextInterface
+     */
+    private $tenantContext;
+
+    /**
+     * @var string
+     */
+    private $baseDir;
+
+    /**
+     * OrganizationAwareThemeUploader constructor.
+     *
+     * @param TenantContextInterface $tenantContext
+     * @param string $baseDir
+     */
+    public function __construct(TenantContextInterface $tenantContext, string $baseDir) {
     $this->tenantContext = $tenantContext;
     $this->baseDir = $baseDir;
-  }
+    }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function upload(UploadedFile $file) {
+    /**
+     * {@inheritdoc}
+     */
+    public function upload(UploadedFile $file) {
     if (null === $this->tenantContext->getTenant()) {
-      throw new \Exception('Tenant was not found in context!');
+        throw new \Exception('Tenant was not found in context!');
     }
 
     $destinationFolder = $this->getAvailableThemesPath();
@@ -59,48 +59,48 @@ 
 
     $zip = new \ZipArchive();
     if (true === $zip->open($filePath)) {
-      if (!$filesystem->exists($destinationFolder)) {
+        if (!$filesystem->exists($destinationFolder)) {
         $filesystem->mkdir($destinationFolder);
-      }
-      $pathInArray = explode('/', $zip->getNameIndex(0));
-      $themeDirInZip = array_shift($pathInArray);
+        }
+        $pathInArray = explode('/', $zip->getNameIndex(0));
+        $themeDirInZip = array_shift($pathInArray);
 
-      $themeConfiguration = $zip->getFromName($themeDirInZip . DIRECTORY_SEPARATOR . 'theme.json');
-      if (false === $themeConfiguration) {
+        $themeConfiguration = $zip->getFromName($themeDirInZip . DIRECTORY_SEPARATOR . 'theme.json');
+        if (false === $themeConfiguration) {
         throw new \Exception('In ZIP file we expect one directory and theme.json file inside');
-      }
+        }
 
-      $themeConfiguration = \json_decode($themeConfiguration, true);
-      if (\JSON_ERROR_NONE !== json_last_error()) {
+        $themeConfiguration = \json_decode($themeConfiguration, true);
+        if (\JSON_ERROR_NONE !== json_last_error()) {
         throw new \Exception('Theme configuration is not valid. Syntax error in theme.json');
-      }
+        }
 
-      $themeName = $themeConfiguration['name'];
-      $unpackedThemePath = $destinationFolder . DIRECTORY_SEPARATOR . $themeDirInZip;
+        $themeName = $themeConfiguration['name'];
+        $unpackedThemePath = $destinationFolder . DIRECTORY_SEPARATOR . $themeDirInZip;
 
-      if ($filesystem->exists($unpackedThemePath)) {
+        if ($filesystem->exists($unpackedThemePath)) {
         $filesystem->remove($unpackedThemePath);
-      }
+        }
 
-      $zip->extractTo($destinationFolder);
-      $zip->close();
+        $zip->extractTo($destinationFolder);
+        $zip->close();
 
-      $finalPath = $destinationFolder . DIRECTORY_SEPARATOR . str_replace('/', '__', $themeName);
-      $filesystem->rename($unpackedThemePath, $finalPath, true);
+        $finalPath = $destinationFolder . DIRECTORY_SEPARATOR . str_replace('/', '__', $themeName);
+        $filesystem->rename($unpackedThemePath, $finalPath, true);
 
-      return $finalPath;
+        return $finalPath;
     }
 
     return false;
-  }
+    }
 
-  /**
-   * @return string
-   */
-  public function getAvailableThemesPath() {
+    /**
+     * @return string
+     */
+    public function getAvailableThemesPath() {
     $tenant = $this->tenantContext->getTenant();
     $organization = $tenant->getOrganization();
     $organizationCode = $organization->getCode();
     return sprintf($this->baseDir . DIRECTORY_SEPARATOR . ThemeUploaderInterface::AVAILABLE_THEMES_PATH, $organizationCode);
-  }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
       $pathInArray = explode('/', $zip->getNameIndex(0));
       $themeDirInZip = array_shift($pathInArray);
 
-      $themeConfiguration = $zip->getFromName($themeDirInZip . DIRECTORY_SEPARATOR . 'theme.json');
+      $themeConfiguration = $zip->getFromName($themeDirInZip.DIRECTORY_SEPARATOR.'theme.json');
       if (false === $themeConfiguration) {
         throw new \Exception('In ZIP file we expect one directory and theme.json file inside');
       }
@@ -76,7 +76,7 @@ 
       }
 
       $themeName = $themeConfiguration['name'];
-      $unpackedThemePath = $destinationFolder . DIRECTORY_SEPARATOR . $themeDirInZip;
+      $unpackedThemePath = $destinationFolder.DIRECTORY_SEPARATOR.$themeDirInZip;
 
       if ($filesystem->exists($unpackedThemePath)) {
         $filesystem->remove($unpackedThemePath);
@@ -85,7 +85,7 @@ 
       $zip->extractTo($destinationFolder);
       $zip->close();
 
-      $finalPath = $destinationFolder . DIRECTORY_SEPARATOR . str_replace('/', '__', $themeName);
+      $finalPath = $destinationFolder.DIRECTORY_SEPARATOR.str_replace('/', '__', $themeName);
       $filesystem->rename($unpackedThemePath, $finalPath, true);
 
       return $finalPath;
@@ -101,6 +101,6 @@ 
     $tenant = $this->tenantContext->getTenant();
     $organization = $tenant->getOrganization();
     $organizationCode = $organization->getCode();
-    return sprintf($this->baseDir . DIRECTORY_SEPARATOR . ThemeUploaderInterface::AVAILABLE_THEMES_PATH, $organizationCode);
+    return sprintf($this->baseDir.DIRECTORY_SEPARATOR.ThemeUploaderInterface::AVAILABLE_THEMES_PATH, $organizationCode);
   }
 }