superdesk / web-publisher

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

Indentation +84 added lines, -84 removed lines

@@ -27,138 +27,138 @@
 use Symfony\Component\Routing\Annotation\Route;
 
 class StaticThemeAssetsController extends Controller {
-  /**
-   * Directory with assets inside theme.
-   */
-  const ASSETS_DIRECTORY = 'public';
-
-  private TenantAwareThemeContextInterface $tenantAwareThemeContext;
-  private ThemeLoaderInterface $themeLoader;
-  private ThemeRepositoryInterface $themeRepository;
-
-  /**
-   * @param TenantAwareThemeContextInterface $tenantAwareThemeContext
-   * @param ThemeLoaderInterface $themeLoader
-   * @param ThemeRepositoryInterface $themeRepository
-   */
-  public function __construct(TenantAwareThemeContextInterface $tenantAwareThemeContext,
-                              ThemeLoaderInterface             $themeLoader,
-                              ThemeRepositoryInterface         $themeRepository) {
+    /**
+     * Directory with assets inside theme.
+     */
+    const ASSETS_DIRECTORY = 'public';
+
+    private TenantAwareThemeContextInterface $tenantAwareThemeContext;
+    private ThemeLoaderInterface $themeLoader;
+    private ThemeRepositoryInterface $themeRepository;
+
+    /**
+     * @param TenantAwareThemeContextInterface $tenantAwareThemeContext
+     * @param ThemeLoaderInterface $themeLoader
+     * @param ThemeRepositoryInterface $themeRepository
+     */
+    public function __construct(TenantAwareThemeContextInterface $tenantAwareThemeContext,
+                                ThemeLoaderInterface             $themeLoader,
+                                ThemeRepositoryInterface         $themeRepository) {
     $this->tenantAwareThemeContext = $tenantAwareThemeContext;
     $this->themeLoader = $themeLoader;
     $this->themeRepository = $themeRepository;
-  }
+    }
 
 
-  /**
-   * @Route("/{fileName}.{fileExtension}", methods={"GET"}, name="static_theme_assets_root", requirements={"fileName": "sw|manifest|favicon|ads|OneSignalSDKWorker|OneSignalSDKUpdaterWorker|amp-web-push-helper-frame|amp-web-push-permission-dialog"})
-   * @Route("/public-{fileName}.{fileExtension}", methods={"GET"}, name="static_theme_assets_root_public", requirements={"fileName"=".+"})
-   * @Route("/public/{fileName}.{fileExtension}", methods={"GET"}, name="static_theme_assets_public", requirements={"fileName"=".+"})
-   */
-  public function rootAction($fileName, $fileExtension, ThemeHierarchyProviderInterface $themeHierarchyProvider) {
+    /**
+     * @Route("/{fileName}.{fileExtension}", methods={"GET"}, name="static_theme_assets_root", requirements={"fileName": "sw|manifest|favicon|ads|OneSignalSDKWorker|OneSignalSDKUpdaterWorker|amp-web-push-helper-frame|amp-web-push-permission-dialog"})
+     * @Route("/public-{fileName}.{fileExtension}", methods={"GET"}, name="static_theme_assets_root_public", requirements={"fileName"=".+"})
+     * @Route("/public/{fileName}.{fileExtension}", methods={"GET"}, name="static_theme_assets_public", requirements={"fileName"=".+"})
+     */
+    public function rootAction($fileName, $fileExtension, ThemeHierarchyProviderInterface $themeHierarchyProvider) {
     $themes = $themeHierarchyProvider->getThemeHierarchy(
         $this->tenantAwareThemeContext->getTheme()
     );
 
     $fileName = (null === $fileExtension) ? basename($fileName) : $fileName . '.' . $fileExtension;
     foreach ($themes as $theme) {
-      $filePath = $theme->getPath() . '/' . self::ASSETS_DIRECTORY . '/' . $fileName;
-      if (null !== $response = $this->handleFileLoading($filePath)) {
+        $filePath = $theme->getPath() . '/' . self::ASSETS_DIRECTORY . '/' . $fileName;
+        if (null !== $response = $this->handleFileLoading($filePath)) {
         return $response;
-      }
+        }
     }
 
     throw new NotFoundHttpException('File was not found.');
-  }
-
-  /**
-   * @Route("/themes/{type}/{themeName}/screenshots/{fileName}", methods={"GET"}, name="static_theme_screenshots", requirements={
-   *     "type": "organization|tenant"
-   * })
-   */
-  public function screenshotsAction(string $type, string $themeName, $fileName) {
+    }
+
+    /**
+     * @Route("/themes/{type}/{themeName}/screenshots/{fileName}", methods={"GET"}, name="static_theme_screenshots", requirements={
+     *     "type": "organization|tenant"
+     * })
+     */
+    public function screenshotsAction(string $type, string $themeName, $fileName) {
     if ('organization' === $type) {
-      $theme = $this->loadOrganizationTheme(str_replace('__', '/', $themeName));
+        $theme = $this->loadOrganizationTheme(str_replace('__', '/', $themeName));
     } elseif ('tenant' === $type) {
-      $theme = $this->loadTenantTheme(str_replace('__', '/', $themeName));
+        $theme = $this->loadTenantTheme(str_replace('__', '/', $themeName));
     } else {
-      throw new NotFoundHttpException('File was not found.');
+        throw new NotFoundHttpException('File was not found.');
     }
 
     $filePath = $theme->getPath() . '/screenshots/' . $fileName;
     if (null !== $response = $this->handleFileLoading($filePath)) {
-      return $response;
+        return $response;
     }
 
     throw new NotFoundHttpException('File was not found.');
-  }
-
-  /**
-   * @param $filePath
-   *
-   * @return Response
-   */
-  private function handleFileLoading($filePath) {
+    }
+
+    /**
+     * @param $filePath
+     *
+     * @return Response
+     */
+    private function handleFileLoading($filePath) {
     if (file_exists($filePath)) {
-      $response = new Response(file_get_contents($filePath));
-      $disposition = $response->headers->makeDisposition(
-          ResponseHeaderBag::DISPOSITION_INLINE,
-          basename($filePath)
-      );
-      $response->headers->set('Content-Disposition', $disposition);
-
-      try {
+        $response = new Response(file_get_contents($filePath));
+        $disposition = $response->headers->makeDisposition(
+            ResponseHeaderBag::DISPOSITION_INLINE,
+            basename($filePath)
+        );
+        $response->headers->set('Content-Disposition', $disposition);
+
+        try {
         $type = new Mime(new Read($filePath));
         $mime = str_replace('/x-', '/', Mime::getMimeFromExtension($type->getExtension()));
-      } catch (\Exception $e) {
+        } catch (\Exception $e) {
         $mime = 'text/plain';
-      }
+        }
 
-      $response->headers->set('Content-Type', $mime);
-      $response->setStatusCode(Response::HTTP_OK);
-      $response->setPublic();
-      $response->setMaxAge(3600);
-      $response->setSharedMaxAge(7200);
+        $response->headers->set('Content-Type', $mime);
+        $response->setStatusCode(Response::HTTP_OK);
+        $response->setPublic();
+        $response->setMaxAge(3600);
+        $response->setSharedMaxAge(7200);
 
-      return $response;
+        return $response;
+    }
     }
-  }
 
-  /**
-   * @return mixed
-   */
-  private function loadOrganizationTheme(string $themeName) {
+    /**
+     * @return mixed
+     */
+    private function loadOrganizationTheme(string $themeName) {
     $loadedThemes = $this->themeLoader->load();
 
     return $this->filterThemes($loadedThemes, $themeName);
-  }
+    }
 
-  /**
-   * @return mixed
-   */
-  private function loadTenantTheme(string $themeName) {
+    /**
+     * @return mixed
+     */
+    private function loadTenantTheme(string $themeName) {
     $loadedThemes = $this->themeRepository->findAll();
 
     return $this->filterThemes($loadedThemes, $themeName);
-  }
-
-  /**
-   * @param array $loadedThemes
-   *
-   * @return mixed
-   */
-  private function filterThemes($loadedThemes, string $themeName) {
+    }
+
+    /**
+     * @param array $loadedThemes
+     *
+     * @return mixed
+     */
+    private function filterThemes($loadedThemes, string $themeName) {
     $themes = array_filter(
         $loadedThemes,
         function ($element) use (&$themeName) {
-          return $element->getName() === $themeName;
+            return $element->getName() === $themeName;
         }
     );
 
     if (0 === count($themes)) {
-      throw new NotFoundHttpException(sprintf('Theme with name "%s" was not found in organization themes.', $themeName));
+        throw new NotFoundHttpException(sprintf('Theme with name "%s" was not found in organization themes.', $themeName));
     }
 
     return reset($themes);
-  }
+    }
 }

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

Indentation +46 added lines, -46 removed lines

@@ -35,39 +35,39 @@ 
 
 class PublishDestinationController extends Controller {
 
-  private FormFactoryInterface $formFactory;
-  private EventDispatcherInterface $eventDispatcher;
-  private CachedTenantContextInterface $cachedTenantContext;
-  private RepositoryInterface $publishDestinationRepository;
-  private EntityManagerInterface $entityManager;
-  private FactoryInterface $publishDestinationFactory;
-
-  /**
-   * @param FormFactoryInterface $formFactory
-   * @param EventDispatcherInterface $eventDispatcher
-   * @param CachedTenantContextInterface $cachedTenantContext
-   * @param RepositoryInterface $publishDestinationRepository
-   * @param EntityManagerInterface $entityManager
-   * @param FactoryInterface $publishDestinationFactory
-   */
-  public function __construct(FormFactoryInterface         $formFactory,
-                              EventDispatcherInterface     $eventDispatcher,
-                              CachedTenantContextInterface $cachedTenantContext,
-                              RepositoryInterface          $publishDestinationRepository,
-                              EntityManagerInterface       $entityManager,
-                              FactoryInterface             $publishDestinationFactory) {
+    private FormFactoryInterface $formFactory;
+    private EventDispatcherInterface $eventDispatcher;
+    private CachedTenantContextInterface $cachedTenantContext;
+    private RepositoryInterface $publishDestinationRepository;
+    private EntityManagerInterface $entityManager;
+    private FactoryInterface $publishDestinationFactory;
+
+    /**
+     * @param FormFactoryInterface $formFactory
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param CachedTenantContextInterface $cachedTenantContext
+     * @param RepositoryInterface $publishDestinationRepository
+     * @param EntityManagerInterface $entityManager
+     * @param FactoryInterface $publishDestinationFactory
+     */
+    public function __construct(FormFactoryInterface         $formFactory,
+                                EventDispatcherInterface     $eventDispatcher,
+                                CachedTenantContextInterface $cachedTenantContext,
+                                RepositoryInterface          $publishDestinationRepository,
+                                EntityManagerInterface       $entityManager,
+                                FactoryInterface             $publishDestinationFactory) {
     $this->formFactory = $formFactory;
     $this->eventDispatcher = $eventDispatcher;
     $this->cachedTenantContext = $cachedTenantContext;
     $this->publishDestinationRepository = $publishDestinationRepository;
     $this->entityManager = $entityManager;
     $this->publishDestinationFactory = $publishDestinationFactory;
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/organization/destinations/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_publishing_destination_create")
-   */
-  public function createAction(Request $request): SingleResourceResponse {
+    /**
+     * @Route("/api/{version}/organization/destinations/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_publishing_destination_create")
+     */
+    public function createAction(Request $request): SingleResourceResponse {
     $tenantContext = $this->cachedTenantContext;
 
     $this->eventDispatcher->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_DISABLE);
@@ -78,28 +78,28 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $repository = $this->publishDestinationRepository;
-      /** @var PublishDestinationInterface $publishDestination */
-      $publishDestination = $repository->findOneByTenant($destination->getTenant());
-      if (null !== $publishDestination) {
+        $repository = $this->publishDestinationRepository;
+        /** @var PublishDestinationInterface $publishDestination */
+        $publishDestination = $repository->findOneByTenant($destination->getTenant());
+        if (null !== $publishDestination) {
         $repository->remove($publishDestination);
-      }
+        }
 
-      $currentOrganization->addPublishDestination($destination);
-      $this->entityManager->flush();
+        $currentOrganization->addPublishDestination($destination);
+        $this->entityManager->flush();
 
-      return new SingleResourceResponse($destination, new ResponseContext(200));
+        return new SingleResourceResponse($destination, new ResponseContext(200));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
-
-  /**
-   * @Route("/api/{version}/organization/destinations/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_publishing_destination_update", requirements={"id"="\d+"})
-   * @ParamConverter("publishDestination", class="SWP\Bundle\CoreBundle\Model\PublishDestination")
-   */
-  public function updateAction(Request                     $request,
-                               PublishDestinationInterface $publishDestination): SingleResourceResponse {
+    }
+
+    /**
+     * @Route("/api/{version}/organization/destinations/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_publishing_destination_update", requirements={"id"="\d+"})
+     * @ParamConverter("publishDestination", class="SWP\Bundle\CoreBundle\Model\PublishDestination")
+     */
+    public function updateAction(Request                     $request,
+                                PublishDestinationInterface $publishDestination): SingleResourceResponse {
     $objectManager = $this->entityManager;
 
     $form = $this->formFactory->createNamed('', PublishDestinationType::class, $publishDestination, [
@@ -108,12 +108,12 @@ 
 
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $objectManager->flush();
-      $objectManager->refresh($publishDestination);
+        $objectManager->flush();
+        $objectManager->refresh($publishDestination);
 
-      return new SingleResourceResponse($publishDestination);
+        return new SingleResourceResponse($publishDestination);
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 }

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/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;
-  }
+    }
 }

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

Indentation +33 added lines, -33 removed lines

@@ -29,50 +29,50 @@
 
 class ThemeLogoController extends Controller {
 
-  private Filesystem $filesystem;
-  private ThemeLogoUploaderInterface $themeLogoUploader;
-  private CacheInterface $cacheInterface;
+    private Filesystem $filesystem;
+    private ThemeLogoUploaderInterface $themeLogoUploader;
+    private CacheInterface $cacheInterface;
 
-  /**
-   * @param Filesystem $filesystem
-   * @param ThemeLogoUploaderInterface $themeLogoUploader
-   * @param CacheInterface $cacheInterface
-   */
-  public function __construct(Filesystem     $filesystem, ThemeLogoUploaderInterface $themeLogoUploader,
-                              CacheInterface $cacheInterface) {
+    /**
+     * @param Filesystem $filesystem
+     * @param ThemeLogoUploaderInterface $themeLogoUploader
+     * @param CacheInterface $cacheInterface
+     */
+    public function __construct(Filesystem     $filesystem, ThemeLogoUploaderInterface $themeLogoUploader,
+                                CacheInterface $cacheInterface) {
     $this->filesystem = $filesystem;
     $this->themeLogoUploader = $themeLogoUploader;
     $this->cacheInterface = $cacheInterface;
-  }
+    }
 
-  /**
-   * @Route("/theme_logo/{id}", options={"expose"=true}, requirements={"id"=".+"}, methods={"GET"}, name="swp_theme_logo_get")
-   */
-  public function getLogoAction(string $id) {
+    /**
+     * @Route("/theme_logo/{id}", options={"expose"=true}, requirements={"id"=".+"}, methods={"GET"}, name="swp_theme_logo_get")
+     */
+    public function getLogoAction(string $id) {
     $cacheKey = md5(serialize(['upload', $id]));
     return $this->cacheInterface->get($cacheKey, function (CacheItemInterface $item, &$save) use ($id) {
-      $item->expiresAfter(63072000);
+        $item->expiresAfter(63072000);
 
-      $fileSystem = $this->filesystem;
-      $themeLogoUploader = $this->themeLogoUploader;
-      $id = $themeLogoUploader->getThemeLogoUploadPath($id);
-      $file = $fileSystem->has($id);
-      if (!$file) {
+        $fileSystem = $this->filesystem;
+        $themeLogoUploader = $this->themeLogoUploader;
+        $id = $themeLogoUploader->getThemeLogoUploadPath($id);
+        $file = $fileSystem->has($id);
+        if (!$file) {
         $save = false;
         throw new NotFoundHttpException('File was not found.');
-      }
+        }
 
-      $path = $fileSystem->get($id)->getPath();
-      $response = new Response();
-      $disposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_INLINE, pathinfo($path, PATHINFO_BASENAME));
-      $response->headers->set('Content-Disposition', $disposition);
-      $response->headers->set('Content-Type', Mime::getMimeFromExtension($path));
-      $response->setPublic();
-      $response->setMaxAge(63072000);
-      $response->setSharedMaxAge(63072000);
-      $response->setContent($fileSystem->read($path));
+        $path = $fileSystem->get($id)->getPath();
+        $response = new Response();
+        $disposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_INLINE, pathinfo($path, PATHINFO_BASENAME));
+        $response->headers->set('Content-Disposition', $disposition);
+        $response->headers->set('Content-Type', Mime::getMimeFromExtension($path));
+        $response->setPublic();
+        $response->setMaxAge(63072000);
+        $response->setSharedMaxAge(63072000);
+        $response->setContent($fileSystem->read($path));
 
-      return $response;
+        return $response;
     });
-  }
+    }
 }

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/CoreBundle/Controller/WebhookController.php

Indentation +47 added lines, -47 removed lines

@@ -28,77 +28,77 @@
 use FOS\RestBundle\Controller\Annotations\Route;
 
 class WebhookController extends AbstractAPIController {
-  private WebhookRepositoryInterface $webhookRepository;
-  private FormFactoryInterface $formFactory;
-  private FactoryInterface $webhookFactory;
-  private EntityManagerInterface $entityManager;
-  private EventDispatcherInterface $eventDispatcher;
+    private WebhookRepositoryInterface $webhookRepository;
+    private FormFactoryInterface $formFactory;
+    private FactoryInterface $webhookFactory;
+    private EntityManagerInterface $entityManager;
+    private EventDispatcherInterface $eventDispatcher;
 
-  /**
-   * @param WebhookRepositoryInterface $webhookRepository
-   * @param FormFactoryInterface $formFactory
-   * @param FactoryInterface $webhookFactory
-   * @param EntityManagerInterface $entityManager
-   * @param EventDispatcherInterface $eventDispatcher
-   */
-  public function __construct(WebhookRepositoryInterface $webhookRepository, FormFactoryInterface $formFactory,
-                              FactoryInterface           $webhookFactory, EntityManagerInterface $entityManager,
-                              EventDispatcherInterface            $eventDispatcher) {
+    /**
+     * @param WebhookRepositoryInterface $webhookRepository
+     * @param FormFactoryInterface $formFactory
+     * @param FactoryInterface $webhookFactory
+     * @param EntityManagerInterface $entityManager
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(WebhookRepositoryInterface $webhookRepository, FormFactoryInterface $formFactory,
+                                FactoryInterface           $webhookFactory, EntityManagerInterface $entityManager,
+                                EventDispatcherInterface            $eventDispatcher) {
     $this->webhookRepository = $webhookRepository;
     $this->formFactory = $formFactory;
     $this->webhookFactory = $webhookFactory;
     $this->entityManager = $entityManager;
     $this->eventDispatcher = $eventDispatcher;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/webhooks/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_webhook")
-   */
-  public function listAction(Request $request): ResourcesListResponseInterface {
+    /**
+     * @Route("/api/{version}/webhooks/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_webhook")
+     */
+    public function listAction(Request $request): ResourcesListResponseInterface {
     return $this->listWebhooks($this->eventDispatcher,$this->webhookRepository, $request);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/webhooks/{id}", requirements={"id"="\d+"}, options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_get_webhook")
-   *
-   * @ParamConverter("webhook", class="SWP\Bundle\WebhookBundle\Model\Webhook")
-   */
-  public function getAction(WebhookInterface $webhook): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/webhooks/{id}", requirements={"id"="\d+"}, options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_get_webhook")
+     *
+     * @ParamConverter("webhook", class="SWP\Bundle\WebhookBundle\Model\Webhook")
+     */
+    public function getAction(WebhookInterface $webhook): SingleResourceResponseInterface {
     return $this->getSingleWebhook($webhook);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/webhooks/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_create_webhook")
-   */
-  public function createAction(Request $request): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/webhooks/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_create_webhook")
+     */
+    public function createAction(Request $request): SingleResourceResponseInterface {
     $ruleRepository = $this->webhookRepository;
     $ruleFactory = $this->webhookFactory;
     $formFactory = $this->formFactory;
 
     return $this->createWebhook($ruleRepository, $ruleFactory, $request, $formFactory);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/webhooks/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_core_delete_webhook", requirements={"id"="\d+"})
-   *
-   * @ParamConverter("webhook", class="SWP\Bundle\WebhookBundle\Model\Webhook")
-   */
-  public function deleteAction(WebhookInterface $webhook): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/webhooks/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_core_delete_webhook", requirements={"id"="\d+"})
+     *
+     * @ParamConverter("webhook", class="SWP\Bundle\WebhookBundle\Model\Webhook")
+     */
+    public function deleteAction(WebhookInterface $webhook): SingleResourceResponseInterface {
     $webhookRepository = $this->webhookRepository;
 
     return $this->deleteWebhook($webhookRepository, $webhook);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/webhooks/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_webhook", requirements={"id"="\d+"})
-   *
-   * @ParamConverter("webhook", class="SWP\Bundle\WebhookBundle\Model\Webhook")
-   */
-  public function updateAction(Request $request, WebhookInterface $webhook): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/webhooks/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_webhook", requirements={"id"="\d+"})
+     *
+     * @ParamConverter("webhook", class="SWP\Bundle\WebhookBundle\Model\Webhook")
+     */
+    public function updateAction(Request $request, WebhookInterface $webhook): SingleResourceResponseInterface {
     $objectManager = $this->entityManager;
     $formFactory = $this->formFactory;
 
     return $this->updateWebhook($objectManager, $request, $webhook, $formFactory);
-  }
+    }
 }

src/SWP/Bundle/CoreBundle/Migrations/2021/01/Version20210112135542.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
                     if (is_array($extraItem)) {
                         $extra = ArticleExtraEmbedField::newFromValue($key, $extraItem);
                     } else {
-                        $extra = ArticleExtraTextField::newFromValue($key, (string)$extraItem);
+                        $extra = ArticleExtraTextField::newFromValue($key, (string) $extraItem);
                     }
                     $extra->setArticle($article);
                 }

src/SWP/Bundle/CoreBundle/Command/FillArticleExtraTableCommand.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
                     if (is_array($extraItem)) {
                         $extra = ArticleExtraEmbedField::newFromValue($key, $extraItem);
                     } else {
-                        $extra = ArticleExtraTextField::newFromValue($key, (string)$extraItem);
+                        $extra = ArticleExtraTextField::newFromValue($key, (string) $extraItem);
                     }
                     $extra->setArticle($article);
                 }