superdesk / web-publisher

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

Indentation +24 added lines, -24 removed lines

@@ -28,40 +28,40 @@ 
 
 class DefaultController extends AbstractController {
 
-  private CachedTenantContextInterface $tenantContext;
-  private MetaFactoryInterface $metaFactory;
-  private Context $templateEngineContext;
-  private RouteFactoryInterface $routeFactory;
+    private CachedTenantContextInterface $tenantContext;
+    private MetaFactoryInterface $metaFactory;
+    private Context $templateEngineContext;
+    private RouteFactoryInterface $routeFactory;
 
-  public function __construct(
-      CachedTenantContextInterface $tenantContext,
-      MetaFactoryInterface         $metaFactory,
-      Context                      $templateEngineContext,
-      RouteFactoryInterface        $routeFactory
-  ) {
+    public function __construct(
+        CachedTenantContextInterface $tenantContext,
+        MetaFactoryInterface         $metaFactory,
+        Context                      $templateEngineContext,
+        RouteFactoryInterface        $routeFactory
+    ) {
     $this->tenantContext = $tenantContext;
     $this->metaFactory = $metaFactory;
     $this->templateEngineContext = $templateEngineContext;
     $this->routeFactory = $routeFactory;
-  }
+    }
 
-  /**
-   * @Route("/", methods={"GET","POST"}, name="homepage")
-   */
-  public function indexAction(Request $request): Response {
+    /**
+     * @Route("/", methods={"GET","POST"}, name="homepage")
+     */
+    public function indexAction(Request $request): Response {
     /** @var TenantInterface $currentTenant */
     $currentTenant = $this->tenantContext->getTenant();
     $route = $currentTenant->getHomepage();
 
     if (null === $route) {
-      /** @var RouteInterface $route */
-      $route = $this->routeFactory->create();
-      $route->setStaticPrefix('/');
-      $route->setName('Homepage');
-      $route->setType('content');
-      $route->setTemplateName('index.html.twig');
-      $route->setCacheTimeInSeconds(360);
-      $request->attributes->set(DynamicRouter::ROUTE_KEY, $route);
+        /** @var RouteInterface $route */
+        $route = $this->routeFactory->create();
+        $route->setStaticPrefix('/');
+        $route->setName('Homepage');
+        $route->setType('content');
+        $route->setTemplateName('index.html.twig');
+        $route->setCacheTimeInSeconds(360);
+        $request->attributes->set(DynamicRouter::ROUTE_KEY, $route);
     }
 
     $this->templateEngineContext->setCurrentPage($this->metaFactory->create($route));
@@ -70,5 +70,5 @@ 
     $response->headers->set('Content-Type', 'text/html; charset=UTF-8');
 
     return $this->render('index.html.twig', [], $response);
-  }
+    }
 }

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

Indentation +69 added lines, -69 removed lines

@@ -45,39 +45,39 @@ 
 
 class PackageController extends Controller {
 
-  private FormFactoryInterface $formFactory;
-  private EventDispatcherInterface $eventDispatcher;
-  private CachedTenantContextInterface $cachedTenantContext;
-  private ArticlePublisherInterface $articlePublisher;
-  private PersisterRegistry $elasticaPersisterRegistry;
-  private PackageRepositoryInterface $packageRepository;
-
-  /**
-   * @param FormFactoryInterface $formFactory
-   * @param EventDispatcherInterface $eventDispatcher
-   * @param CachedTenantContextInterface $cachedTenantContext
-   * @param ArticlePublisherInterface $articlePublisher
-   * @param PersisterRegistry $elasticaPersisterRegistry
-   * @param PackageRepositoryInterface $packageRepository
-   */
-  public function __construct(FormFactoryInterface         $formFactory, EventDispatcherInterface $eventDispatcher,
-                              CachedTenantContextInterface $cachedTenantContext,
-                              ArticlePublisherInterface    $articlePublisher,
-                              PersisterRegistry            $elasticaPersisterRegistry,
-                              PackageRepositoryInterface   $packageRepository) {
+    private FormFactoryInterface $formFactory;
+    private EventDispatcherInterface $eventDispatcher;
+    private CachedTenantContextInterface $cachedTenantContext;
+    private ArticlePublisherInterface $articlePublisher;
+    private PersisterRegistry $elasticaPersisterRegistry;
+    private PackageRepositoryInterface $packageRepository;
+
+    /**
+     * @param FormFactoryInterface $formFactory
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param CachedTenantContextInterface $cachedTenantContext
+     * @param ArticlePublisherInterface $articlePublisher
+     * @param PersisterRegistry $elasticaPersisterRegistry
+     * @param PackageRepositoryInterface $packageRepository
+     */
+    public function __construct(FormFactoryInterface         $formFactory, EventDispatcherInterface $eventDispatcher,
+                                CachedTenantContextInterface $cachedTenantContext,
+                                ArticlePublisherInterface    $articlePublisher,
+                                PersisterRegistry            $elasticaPersisterRegistry,
+                                PackageRepositoryInterface   $packageRepository) {
     $this->formFactory = $formFactory;
     $this->eventDispatcher = $eventDispatcher;
     $this->cachedTenantContext = $cachedTenantContext;
     $this->articlePublisher = $articlePublisher;
     $this->elasticaPersisterRegistry = $elasticaPersisterRegistry;
     $this->packageRepository = $packageRepository;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/packages/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_packages")
-   */
-  public function listAction(Request $request) {
+    /**
+     * @Route("/api/{version}/packages/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_packages")
+     */
+    public function listAction(Request $request) {
     $this->eventDispatcher->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_DISABLE);
     $tenantContext = $this->cachedTenantContext;
 
@@ -88,19 +88,19 @@ 
         ]), $request->query->all('sorting'), new PaginationData($request));
 
     return new ResourcesListResponse($packages);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/packages/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_show_package", requirements={"id"="\d+"})
-   */
-  public function getAction(int $id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/packages/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_show_package", requirements={"id"="\d+"})
+     */
+    public function getAction(int $id): SingleResourceResponseInterface {
     return new SingleResourceResponse($this->findOr404($id));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/packages/{id}/publish/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_publish_package", requirements={"id"="\d+"})
-   */
-  public function publishAction(Request $request, int $id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/packages/{id}/publish/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_publish_package", requirements={"id"="\d+"})
+     */
+    public function publishAction(Request $request, int $id): SingleResourceResponseInterface {
     $this->eventDispatcher->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_DISABLE);
     /** @var PackageInterface $package */
     $package = $this->findOr404($id);
@@ -109,74 +109,74 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $this->articlePublisher->publish($package, $form->getData());
-      $this->elasticaPersisterRegistry->getPersister('swp_package')->replaceOne($package);
+        $this->articlePublisher->publish($package, $form->getData());
+        $this->elasticaPersisterRegistry->getPersister('swp_package')->replaceOne($package);
 
-      return new SingleResourceResponse(null, new ResponseContext(201));
+        return new SingleResourceResponse(null, new ResponseContext(201));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/packages/{id}/unpublish/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_unpublish_package", requirements={"id"="\d+"})
-   */
-  public function unpublishAction(Request $request, int $id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/packages/{id}/unpublish/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_unpublish_package", requirements={"id"="\d+"})
+     */
+    public function unpublishAction(Request $request, int $id): SingleResourceResponseInterface {
     $this->eventDispatcher->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_DISABLE);
     $package = $this->findOr404($id);
     $form = $this->formFactory->createNamed('', UnpublishFromTenantsType::class, null, ['method' => $request->getMethod()]);
 
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $formData = $form->getData();
-      /** @var Collection $tenants */
-      $tenants = $formData['tenants'];
-      $this->articlePublisher->unpublish($package, $tenants->toArray());
+        $formData = $form->getData();
+        /** @var Collection $tenants */
+        $tenants = $formData['tenants'];
+        $this->articlePublisher->unpublish($package, $tenants->toArray());
 
-      return new SingleResourceResponse(null, new ResponseContext(200));
+        return new SingleResourceResponse(null, new ResponseContext(200));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
-
-  /**
-   * @Route("/api/{version}/packages/{id}/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_package", requirements={"id"="\d+"})
-   *
-   * @return SingleResourceResponse
-   */
-  public function updateAction(Request $request, int $id) {
+    }
+
+    /**
+     * @Route("/api/{version}/packages/{id}/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_package", requirements={"id"="\d+"})
+     *
+     * @return SingleResourceResponse
+     */
+    public function updateAction(Request $request, int $id) {
     $this->eventDispatcher->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_DISABLE);
     $package = $this->findOr404($id);
     $form = $this->formFactory->createNamed('', PackageType::class, $package, ['method' => $request->getMethod()]);
 
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      if (ContentInterface::STATUS_CANCELED === $package->getPubStatus()) {
+        if (ContentInterface::STATUS_CANCELED === $package->getPubStatus()) {
         $package->setStatus(ContentInterface::STATUS_CANCELED);
-      }
-      $this->getPackageRepository()->flush();
+        }
+        $this->getPackageRepository()->flush();
 
-      return new SingleResourceResponse($package, new ResponseContext(200));
+        return new SingleResourceResponse($package, new ResponseContext(200));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  /**
-   * @return object|null
-   */
-  private function findOr404(int $id) {
+    /**
+     * @return object|null
+     */
+    private function findOr404(int $id) {
     $this->eventDispatcher->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_DISABLE);
     $tenantContext = $this->cachedTenantContext;
 
     if (null === $package = $this->getPackageRepository()->findOneBy(['id' => $id, 'organization' => $tenantContext->getTenant()->getOrganization()])) {
-      throw new NotFoundHttpException('Package was not found.');
+        throw new NotFoundHttpException('Package was not found.');
     }
 
     return $package;
-  }
+    }
 
-  protected function getPackageRepository() {
+    protected function getPackageRepository() {
     return $this->packageRepository;
-  }
+    }
 }

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

Indentation +38 added lines, -38 removed lines

@@ -37,30 +37,30 @@ 
 
 class ArticleCommentsController extends AbstractController {
 
-  private ArticleRepositoryInterface $articleRepository;
-  private ArticleResolverInterface $articleResolver;
-  private FormFactoryInterface $formFactory;
-  private EventDispatcherInterface $eventDispatcher;
-
-  /**
-   * @param ArticleRepositoryInterface $articleRepository
-   * @param ArticleResolverInterface $articleResolver
-   * @param FormFactoryInterface $formFactory
-   * @param EventDispatcherInterface $eventDispatcher
-   */
-  public function __construct(ArticleRepositoryInterface $articleRepository, ArticleResolverInterface $articleResolver,
-                              FormFactoryInterface       $formFactory, EventDispatcherInterface $eventDispatcher) {
+    private ArticleRepositoryInterface $articleRepository;
+    private ArticleResolverInterface $articleResolver;
+    private FormFactoryInterface $formFactory;
+    private EventDispatcherInterface $eventDispatcher;
+
+    /**
+     * @param ArticleRepositoryInterface $articleRepository
+     * @param ArticleResolverInterface $articleResolver
+     * @param FormFactoryInterface $formFactory
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(ArticleRepositoryInterface $articleRepository, ArticleResolverInterface $articleResolver,
+                                FormFactoryInterface       $formFactory, EventDispatcherInterface $eventDispatcher) {
     $this->articleRepository = $articleRepository;
     $this->articleResolver = $articleResolver;
     $this->formFactory = $formFactory;
     $this->eventDispatcher = $eventDispatcher;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/content/articles", methods={"PATCH"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_article_comments")
-   */
-  public function updateAction(Request $request): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/articles", methods={"PATCH"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_article_comments")
+     */
+    public function updateAction(Request $request): SingleResourceResponseInterface {
     $repository = $this->articleRepository;
     $articleResolver = $this->articleResolver;
     $form = $this->formFactory->createNamed('', ArticleCommentsType::class, [], ['method' => $request->getMethod()]);
@@ -68,42 +68,42 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $data = $form->getData();
-      $article = null;
-      if (null !== $data['url']) {
+        $data = $form->getData();
+        $article = null;
+        if (null !== $data['url']) {
         $article = strpos($data['url'], '/r/') ? $repository->findOneBySlug(
             str_replace('/r/', '', $this->getFragmentFromUrl($data['url'], 'path'))
         ) : $articleResolver->resolve($data['url']);
-      } elseif (null !== $data['id']) {
+        } elseif (null !== $data['id']) {
         $article = $repository->findOneBy(['id' => $data['id']]);
-      }
+        }
 
-      if (null === $article) {
+        if (null === $article) {
         throw new NotFoundHttpException('Article was not found');
-      }
+        }
 
-      $article->setCommentsCount((int)$data['commentsCount']);
-      $article->cancelTimestampable();
-      $repository->flush();
+        $article->setCommentsCount((int)$data['commentsCount']);
+        $article->cancelTimestampable();
+        $repository->flush();
 
-      $this->eventDispatcher->dispatch(new ArticleEvent(
-          $article,
-          $article->getPackage(),
-          ArticleEvents::POST_UPDATE
-      ), ArticleEvents::POST_UPDATE);
+        $this->eventDispatcher->dispatch(new ArticleEvent(
+            $article,
+            $article->getPackage(),
+            ArticleEvents::POST_UPDATE
+        ), ArticleEvents::POST_UPDATE);
 
-      return new SingleResourceResponse($article);
+        return new SingleResourceResponse($article);
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  private function getFragmentFromUrl(string $url, string $fragment): ?string {
+    private function getFragmentFromUrl(string $url, string $fragment): ?string {
     $fragments = parse_url($url);
     if (!array_key_exists($fragment, $fragments)) {
-      return null;
+        return null;
     }
 
     return $fragments[$fragment];
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         throw new NotFoundHttpException('Article was not found');
       }
 
-      $article->setCommentsCount((int)$data['commentsCount']);
+      $article->setCommentsCount((int) $data['commentsCount']);
       $article->cancelTimestampable();
       $repository->flush();
 

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

Indentation +32 added lines, -32 removed lines

@@ -34,36 +34,36 @@ 
 
 class FbiaFeedController extends AbstractController {
 
-  private FormFactoryInterface $formFactory;
-  private RepositoryInterface $facebookInstantArticlesFeedRepository;
-  private FactoryInterface $facebookInstantArticlesFeedFactory;
-  private EventDispatcherInterface $eventDispatcher;
+    private FormFactoryInterface $formFactory;
+    private RepositoryInterface $facebookInstantArticlesFeedRepository;
+    private FactoryInterface $facebookInstantArticlesFeedFactory;
+    private EventDispatcherInterface $eventDispatcher;
 
-  /**
-   * @param FormFactoryInterface $formFactory
-   * @param RepositoryInterface $facebookInstantArticlesFeedRepository
-   * @param FactoryInterface $facebookInstantArticlesFeedFactory
-   * @param EventDispatcherInterface $eventDispatcher
-   */
-  public function __construct(FormFactoryInterface     $formFactory,
-                              RepositoryInterface      $facebookInstantArticlesFeedRepository,
-                              FactoryInterface         $facebookInstantArticlesFeedFactory,
-                              EventDispatcherInterface $eventDispatcher) {
+    /**
+     * @param FormFactoryInterface $formFactory
+     * @param RepositoryInterface $facebookInstantArticlesFeedRepository
+     * @param FactoryInterface $facebookInstantArticlesFeedFactory
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(FormFactoryInterface     $formFactory,
+                                RepositoryInterface      $facebookInstantArticlesFeedRepository,
+                                FactoryInterface         $facebookInstantArticlesFeedFactory,
+                                EventDispatcherInterface $eventDispatcher) {
     $this->formFactory = $formFactory;
     $this->facebookInstantArticlesFeedRepository = $facebookInstantArticlesFeedRepository;
     $this->facebookInstantArticlesFeedFactory = $facebookInstantArticlesFeedFactory;
     $this->eventDispatcher = $eventDispatcher;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/facebook/instantarticles/feed/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_list_facebook_instant_articles_feed")
-   */
-  public function listAction(Request $request): ResourcesListResponseInterface {
+    /**
+     * @Route("/api/{version}/facebook/instantarticles/feed/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_list_facebook_instant_articles_feed")
+     */
+    public function listAction(Request $request): ResourcesListResponseInterface {
     $repository = $this->facebookInstantArticlesFeedRepository;
     $sort = $request->query->all('sorting');
     if (empty($sort)) {
-      $sort = ['createdAt' => 'desc'];
+        $sort = ['createdAt' => 'desc'];
     }
 
     $items = $repository->getPaginatedByCriteria(
@@ -74,33 +74,33 @@ 
     );
 
     return new ResourcesListResponse($items);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/facebook/instantarticles/feed/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_create_facebook_instant_articles_feed")
-   */
-  public function createAction(Request $request): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/facebook/instantarticles/feed/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_create_facebook_instant_articles_feed")
+     */
+    public function createAction(Request $request): SingleResourceResponseInterface {
     /* @var FacebookInstantArticlesFeedInterface $feed */
     $feed = $this->facebookInstantArticlesFeedFactory->create();
     $form = $this->formFactory->createNamed('', FacebookInstantArticlesFeedType::class, $feed, ['method' => $request->getMethod()]);
 
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $this->checkIfFeedExists($feed->getContentBucket(), $feed->getFacebookPage());
-      $this->facebookInstantArticlesFeedRepository->add($feed);
+        $this->checkIfFeedExists($feed->getContentBucket(), $feed->getFacebookPage());
+        $this->facebookInstantArticlesFeedRepository->add($feed);
 
-      return new SingleResourceResponse($feed, new ResponseContext(201));
+        return new SingleResourceResponse($feed, new ResponseContext(201));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  private function checkIfFeedExists($contentBucket, $facebookPage) {
+    private function checkIfFeedExists($contentBucket, $facebookPage) {
     if (null !== $this->facebookInstantArticlesFeedRepository->findOneBy([
             'contentBucket' => $contentBucket,
             'facebookPage' => $facebookPage,
         ])) {
-      throw new ConflictHttpException('Feed for that page and content bucket already exists!');
+        throw new ConflictHttpException('Feed for that page and content bucket already exists!');
+    }
     }
-  }
 }

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

Indentation +51 added lines, -51 removed lines

@@ -34,86 +34,86 @@ 
 
 class RuleController extends FOSRestController {
 
-  private FormFactoryInterface $formFactory;
-  private EntityManagerInterface $entityManager;
-  private RuleRepositoryInterface $ruleRepository;
-  private FactoryInterface $ruleFactory;
-  private EventDispatcherInterface $eventDispatcher;
-
-  /**
-   * @param FormFactoryInterface $formFactory
-   * @param EntityManagerInterface $entityManager
-   * @param RuleRepositoryInterface $ruleRepository
-   * @param FactoryInterface $ruleFactory
-   * @param EventDispatcherInterface $eventDispatcher
-   */
-  public function __construct(FormFactoryInterface    $formFactory, EntityManagerInterface $entityManager,
-                              RuleRepositoryInterface $ruleRepository, FactoryInterface $ruleFactory,
-                              EventDispatcherInterface         $eventDispatcher) {
+    private FormFactoryInterface $formFactory;
+    private EntityManagerInterface $entityManager;
+    private RuleRepositoryInterface $ruleRepository;
+    private FactoryInterface $ruleFactory;
+    private EventDispatcherInterface $eventDispatcher;
+
+    /**
+     * @param FormFactoryInterface $formFactory
+     * @param EntityManagerInterface $entityManager
+     * @param RuleRepositoryInterface $ruleRepository
+     * @param FactoryInterface $ruleFactory
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(FormFactoryInterface    $formFactory, EntityManagerInterface $entityManager,
+                                RuleRepositoryInterface $ruleRepository, FactoryInterface $ruleFactory,
+                                EventDispatcherInterface         $eventDispatcher) {
     $this->formFactory = $formFactory;
     $this->entityManager = $entityManager;
     $this->ruleRepository = $ruleRepository;
     $this->ruleFactory = $ruleFactory;
     $this->eventDispatcher = $eventDispatcher;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/rules/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_rule")
-   */
-  public function listAction(Request $request) {
+    /**
+     * @Route("/api/{version}/rules/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_rule")
+     */
+    public function listAction(Request $request) {
     $rules = $this->ruleRepository
         ->getPaginatedByCriteria($this->eventDispatcher, new Criteria(), $request->query->all('sorting'), new PaginationData($request));
 
     if (0 === $rules->count()) {
-      throw new NotFoundHttpException('No rules were found.');
+        throw new NotFoundHttpException('No rules were found.');
     }
 
     return new ResourcesListResponse($rules);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/rules/{id}", requirements={"id"="\d+"}, options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_get_rule")
-   * @ParamConverter("rule", class="SWP\Bundle\CoreBundle\Model\Rule")
-   */
-  public function getAction(RuleInterface $rule) {
+    /**
+     * @Route("/api/{version}/rules/{id}", requirements={"id"="\d+"}, options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_get_rule")
+     * @ParamConverter("rule", class="SWP\Bundle\CoreBundle\Model\Rule")
+     */
+    public function getAction(RuleInterface $rule) {
     return new SingleResourceResponse($rule);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/rules/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_create_rule")
-   */
-  public function createAction(Request $request) {
+    /**
+     * @Route("/api/{version}/rules/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_create_rule")
+     */
+    public function createAction(Request $request) {
     $ruleRepository = $this->ruleRepository;
     $rule = $this->ruleFactory->create();
     $form = $this->formFactory->createNamed('', RuleType::class, $rule);
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $ruleRepository->add($rule);
+        $ruleRepository->add($rule);
 
-      return new SingleResourceResponse($rule, new ResponseContext(201));
+        return new SingleResourceResponse($rule, new ResponseContext(201));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/rules/{id}", options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_delete_rule", methods={"DELETE"}, requirements={"id"="\d+"})
-   * @ParamConverter("rule", class="SWP\Bundle\CoreBundle\Model\Rule")
-   */
-  public function deleteAction(RuleInterface $rule) {
+    /**
+     * @Route("/api/{version}/rules/{id}", options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_core_delete_rule", methods={"DELETE"}, requirements={"id"="\d+"})
+     * @ParamConverter("rule", class="SWP\Bundle\CoreBundle\Model\Rule")
+     */
+    public function deleteAction(RuleInterface $rule) {
     $ruleRepository = $this->ruleRepository;
     $ruleRepository->remove($rule);
 
     return new SingleResourceResponse(null, new ResponseContext(204));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/rules/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_rule", requirements={"id"="\d+"})
-   * @ParamConverter("rule", class="SWP\Bundle\CoreBundle\Model\Rule")
-   */
-  public function updateAction(Request $request, RuleInterface $rule) {
+    /**
+     * @Route("/api/{version}/rules/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_rule", requirements={"id"="\d+"})
+     * @ParamConverter("rule", class="SWP\Bundle\CoreBundle\Model\Rule")
+     */
+    public function updateAction(Request $request, RuleInterface $rule) {
     $objectManager = $this->entityManager;
 
     $form = $this->formFactory->createNamed('', RuleType::class, $rule, [
@@ -122,12 +122,12 @@ 
 
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $objectManager->flush();
-      $objectManager->refresh($rule);
+        $objectManager->flush();
+        $objectManager->refresh($rule);
 
-      return new SingleResourceResponse($rule);
+        return new SingleResourceResponse($rule);
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 }

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

Indentation +23 added lines, -23 removed lines

@@ -13,21 +13,21 @@ 
 use Symfony\Component\Routing\Annotation\Route;
 
 class ExternalOauthController extends Controller {
-  public const PUBLISHER_JWT_COOKIE = 'publisher_jwt';
+    public const PUBLISHER_JWT_COOKIE = 'publisher_jwt';
 
-  private ClientRegistry $clientRegistry;
+    private ClientRegistry $clientRegistry;
 
-  /**
-   * @param ClientRegistry $clientRegistry
-   */
-  public function __construct(ClientRegistry $clientRegistry) {
+    /**
+     * @param ClientRegistry $clientRegistry
+     */
+    public function __construct(ClientRegistry $clientRegistry) {
     $this->clientRegistry = $clientRegistry;
-  }
+    }
 
-  /**
-   * @Route("/connect/oauth", name="connect_oauth_start")
-   */
-  public function connectAction(Request $request): Response {
+    /**
+     * @Route("/connect/oauth", name="connect_oauth_start")
+     */
+    public function connectAction(Request $request): Response {
     $referer = $request->headers->get('referer');
 
     return $this->clientRegistry
@@ -35,20 +35,20 @@ 
         ->redirect([
             'openid', 'email', 'profile',
         ], ['state' => $referer]);
-  }
-
-  /**
-   * This is where the user is redirected after being succesfully authenticated by the OAuth server.
-   *
-   * @Route("/connect/oauth/check", name="connect_oauth_check")
-   */
-  public function connectCheckAction(Request $request, JWTTokenManagerInterface $jwtTokenManager): Response {
+    }
+
+    /**
+     * This is where the user is redirected after being succesfully authenticated by the OAuth server.
+     *
+     * @Route("/connect/oauth/check", name="connect_oauth_check")
+     */
+    public function connectCheckAction(Request $request, JWTTokenManagerInterface $jwtTokenManager): Response {
     // If we didn't log in, something went wrong. Throw an exception!
     if (!($user = $this->getUser())) {
-      $response = $this->render('bundles/TwigBundle/Exception/error403.html.twig');
-      $response->setStatusCode(403);
+        $response = $this->render('bundles/TwigBundle/Exception/error403.html.twig');
+        $response->setStatusCode(403);
 
-      return $response;
+        return $response;
     }
 
     $state = $request->query->get('state');
@@ -57,5 +57,5 @@ 
     $response->headers->setCookie(Cookie::create(self::PUBLISHER_JWT_COOKIE, $jwtTokenManager->create($user)));
 
     return $response;
-  }
+    }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
     $route = $this->findRouteOr404($routeId);
 
     /** @var string $content */
-    $content = (string)$request->getContent();
+    $content = (string) $request->getContent();
     $dispatcher = $this->eventDispatcher;
     $package = $this->dataTransformer->transform($content);
     $dispatcher->dispatch(new GenericEvent($package), Events::SWP_VALIDATION);

Indentation +81 added lines, -81 removed lines

@@ -47,36 +47,36 @@ 
 
 class PackagePreviewController extends Controller {
 
-  private EventDispatcherInterface $eventDispatcher;
-  private DataTransformerInterface $dataTransformer;
-  private PackageRepositoryInterface $packageRepository;
-  private RouteRepositoryInterface $routeRepository;
-  private RepositoryInterface $packagePreviewTokenRepository;
-  private PackagePreviewTokenFactoryInterface $packagePreviewTokenFactory;
-  private TemplateNameResolverInterface $templateNameResolver;
-  private ArticlePreviewerInterface $articlePreviewer;
-  private ArticlePreviewContextInterface $articlePreviewContext;
-
-  /**
-   * @param EventDispatcherInterface $eventDispatcher
-   * @param DataTransformerInterface $dataTransformer
-   * @param PackageRepositoryInterface $packageRepository
-   * @param RouteRepositoryInterface $routeRepository
-   * @param RepositoryInterface $packagePreviewTokenRepository
-   * @param PackagePreviewTokenFactoryInterface $packagePreviewTokenFactory
-   * @param TemplateNameResolverInterface $templateNameResolver
-   * @param ArticlePreviewerInterface $articlePreviewer
-   * @param ArticlePreviewContextInterface $articlePreviewContext
-   */
-  public function __construct(EventDispatcherInterface            $eventDispatcher,
-                              DataTransformerInterface            $dataTransformer,
-                              PackageRepositoryInterface          $packageRepository,
-                              RouteRepositoryInterface            $routeRepository,
-                              RepositoryInterface                 $packagePreviewTokenRepository,
-                              PackagePreviewTokenFactoryInterface $packagePreviewTokenFactory,
-                              TemplateNameResolverInterface       $templateNameResolver,
-                              ArticlePreviewerInterface           $articlePreviewer,
-                              ArticlePreviewContextInterface      $articlePreviewContext) {
+    private EventDispatcherInterface $eventDispatcher;
+    private DataTransformerInterface $dataTransformer;
+    private PackageRepositoryInterface $packageRepository;
+    private RouteRepositoryInterface $routeRepository;
+    private RepositoryInterface $packagePreviewTokenRepository;
+    private PackagePreviewTokenFactoryInterface $packagePreviewTokenFactory;
+    private TemplateNameResolverInterface $templateNameResolver;
+    private ArticlePreviewerInterface $articlePreviewer;
+    private ArticlePreviewContextInterface $articlePreviewContext;
+
+    /**
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param DataTransformerInterface $dataTransformer
+     * @param PackageRepositoryInterface $packageRepository
+     * @param RouteRepositoryInterface $routeRepository
+     * @param RepositoryInterface $packagePreviewTokenRepository
+     * @param PackagePreviewTokenFactoryInterface $packagePreviewTokenFactory
+     * @param TemplateNameResolverInterface $templateNameResolver
+     * @param ArticlePreviewerInterface $articlePreviewer
+     * @param ArticlePreviewContextInterface $articlePreviewContext
+     */
+    public function __construct(EventDispatcherInterface            $eventDispatcher,
+                                DataTransformerInterface            $dataTransformer,
+                                PackageRepositoryInterface          $packageRepository,
+                                RouteRepositoryInterface            $routeRepository,
+                                RepositoryInterface                 $packagePreviewTokenRepository,
+                                PackagePreviewTokenFactoryInterface $packagePreviewTokenFactory,
+                                TemplateNameResolverInterface       $templateNameResolver,
+                                ArticlePreviewerInterface           $articlePreviewer,
+                                ArticlePreviewContextInterface      $articlePreviewContext) {
     $this->eventDispatcher = $eventDispatcher;
     $this->dataTransformer = $dataTransformer;
     $this->packageRepository = $packageRepository;
@@ -86,13 +86,13 @@ 
     $this->templateNameResolver = $templateNameResolver;
     $this->articlePreviewer = $articlePreviewer;
     $this->articlePreviewContext = $articlePreviewContext;
-  }
+    }
 
 
-  /**
-   * @Route("/preview/package/{routeId}/{id}", options={"expose"=true}, requirements={"id"="\d+", "routeId"="\d+", "token"=".+"}, methods={"GET"}, name="swp_package_preview")
-   */
-  public function previewAction(int $routeId, $id) {
+    /**
+     * @Route("/preview/package/{routeId}/{id}", options={"expose"=true}, requirements={"id"="\d+", "routeId"="\d+", "token"=".+"}, methods={"GET"}, name="swp_package_preview")
+     */
+    public function previewAction(int $routeId, $id) {
     /** @var RouteInterface $route */
     $route = $this->findRouteOr404($routeId);
     /** @var PackageInterface $package */
@@ -106,22 +106,22 @@ 
     $this->eventDispatcher->dispatch(new GenericEvent($articlePreview), ArticleEvents::PREVIEW);
 
     if (null !== ($url = $articlePreview->getPreviewUrl())) {
-      return new RedirectResponse($url);
+        return new RedirectResponse($url);
     }
 
     $route = $this->ensureRouteTemplateExists($route, $article);
 
     try {
-      return $this->render($route->getArticlesTemplateName());
+        return $this->render($route->getArticlesTemplateName());
     } catch (\Exception $e) {
-      throw $this->createNotFoundException(sprintf('Template for route with id "%d" (%s) not found!', $route->getId(), $route->getName()));
+        throw $this->createNotFoundException(sprintf('Template for route with id "%d" (%s) not found!', $route->getId(), $route->getName()));
+    }
     }
-  }
 
-  /**
-   * @FOSRoute("/api/{version}/preview/package/generate_token/{routeId}", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_preview_package_token", requirements={"routeId"="\d+"})
-   */
-  public function generateTokenAction(Request $request, int $routeId): SingleResourceResponseInterface {
+    /**
+     * @FOSRoute("/api/{version}/preview/package/generate_token/{routeId}", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_preview_package_token", requirements={"routeId"="\d+"})
+     */
+    public function generateTokenAction(Request $request, int $routeId): SingleResourceResponseInterface {
     $route = $this->findRouteOr404($routeId);
 
     /** @var string $content */
@@ -134,27 +134,27 @@ 
     $existingPreviewToken = $tokenRepository->findOneBy(['route' => $route]);
 
     if (null === $existingPreviewToken) {
-      $packagePreviewToken = $this->packagePreviewTokenFactory->createTokenizedWith($route, $content);
+        $packagePreviewToken = $this->packagePreviewTokenFactory->createTokenizedWith($route, $content);
 
-      $tokenRepository->persist($packagePreviewToken);
-      $tokenRepository->flush();
+        $tokenRepository->persist($packagePreviewToken);
+        $tokenRepository->flush();
 
-      return $this->returnResponseWithPreviewUrl($packagePreviewToken);
+        return $this->returnResponseWithPreviewUrl($packagePreviewToken);
     }
 
     $this->updatePackagePreviewTokenBody($content, $existingPreviewToken);
 
     return $this->returnResponseWithPreviewUrl($existingPreviewToken);
-  }
+    }
 
-  /**
-   * @Route("/preview/publish/package/{token}", options={"expose"=true}, requirements={"token"=".+"}, methods={"GET"}, name="swp_package_preview_publish")
-   */
-  public function publishPreviewAction(string $token) {
+    /**
+     * @Route("/preview/publish/package/{token}", options={"expose"=true}, requirements={"token"=".+"}, methods={"GET"}, name="swp_package_preview_publish")
+     */
+    public function publishPreviewAction(string $token) {
     $existingPreviewToken = $this->packagePreviewTokenRepository->findOneBy(['token' => $token]);
 
     if (null === $existingPreviewToken) {
-      throw $this->createNotFoundException(sprintf('Token %s is not valid.', $token));
+        throw $this->createNotFoundException(sprintf('Token %s is not valid.', $token));
     }
 
     $article = $this->getArticleForPreview($existingPreviewToken);
@@ -162,17 +162,17 @@ 
     $route = $this->ensureRouteTemplateExists($route, $article);
 
     return $this->renderTemplateOr404($route);
-  }
+    }
 
-  private function updatePackagePreviewTokenBody(string $content, PackagePreviewTokenInterface $packagePreviewToken) {
+    private function updatePackagePreviewTokenBody(string $content, PackagePreviewTokenInterface $packagePreviewToken) {
     if (md5($content) !== md5($packagePreviewToken->getBody())) {
-      $packagePreviewToken->setBody($content);
+        $packagePreviewToken->setBody($content);
 
-      $this->packagePreviewTokenRepository->flush();
+        $this->packagePreviewTokenRepository->flush();
+    }
     }
-  }
 
-  private function returnResponseWithPreviewUrl(PackagePreviewTokenInterface $packagePreviewToken): SingleResourceResponseInterface {
+    private function returnResponseWithPreviewUrl(PackagePreviewTokenInterface $packagePreviewToken): SingleResourceResponseInterface {
     $article = $this->getArticleForPreview($packagePreviewToken);
     $articlePreview = new ArticlePreview();
     $articlePreview->setArticle($article);
@@ -182,19 +182,19 @@ 
     $url = $articlePreview->getPreviewUrl();
 
     if (null === $url) {
-      $url = $this->generateUrl(
-          'swp_package_preview_publish',
-          ['token' => $packagePreviewToken->getToken()],
-          UrlGeneratorInterface::ABSOLUTE_URL
-      );
+        $url = $this->generateUrl(
+            'swp_package_preview_publish',
+            ['token' => $packagePreviewToken->getToken()],
+            UrlGeneratorInterface::ABSOLUTE_URL
+        );
     }
 
     return new SingleResourceResponse([
         'preview_url' => $url,
     ]);
-  }
+    }
 
-  private function getArticleForPreview(PackagePreviewTokenInterface $packagePreviewToken): ArticleInterface {
+    private function getArticleForPreview(PackagePreviewTokenInterface $packagePreviewToken): ArticleInterface {
     $dispatcher = $this->eventDispatcher;
     $package = $this->dataTransformer->transform($packagePreviewToken->getBody());
     $dispatcher->dispatch(new GenericEvent($package), Events::SWP_VALIDATION);
@@ -205,40 +205,40 @@ 
     $articlePreviewContext->setIsPreview(true);
 
     return $articlePreviewer->preview($package, $packagePreviewToken->getRoute());
-  }
+    }
 
-  private function renderTemplateOr404(RouteInterface $route): Response {
+    private function renderTemplateOr404(RouteInterface $route): Response {
     try {
-      return $this->render($templateName = $route->getArticlesTemplateName());
+        return $this->render($templateName = $route->getArticlesTemplateName());
     } catch (\InvalidArgumentException | LoaderError $e) {
-      throw $this->createNotFoundException(sprintf('Template %s for route with id "%d" (%s) not found!', $templateName, $route->getId(), $route->getName()));
+        throw $this->createNotFoundException(sprintf('Template %s for route with id "%d" (%s) not found!', $templateName, $route->getId(), $route->getName()));
+    }
     }
-  }
 
-  private function ensureRouteTemplateExists(RouteInterface $route, ArticleInterface $article): RouteInterface {
+    private function ensureRouteTemplateExists(RouteInterface $route, ArticleInterface $article): RouteInterface {
     if (null === $route->getArticlesTemplateName()) {
-      $templateNameResolver = $this->templateNameResolver;
-      $route->setArticlesTemplateName($templateNameResolver->resolve($article));
+        $templateNameResolver = $this->templateNameResolver;
+        $route->setArticlesTemplateName($templateNameResolver->resolve($article));
     }
 
     return $route;
-  }
+    }
 
-  private function findRouteOr404(int $id): RouteInterface {
+    private function findRouteOr404(int $id): RouteInterface {
     /** @var RouteInterface $route */
     if (null === ($route = $this->routeRepository->findOneBy(['id' => $id]))) {
-      throw $this->createNotFoundException(sprintf('Route with id: "%s" not found!', $id));
+        throw $this->createNotFoundException(sprintf('Route with id: "%s" not found!', $id));
     }
 
     return $route;
-  }
+    }
 
-  private function findPackageOr404(string $id): PackageInterface {
+    private function findPackageOr404(string $id): PackageInterface {
     /** @var PackageInterface $package */
     if (null === ($package = $this->packageRepository->findOneBy(['id' => $id]))) {
-      throw $this->createNotFoundException(sprintf('Package with id: "%s" not found!', $id));
+        throw $this->createNotFoundException(sprintf('Package with id: "%s" not found!', $id));
     }
 
     return $package;
-  }
+    }
 }

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

Indentation +41 added lines, -41 removed lines

@@ -35,38 +35,38 @@ 
 
 class FbApplicationController extends Controller {
 
-  private FormFactoryInterface $formFactory;
-  private RepositoryInterface $facebookAppRepository;
-  private RepositoryInterface $facebookPageRepository;
-  private Factory $facebookAppFactory;
-  private EventDispatcherInterface $eventDispatcher;
-
-  /**
-   * @param FormFactoryInterface $formFactory
-   * @param RepositoryInterface $facebookAppRepository
-   * @param RepositoryInterface $facebookPageRepository
-   * @param Factory $facebookAppFactory
-   * @param EventDispatcherInterface $eventDispatcher
-   */
-  public function __construct(FormFactoryInterface     $formFactory, RepositoryInterface $facebookAppRepository,
-                              RepositoryInterface      $facebookPageRepository, Factory $facebookAppFactory,
-                              EventDispatcherInterface $eventDispatcher) {
+    private FormFactoryInterface $formFactory;
+    private RepositoryInterface $facebookAppRepository;
+    private RepositoryInterface $facebookPageRepository;
+    private Factory $facebookAppFactory;
+    private EventDispatcherInterface $eventDispatcher;
+
+    /**
+     * @param FormFactoryInterface $formFactory
+     * @param RepositoryInterface $facebookAppRepository
+     * @param RepositoryInterface $facebookPageRepository
+     * @param Factory $facebookAppFactory
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(FormFactoryInterface     $formFactory, RepositoryInterface $facebookAppRepository,
+                                RepositoryInterface      $facebookPageRepository, Factory $facebookAppFactory,
+                                EventDispatcherInterface $eventDispatcher) {
     $this->formFactory = $formFactory;
     $this->facebookAppRepository = $facebookAppRepository;
     $this->facebookPageRepository = $facebookPageRepository;
     $this->facebookAppFactory = $facebookAppFactory;
     $this->eventDispatcher = $eventDispatcher;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/facebook/applications/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_list_facebook_applications")
-   */
-  public function listAction(Request $request): ResourcesListResponseInterface {
+    /**
+     * @Route("/api/{version}/facebook/applications/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_list_facebook_applications")
+     */
+    public function listAction(Request $request): ResourcesListResponseInterface {
     $repository = $this->facebookAppRepository;
     $sort = $request->query->all('sorting');
     if (empty($sort)) {
-      $sort = ['id' => 'asc'];
+        $sort = ['id' => 'asc'];
     }
     $items = $repository->getPaginatedByCriteria(
         $this->eventDispatcher,
@@ -76,51 +76,51 @@ 
     );
 
     return new ResourcesListResponse($items);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/facebook/applications/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_create_facebook_applications")
-   */
-  public function createAction(Request $request) {
+    /**
+     * @Route("/api/{version}/facebook/applications/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_create_facebook_applications")
+     */
+    public function createAction(Request $request) {
     /* @var FacebookApplication $feed */
     $application = $this->facebookAppFactory->create();
     $form = $this->formFactory->createNamed('', FacebookApplicationType::class, $application, ['method' => $request->getMethod()]);
 
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $this->checkIfApplicationExists($application);
-      $this->facebookAppRepository->add($application);
+        $this->checkIfApplicationExists($application);
+        $this->facebookAppRepository->add($application);
 
-      return new SingleResourceResponse($application, new ResponseContext(201));
+        return new SingleResourceResponse($application, new ResponseContext(201));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/facebook/applications/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_delete_facebook_applications")
-   */
-  public function deleteAction($id) {
+    /**
+     * @Route("/api/{version}/facebook/applications/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_delete_facebook_applications")
+     */
+    public function deleteAction($id) {
     $repository = $this->facebookAppRepository;
     if (null === $application = $repository->findOneBy(['id' => $id])) {
-      throw new NotFoundHttpException('There is no Application with provided id!');
+        throw new NotFoundHttpException('There is no Application with provided id!');
     }
 
     if (null !== $page = $this->facebookPageRepository->findOneBy(['id' => $id])) {
-      throw new ConflictHttpException(sprintf('This Application is used by page with id: %s!', $page->getId()));
+        throw new ConflictHttpException(sprintf('This Application is used by page with id: %s!', $page->getId()));
     }
 
     $repository->remove($application);
 
     return new SingleResourceResponse(null, new ResponseContext(204));
-  }
+    }
 
-  private function checkIfApplicationExists(ApplicationInterface $application) {
+    private function checkIfApplicationExists(ApplicationInterface $application) {
     if (null !== $this->facebookAppRepository->findOneBy([
             'appId' => $application->getAppId(),
         ])
     ) {
-      throw new ConflictHttpException('This Application already exists!');
+        throw new ConflictHttpException('This Application already exists!');
+    }
     }
-  }
 }

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

Indentation +79 added lines, -79 removed lines

@@ -37,98 +37,98 @@ 
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 class AuthController extends AbstractController {
-  protected FormFactoryInterface $formFactory;
-  protected ApiKeyRepositoryInterface $apiKeyRepository;
-  protected ApiKeyFactory $apiKeyFactory;
-  protected LockFactory $lockFactory;
-
-  /**
-   * @param FormFactoryInterface $formFactory
-   * @param ApiKeyRepositoryInterface $apiKeyRepository
-   * @param ApiKeyFactory $apiKeyFactory
-   * @param LockFactory $lockFactory
-   */
-  public function __construct(FormFactoryInterface $formFactory, ApiKeyRepositoryInterface $apiKeyRepository,
-                              ApiKeyFactory        $apiKeyFactory, LockFactory $lockFactory) {
+    protected FormFactoryInterface $formFactory;
+    protected ApiKeyRepositoryInterface $apiKeyRepository;
+    protected ApiKeyFactory $apiKeyFactory;
+    protected LockFactory $lockFactory;
+
+    /**
+     * @param FormFactoryInterface $formFactory
+     * @param ApiKeyRepositoryInterface $apiKeyRepository
+     * @param ApiKeyFactory $apiKeyFactory
+     * @param LockFactory $lockFactory
+     */
+    public function __construct(FormFactoryInterface $formFactory, ApiKeyRepositoryInterface $apiKeyRepository,
+                                ApiKeyFactory        $apiKeyFactory, LockFactory $lockFactory) {
     $this->formFactory = $formFactory;
     $this->apiKeyRepository = $apiKeyRepository;
     $this->apiKeyFactory = $apiKeyFactory;
     $this->lockFactory = $lockFactory;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/auth/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_auth")
-   */
-  public function authenticateAction(Request                     $request, UserProviderInterface $userProvider,
-                                     UserPasswordHasherInterface $userPasswordEncoder) {
+    /**
+     * @Route("/api/{version}/auth/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_auth")
+     */
+    public function authenticateAction(Request                     $request, UserProviderInterface $userProvider,
+                                        UserPasswordHasherInterface $userPasswordEncoder) {
     $form = $this->formFactory->createNamed('', UserAuthenticationType::class, []);
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $formData = $form->getData();
+        $formData = $form->getData();
 
-      try {
+        try {
         $user = $userProvider->loadUserByUsername($formData['username']);
-      } catch (AuthenticationException $e) {
+        } catch (AuthenticationException $e) {
         $user = null;
-      }
+        }
 
-      if ((null !== $user) && $userPasswordEncoder->isPasswordValid($user, $formData['password'])) {
+        if ((null !== $user) && $userPasswordEncoder->isPasswordValid($user, $formData['password'])) {
         return $this->returnApiTokenResponse($user);
-      }
+        }
     }
 
     return new SingleResourceResponse([
         'status' => 401,
         'message' => 'Unauthorized',
     ], new ResponseContext(401));
-  }
-
-  /**
-   * @Route("/api/{version}/auth/superdesk/", options={"expose"=true}, methods={"POST"}, defaults={"version"="v2"}, name="swp_api_auth_superdesk")
-   */
-  public function authenticateWithSuperdeskAction(
-      Request               $request,
-      LoggerInterface       $logger,
-      array                 $superdeskServers,
-      UserProviderInterface $userProvider,
-      UserManagerInterface  $userManager
-  ) {
+    }
+
+    /**
+     * @Route("/api/{version}/auth/superdesk/", options={"expose"=true}, methods={"POST"}, defaults={"version"="v2"}, name="swp_api_auth_superdesk")
+     */
+    public function authenticateWithSuperdeskAction(
+        Request               $request,
+        LoggerInterface       $logger,
+        array                 $superdeskServers,
+        UserProviderInterface $userProvider,
+        UserManagerInterface  $userManager
+    ) {
     $form = $this->formFactory->createNamed('', SuperdeskCredentialAuthenticationType::class, []);
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $formData = $form->getData();
-      $authorizedSuperdeskHosts = $superdeskServers;
-      $superdeskUser = null;
-      $client = new GuzzleHttp\Client();
+        $formData = $form->getData();
+        $authorizedSuperdeskHosts = $superdeskServers;
+        $superdeskUser = null;
+        $client = new GuzzleHttp\Client();
 
-      foreach ($authorizedSuperdeskHosts as $baseUrl) {
+        foreach ($authorizedSuperdeskHosts as $baseUrl) {
         try {
-          $apiRequest = new GuzzleHttp\Psr7\Request('GET', sprintf('%s/api/sessions/%s', $baseUrl, $formData['sessionId']), [
-              'Authorization' => $formData['token'],
-          ]);
+            $apiRequest = new GuzzleHttp\Psr7\Request('GET', sprintf('%s/api/sessions/%s', $baseUrl, $formData['sessionId']), [
+                'Authorization' => $formData['token'],
+            ]);
 
-          $apiResponse = $client->send($apiRequest);
-          if (200 !== $apiResponse->getStatusCode()) {
+            $apiResponse = $client->send($apiRequest);
+            if (200 !== $apiResponse->getStatusCode()) {
             $logger->warning(sprintf('[%s] Unsuccessful response from Superdesk Server: %s', $apiResponse->getStatusCode(), $apiResponse->getBody()->getContents()));
 
             continue;
-          }
+            }
 
-          $content = json_decode($apiResponse->getBody()->getContents(), true);
-          if (is_array($content) && array_key_exists('user', $content)) {
+            $content = json_decode($apiResponse->getBody()->getContents(), true);
+            if (is_array($content) && array_key_exists('user', $content)) {
             $superdeskUser = $content['user'];
 
             break;
-          }
+            }
         } catch (GuzzleHttp\Exception\ClientException $e) {
-          $logger->warning(sprintf('Error when logging in Superdesk: %s', $e->getMessage()));
+            $logger->warning(sprintf('Error when logging in Superdesk: %s', $e->getMessage()));
 
-          continue;
+            continue;
+        }
         }
-      }
 
-      if (null === $superdeskUser) {
+        if (null === $superdeskUser) {
         return new SingleResourceResponse([
             'status' => 401,
             'message' => <<<'MESSAGE'
@@ -136,18 +136,18 @@ 
 Make sure that Publisher can talk to Superdesk instance. Set it's address in "SUPERDESK_SERVERS" environment variable.
 MESSAGE,
         ], new ResponseContext(401));
-      }
+        }
 
-      $publisherUser = $userProvider->findOneByEmail($superdeskUser['email']);
-      if (null === $publisherUser) {
+        $publisherUser = $userProvider->findOneByEmail($superdeskUser['email']);
+        if (null === $publisherUser) {
         try {
-          $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
+            $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
         } catch (AuthenticationException $e) {
-          $publisherUser = null;
+            $publisherUser = null;
+        }
         }
-      }
 
-      if (null === $publisherUser) {
+        if (null === $publisherUser) {
         /** @var UserInterface $publisherUser */
         $publisherUser = $userManager->createUser();
         $publisherUser->setUsername($superdeskUser['username']);
@@ -157,20 +157,20 @@ 
         $publisherUser->setLastName(\array_key_exists('last_name', $superdeskUser) ? $superdeskUser['last_name'] : '');
         $publisherUser->setPassword(password_hash(random_bytes(36), PASSWORD_BCRYPT));
         $userManager->updateUser($publisherUser);
-      }
+        }
 
-      if (null !== $publisherUser) {
+        if (null !== $publisherUser) {
         return $this->returnApiTokenResponse($publisherUser, str_replace('Basic ', '', $formData['token']));
-      }
+        }
     }
 
     return new SingleResourceResponse([
         'status' => 401,
         'message' => 'Unauthorized',
     ], new ResponseContext(401));
-  }
+    }
 
-  private function returnApiTokenResponse(UserInterface $user, string $token = null): SingleResourceResponseInterface {
+    private function returnApiTokenResponse(UserInterface $user, string $token = null): SingleResourceResponseInterface {
     /** @var ApiKeyInterface $apiKey */
     $apiKey = $this->generateOrGetApiKey($user, $token);
 
@@ -181,36 +181,36 @@ 
         ],
         'user' => $user,
     ]);
-  }
+    }
 
-  private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface {
+    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface {
     $apiKey = null;
     if (null !== $token) {
-      $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
+        $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
     } else {
-      $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-      if (count($validKeys) > 0) {
+        $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
+        if (count($validKeys) > 0) {
         $apiKey = reset($validKeys);
-      }
+        }
     }
 
     if (null === $apiKey) {
-      $apiKey = $this->apiKeyFactory->create($user, $token);
+        $apiKey = $this->apiKeyFactory->create($user, $token);
 
-      try {
+        try {
         $lock = $this->lockFactory->createLock(md5(json_encode(['type' => 'user_api_key', 'user' => $user->getId()])), 2);
         if (!$lock->acquire()) {
-          throw new RuntimeException('Other api key is created right now for this user');
+            throw new RuntimeException('Other api key is created right now for this user');
         }
         $this->apiKeyRepository->add($apiKey);
         $lock->release();
-      } catch (RuntimeException $e) {
+        } catch (RuntimeException $e) {
         sleep(2);
 
         return $this->generateOrGetApiKey($user, $token);
-      }
+        }
     }
 
     return $apiKey;
-  }
+    }
 }