superdesk / web-publisher

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());
     }
 
     /**

Indentation +12 added lines, -12 removed lines

@@ -128,19 +128,19 @@
     }
 
 
-  /**
-   * @param MenuItemInterface $node
-   * @param MenuItemInterface $parent
-   */
-  public function persistAsFirstChildOf(MenuItemInterface $node, MenuItemInterface $parent) {
+    /**
+     * @param MenuItemInterface $node
+     * @param MenuItemInterface $parent
+     */
+    public function persistAsFirstChildOf(MenuItemInterface $node, MenuItemInterface $parent) {
     parent::persistAsFirstChildOf($node, $parent);
-  }
+    }
 
-  /**
-   * @param MenuItemInterface $node
-   * @param MenuItemInterface $sibling
-   */
-  public function persistAsNextSiblingOf(MenuItemInterface $node, MenuItemInterface $sibling) {
+    /**
+     * @param MenuItemInterface $node
+     * @param MenuItemInterface $sibling
+     */
+    public function persistAsNextSiblingOf(MenuItemInterface $node, MenuItemInterface $sibling) {
     parent::persistAsNextSiblingOf($node, $sibling);
-  }
+    }
 }

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

@@ -40,43 +40,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,
-      UserPasswordEncoderInterface $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,
+        UserPasswordEncoderInterface $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();
@@ -85,66 +85,66 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $user->addRole('ROLE_USER');
-      // encode the plain password
-      $user->setPassword(
-          $passwordEncoder->encodePassword(
-              $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->encodePassword(
+                $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(
@@ -157,63 +157,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/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);
   }
 }

src/SWP/Bundle/CoreBundle/Context/CachedTenantContext.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     $this->dispatcher->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_ENABLE);
 
     $this->resolvedTenants[self::getCacheKey(
-        $tenant->getSubdomain() ? $tenant->getSubdomain() . '.' . $tenant->getDomainName() : $tenant->getDomainName()
+        $tenant->getSubdomain() ? $tenant->getSubdomain().'.'.$tenant->getDomainName() : $tenant->getDomainName()
     )] = $tenant;
   }
 
@@ -60,6 +60,6 @@ 
   }
 
   private static function getCacheKey(string $host): string {
-    return md5('tenant_cache__' . $host);
+    return md5('tenant_cache__'.$host);
   }
 }

Indentation +13 added lines, -13 removed lines

@@ -24,43 +24,43 @@
 use SWP\Component\MultiTenancy\Model\TenantInterface;
 
 class CachedTenantContext extends TenantContext implements CachedTenantContextInterface {
-  private $resolvedTenants = [];
+    private $resolvedTenants = [];
 
-  public function getTenant(): ?TenantInterface {
+    public function getTenant(): ?TenantInterface {
     $currentRequest = $this->requestStack->getCurrentRequest();
     if ($currentRequest && $this->requestStack->getCurrentRequest()->attributes->get('exception') instanceof TenantNotFoundException) {
-      return null;
+        return null;
     }
 
     if ($currentRequest === null) {
-      return $this->tenant;
+        return $this->tenant;
     }
 
     $cacheKey = self::getCacheKey($currentRequest->getHost());
     if (!array_key_exists($cacheKey, $this->resolvedTenants) || $this->resolvedTenants[$cacheKey] instanceof TenantInterface) {
-      $this->resolvedTenants[$cacheKey] = parent::getTenant();
+        $this->resolvedTenants[$cacheKey] = parent::getTenant();
     } else {
-      $this->tenant = $this->resolvedTenants[$cacheKey];
+        $this->tenant = $this->resolvedTenants[$cacheKey];
     }
 
     return $this->tenant;
-  }
+    }
 
-  public function setTenant(TenantInterface $tenant): void {
+    public function setTenant(TenantInterface $tenant): void {
     parent::setTenant($tenant);
     $this->dispatcher->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_ENABLE);
 
     $this->resolvedTenants[self::getCacheKey(
         $tenant->getSubdomain() ? $tenant->getSubdomain() . '.' . $tenant->getDomainName() : $tenant->getDomainName()
     )] = $tenant;
-  }
+    }
 
-  public function reset(): void {
+    public function reset(): void {
     $this->tenant = null;
     $this->resolvedTenants = [];
-  }
+    }
 
-  private static function getCacheKey(string $host): string {
+    private static function getCacheKey(string $host): string {
     return md5('tenant_cache__' . $host);
-  }
+    }
 }

src/SWP/Bundle/CoreBundle/Controller/ContentController.php

Indentation +3 added lines, -3 removed lines

@@ -22,10 +22,10 @@
 class ContentController extends AbstractController
 {
 
-  public function __construct() {
-  }
+    public function __construct() {
+    }
 
-  public function renderPageAction(string $contentTemplate): Response
+    public function renderPageAction(string $contentTemplate): Response
     {
         $response = new Response();
         $response->headers->set('Content-Type', 'text/html; charset=UTF-8');

src/SWP/Bundle/ElasticSearchBundle/Controller/Api/AuthorSearchController.php

Indentation +16 added lines, -16 removed lines

@@ -26,27 +26,27 @@ 
 use FOS\RestBundle\Controller\Annotations\Route;
 
 class AuthorSearchController extends AbstractController {
-  private RepositoryManagerInterface $repositoryManager;
-  private PaginatorInterface $paginator;
-  private string $authorClassName;
+    private RepositoryManagerInterface $repositoryManager;
+    private PaginatorInterface $paginator;
+    private string $authorClassName;
 
-  /**
-   * @param RepositoryManagerInterface $repositoryManager
-   * @param PaginatorInterface $paginator
-   * @param string $authorClassName
-   */
-  public function __construct(RepositoryManagerInterface $repositoryManager, PaginatorInterface $paginator,
-                              string                     $authorClassName) {
+    /**
+     * @param RepositoryManagerInterface $repositoryManager
+     * @param PaginatorInterface $paginator
+     * @param string $authorClassName
+     */
+    public function __construct(RepositoryManagerInterface $repositoryManager, PaginatorInterface $paginator,
+                                string                     $authorClassName) {
     $this->repositoryManager = $repositoryManager;
     $this->paginator = $paginator;
     $this->authorClassName = $authorClassName;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/authors/", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_list_authors")
-   */
-  public function searchAction(Request $request): ResourcesListResponse {
+    /**
+     * @Route("/api/{version}/authors/", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_list_authors")
+     */
+    public function searchAction(Request $request): ResourcesListResponse {
     $criteria = Criteria::fromQueryParameters(
         $request->query->get('term', ''),
         [
@@ -87,5 +87,5 @@ 
     );
 
     return new ResourcesListResponse($pagination, $responseContext);
-  }
+    }
 }

src/SWP/Bundle/CoreBundle/Controller/SlideshowController.php

Indentation +26 added lines, -26 removed lines

@@ -29,28 +29,28 @@ 
 use FOS\RestBundle\Controller\Annotations\Route;
 
 class SlideshowController extends Controller {
-  private ArticleRepositoryInterface $articleRepository;
-  private SlideshowRepositoryInterface $slideshowRepository;
-  private EventDispatcherInterface $eventDispatcher;
+    private ArticleRepositoryInterface $articleRepository;
+    private SlideshowRepositoryInterface $slideshowRepository;
+    private EventDispatcherInterface $eventDispatcher;
 
-  /**
-   * @param ArticleRepositoryInterface $articleRepository
-   * @param SlideshowRepositoryInterface $slideshowRepository
-   * @param EventDispatcherInterface $eventDispatcher
-   */
-  public function __construct(ArticleRepositoryInterface   $articleRepository,
-                              SlideshowRepositoryInterface $slideshowRepository,
-                              EventDispatcherInterface     $eventDispatcher) {
+    /**
+     * @param ArticleRepositoryInterface $articleRepository
+     * @param SlideshowRepositoryInterface $slideshowRepository
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(ArticleRepositoryInterface   $articleRepository,
+                                SlideshowRepositoryInterface $slideshowRepository,
+                                EventDispatcherInterface     $eventDispatcher) {
     $this->articleRepository = $articleRepository;
     $this->slideshowRepository = $slideshowRepository;
     $this->eventDispatcher = $eventDispatcher;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/content/slideshows/{articleId}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_slideshows_list")
-   */
-  public function listAction(Request $request, string $articleId): ResourcesListResponseInterface {
+    /**
+     * @Route("/api/{version}/content/slideshows/{articleId}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_slideshows_list")
+     */
+    public function listAction(Request $request, string $articleId): ResourcesListResponseInterface {
     $repository = $this->slideshowRepository;
 
     $article = $this->findArticleOr404($articleId);
@@ -60,29 +60,29 @@ 
     ]), $request->query->all('sorting'), new PaginationData($request));
 
     return new ResourcesListResponse($slideshows);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/slideshows/{articleId}/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_get_slideshow", requirements={"id"="\d+"})
-   */
-  public function getAction($id, string $articleId): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/slideshows/{articleId}/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_get_slideshow", requirements={"id"="\d+"})
+     */
+    public function getAction($id, string $articleId): SingleResourceResponseInterface {
     $article = $this->findArticleOr404($articleId);
 
     if (null === $list = $this->slideshowRepository->findOneBy([
             'id' => $id,
             'article' => $article,
         ])) {
-      throw new NotFoundHttpException(sprintf('Slideshow with id "%s" was not found.', $id));
+        throw new NotFoundHttpException(sprintf('Slideshow with id "%s" was not found.', $id));
     }
 
     return new SingleResourceResponse($list);
-  }
+    }
 
-  private function findArticleOr404($id) {
+    private function findArticleOr404($id) {
     if (null === $article = $this->articleRepository->findOneById($id)) {
-      throw new NotFoundHttpException(sprintf('Article with id "%s" was not found.', $id));
+        throw new NotFoundHttpException(sprintf('Article with id "%s" was not found.', $id));
     }
 
     return $article;
-  }
+    }
 }