superdesk / web-publisher

src/SWP/Bundle/CoreBundle/Util/MimeTypeHelper.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
      * @param bool $all
      * @return array|string
      */
-    public static function getByPath(string $path, bool $all = false): array|string
+    public static function getByPath(string $path, bool $all = false): array | string
     {
         $ext = pathinfo($path, PATHINFO_EXTENSION);
         return self::getByExtension($ext, $all);
@@ -31,7 +31,7 @@ 
      * @param bool $all
      * @return array|string
      */
-    public static function getByExtension(string $ext, bool $all = false): array|string
+    public static function getByExtension(string $ext, bool $all = false): array | string
     {
         $mimeType = MimeTypes::getDefault();
         $types = $mimeType->getMimeTypes($ext);
@@ -52,7 +52,7 @@ 
      * @param bool $all
      * @return array|string
      */
-    public static function getExtensionByMimeType(string $mime, bool $all = false): array|string
+    public static function getExtensionByMimeType(string $mime, bool $all = false): array | string
     {
         $mimeType = MimeTypes::getDefault();
         $extensions = $mimeType->getExtensions($mime);

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

Indentation +106 added lines, -106 removed lines

@@ -43,53 +43,53 @@ 
 
 class RegistrationController extends AbstractController {
 
-  private SettingsManagerInterface $settingsManager;
-  private ScopeContextInterface $scopeContext;
-  private EmailVerifier $emailVerifier;
-  private UserManagerInterface $userManager;
-  private EntityManagerInterface $entityManager;
-
-  /**
-   * @param SettingsManagerInterface $settingsManager
-   * @param ScopeContextInterface $scopeContext
-   * @param EmailVerifier $emailVerifier
-   * @param UserManagerInterface $userManager
-   * @param EntityManagerInterface $entityManager
-   */
-  public function __construct(
-      SettingsManagerInterface $settingsManager,
-      ScopeContextInterface $scopeContext,
-      EmailVerifier $emailVerifier,
-      UserManagerInterface $userManager,
-      EntityManagerInterface   $entityManager
-  ) {
+    private SettingsManagerInterface $settingsManager;
+    private ScopeContextInterface $scopeContext;
+    private EmailVerifier $emailVerifier;
+    private UserManagerInterface $userManager;
+    private EntityManagerInterface $entityManager;
+
+    /**
+     * @param SettingsManagerInterface $settingsManager
+     * @param ScopeContextInterface $scopeContext
+     * @param EmailVerifier $emailVerifier
+     * @param UserManagerInterface $userManager
+     * @param EntityManagerInterface $entityManager
+     */
+    public function __construct(
+        SettingsManagerInterface $settingsManager,
+        ScopeContextInterface $scopeContext,
+        EmailVerifier $emailVerifier,
+        UserManagerInterface $userManager,
+        EntityManagerInterface   $entityManager
+    ) {
     $this->settingsManager = $settingsManager;
     $this->scopeContext = $scopeContext;
     $this->emailVerifier = $emailVerifier;
     $this->userManager = $userManager;
     $this->entityManager = $entityManager;
-  }
-
-
-  /**
-   * @FOSRoute(
-   *     "/api/{version}/users/register/",
-   *     methods={"POST"},
-   *     options={"expose"=true},
-   *     defaults={"version"="v2"},
-   *     name="swp_api_core_register_user"
-   * )
-   */
-  public function registerAction(
-      Request                     $request,
-      UserPasswordHasherInterface $userPasswordEncoder,
-      UserManagerInterface        $userManager,
-      MailerInterface             $mailer
-  ) {
+    }
+
+
+    /**
+     * @FOSRoute(
+     *     "/api/{version}/users/register/",
+     *     methods={"POST"},
+     *     options={"expose"=true},
+     *     defaults={"version"="v2"},
+     *     name="swp_api_core_register_user"
+     * )
+     */
+    public function registerAction(
+        Request                     $request,
+        UserPasswordHasherInterface $userPasswordEncoder,
+        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();
@@ -98,69 +98,69 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $user->addRole('ROLE_USER');
-      // encode the plain password
-      $user->setPassword(
-          $userPasswordEncoder->hashPassword(
-              $user,
-              $form->get('plainPassword')->getData()
-          )
-      );
-
-      $entityManager = $this->entityManager;
-      $entityManager->persist($user);
-      $entityManager->flush();
-
-      $signatureComponents = $this->emailVerifier->getSignatureComponents('swp_user_verify_email', $user);
-      $url = $signatureComponents->getSignedUrl();
-
-      $mailer->sendConfirmationEmail($user, $url);
-
-      return new JsonResponse([
-          'message' => sprintf(
-              'The user has been created successfully.
+        $user->addRole('ROLE_USER');
+        // encode the plain password
+        $user->setPassword(
+            $userPasswordEncoder->hashPassword(
+                $user,
+                $form->get('plainPassword')->getData()
+            )
+        );
+
+        $entityManager = $this->entityManager;
+        $entityManager->persist($user);
+        $entityManager->flush();
+
+        $signatureComponents = $this->emailVerifier->getSignatureComponents('swp_user_verify_email', $user);
+        $url = $signatureComponents->getSignedUrl();
+
+        $mailer->sendConfirmationEmail($user, $url);
+
+        return new JsonResponse([
+            'message' => sprintf(
+                'The user has been created successfully.
                  An email has been sent to %s. It contains an activation link you must click to activate your account.',
-              $user->getEmail()
-          ),
-          'url' => $url,
-      ]);
+                $user->getEmail()
+            ),
+            'url' => $url,
+        ]);
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
-
-  /**
-   * @Route("/verify/email", name="swp_user_verify_email")
-   */
-  public function verifyUserEmail(
-      Request $request,
-      GuardAuthenticatorHandler $guardHandler,
-      LoginAuthenticator $authenticator
-  ): Response {
+    }
+
+    /**
+     * @Route("/verify/email", name="swp_user_verify_email")
+     */
+    public function verifyUserEmail(
+        Request $request,
+        GuardAuthenticatorHandler $guardHandler,
+        LoginAuthenticator $authenticator
+    ): Response {
     $id = (int)$request->get('id'); // retrieve the user id from the url
 
     if ($request->isXmlHttpRequest()) {
-      return $this->verifyUserEmailFromPWA($id, $request);
+        return $this->verifyUserEmailFromPWA($id, $request);
     }
 
     // Verify the user id exists and is not null
     if (null === $id) {
-      return $this->redirectToRoute('homepage');
+        return $this->redirectToRoute('homepage');
     }
 
     $user = $this->userManager->find($id);
 
     // Ensure the user exists in persistence
     if (null === $user) {
-      return $this->redirectToRoute('homepage');
+        return $this->redirectToRoute('homepage');
     }
     // validate email confirmation link, sets User::isVerified=true and persists
     try {
-      $this->emailVerifier->handleEmailConfirmation($request, $user);
+        $this->emailVerifier->handleEmailConfirmation($request, $user);
     } catch (VerifyEmailExceptionInterface $exception) {
-      $this->addFlash('verify_email_error', $exception->getReason());
+        $this->addFlash('verify_email_error', $exception->getReason());
 
-      return $this->redirectToRoute('homepage');
+        return $this->redirectToRoute('homepage');
     }
 
 
@@ -174,63 +174,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.']
     );
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
       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);

src/SWP/Bundle/UserBundle/Security/UserProvider.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         return $user;
     }
 
-    public function loadUserByIdentifier(string $identifier): SecurityUserInterface|UserInterface
+    public function loadUserByIdentifier(string $identifier): SecurityUserInterface | UserInterface
     {
         $user = $this->findUser($identifier);
 

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

Indentation +100 added lines, -100 removed lines

@@ -38,117 +38,117 @@ 
 
 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->loadUserByIdentifier($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'
@@ -156,18 +156,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']);
@@ -177,20 +177,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);
 
@@ -201,36 +201,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/Command/FillArticleExtraTableCommand.php

Spacing +3 added lines, -3 removed lines

@@ -73,7 +73,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);
                     $this->entityManager->persist($extra);
@@ -113,9 +113,9 @@ 
             return $unserialized;
         }
 
-        $callback = function ($matches) {
+        $callback = function($matches) {
             $matches[2] = trim(preg_replace('/\s\s+/', ' ', $matches[2]));
-            return 's:' . mb_strlen($matches[2]) . ':"' . $matches[2] . '";';
+            return 's:'.mb_strlen($matches[2]).':"'.$matches[2].'";';
         };
 
         $fixedData = preg_replace_callback('!s:(\d+):"(.*?)";!s', $callback, $data);

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

Indentation +91 added lines, -91 removed lines

@@ -44,35 +44,35 @@ 
 use FOS\RestBundle\Controller\Annotations\Route;
 
 class ContentListItemController extends AbstractController {
-  private ContentListItemRepositoryInterface $contentListItemRepository;
-  private EntityManagerInterface $entityManager;
-  private ContentListServiceInterface $contentListService;
-  private EventDispatcherInterface $eventDispatcher;
-
-  /**
-   * @param ContentListItemRepositoryInterface $contentListItemRepository
-   * @param EntityManagerInterface $entityManager
-   * @param ContentListServiceInterface $contentListService
-   * @param EventDispatcherInterface $eventDispatcher
-   */
-  public function __construct(ContentListItemRepositoryInterface                          $contentListItemRepository,
-                              EntityManagerInterface                                      $entityManager,
-                              ContentListServiceInterface                                 $contentListService,
-                              EventDispatcherInterface $eventDispatcher) {
+    private ContentListItemRepositoryInterface $contentListItemRepository;
+    private EntityManagerInterface $entityManager;
+    private ContentListServiceInterface $contentListService;
+    private EventDispatcherInterface $eventDispatcher;
+
+    /**
+     * @param ContentListItemRepositoryInterface $contentListItemRepository
+     * @param EntityManagerInterface $entityManager
+     * @param ContentListServiceInterface $contentListService
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(ContentListItemRepositoryInterface                          $contentListItemRepository,
+                                EntityManagerInterface                                      $entityManager,
+                                ContentListServiceInterface                                 $contentListService,
+                                EventDispatcherInterface $eventDispatcher) {
     $this->contentListItemRepository = $contentListItemRepository;
     $this->entityManager = $entityManager;
     $this->contentListService = $contentListService;
     $this->eventDispatcher = $eventDispatcher;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/content/lists/{id}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_items", requirements={"id"="\d+"})
-   */
-  public function listAction(Request $request, int $id): ResourcesListResponseInterface {
+    /**
+     * @Route("/api/{version}/content/lists/{id}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_items", requirements={"id"="\d+"})
+     */
+    public function listAction(Request $request, int $id): ResourcesListResponseInterface {
     $sort = $request->query->all('sorting');
     if (empty($sort)) {
-      $sort = ['sticky' => 'desc'];
+        $sort = ['sticky' => 'desc'];
     }
 
     $items = $this->contentListItemRepository->getPaginatedByCriteria(
@@ -105,20 +105,20 @@ 
     );
 
     return new ResourcesListResponse($items, $responseContext);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_show_lists_item", requirements={"id"="\d+"})
-   */
-  public function getAction($listId, $id) {
+    /**
+     * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_show_lists_item", requirements={"id"="\d+"})
+     */
+    public function getAction($listId, $id) {
     return new SingleResourceResponse($this->findOr404($listId, $id));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_lists_item", requirements={"id"="\d+", "listId"="\d+"})
-   */
-  public function updateAction(Request $request, FormFactoryInterface $formFactory, $listId,
-                                       $id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_lists_item", requirements={"id"="\d+", "listId"="\d+"})
+     */
+    public function updateAction(Request $request, FormFactoryInterface $formFactory, $listId,
+                                        $id): SingleResourceResponseInterface {
     $contentListItem = $this->findOr404($listId, $id);
     $form = $formFactory->createNamed(
         '',
@@ -130,59 +130,59 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $contentListItem->getContentList()->setUpdatedAt(new DateTime());
+        $contentListItem->getContentList()->setUpdatedAt(new DateTime());
 
-      if (null !== $contentListItem->getStickyPosition()) {
+        if (null !== $contentListItem->getStickyPosition()) {
         $contentListItem->setPosition($contentListItem->getStickyPosition());
-      }
+        }
 
-      $this->entityManager->flush();
+        $this->entityManager->flush();
 
-      return new SingleResourceResponse($contentListItem);
+        return new SingleResourceResponse($contentListItem);
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
-
-  /**
-   * @Route("/api/{version}/content/lists/{listId}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_batch_update_lists_item", requirements={"listId"="\d+"})
-   */
-  public function batchUpdateAction(
-      Request                        $request,
-      FormFactoryInterface           $formFactory,
-      ContentListRepositoryInterface $contentListRepository,
-      ArticleRepositoryInterface     $articleRepository,
-      EventDispatcherInterface       $eventDispatcher,
-      int                            $listId
-  ): SingleResourceResponseInterface {
+    }
+
+    /**
+     * @Route("/api/{version}/content/lists/{listId}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_batch_update_lists_item", requirements={"listId"="\d+"})
+     */
+    public function batchUpdateAction(
+        Request                        $request,
+        FormFactoryInterface           $formFactory,
+        ContentListRepositoryInterface $contentListRepository,
+        ArticleRepositoryInterface     $articleRepository,
+        EventDispatcherInterface       $eventDispatcher,
+        int                            $listId
+    ): SingleResourceResponseInterface {
     /** @var ContentListInterface $list */
     $list = $contentListRepository->findOneBy(['id' => $listId]);
     if (null === $list) {
-      throw new NotFoundHttpException(sprintf('Content list with id "%s" was not found.', $list));
+        throw new NotFoundHttpException(sprintf('Content list with id "%s" was not found.', $list));
     }
 
     $form = $formFactory->createNamed('', ContentListItemsType::class, [], ['method' => $request->getMethod()]);
 
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $data = $form->getData();
-      $updatedAt = DateTime::createFromFormat(DateTime::RFC3339, $data['updatedAt'], new DateTimeZone('UTC'));
-      $updatedAt->setTimezone(new DateTimeZone('UTC'));
-      $listUpdatedAt = $list->getUpdatedAt();
-      $listUpdatedAt->setTimezone(new DateTimeZone('UTC'));
-      if ($updatedAt < $listUpdatedAt) {
+        $data = $form->getData();
+        $updatedAt = DateTime::createFromFormat(DateTime::RFC3339, $data['updatedAt'], new DateTimeZone('UTC'));
+        $updatedAt->setTimezone(new DateTimeZone('UTC'));
+        $listUpdatedAt = $list->getUpdatedAt();
+        $listUpdatedAt->setTimezone(new DateTimeZone('UTC'));
+        if ($updatedAt < $listUpdatedAt) {
         throw new ConflictHttpException('List was already updated');
-      }
+        }
 
-      $updatedArticles = [];
-      /** @var ContentListAction $item */
-      foreach ($data['items'] as $item) {
+        $updatedArticles = [];
+        /** @var ContentListAction $item */
+        foreach ($data['items'] as $item) {
         $position = $item->getPosition();
         $isSticky = $item->isSticky();
         $contentId = $item->getContentId();
 
         switch ($item->getAction()) {
-          case ContentListAction::ACTION_MOVE:
+            case ContentListAction::ACTION_MOVE:
             $updated = false;
             $contentListItem = $this->findByContentOr404($list, $contentId);
 
@@ -210,7 +210,7 @@ 
             $updatedArticles[$contentId] = $contentListItem->getContent();
 
             break;
-          case ContentListAction::ACTION_ADD:
+            case ContentListAction::ACTION_ADD:
             $this->ensureThereIsNoItemOnPositionOrThrow409(
                 $listId,
                 $position,
@@ -224,7 +224,7 @@ 
             $updatedArticles[$contentId] = $contentListItem->getContent();
 
             break;
-          case ContentListAction::ACTION_DELETE:
+            case ContentListAction::ACTION_DELETE:
             $contentListItem = $this->findByContentOr404($list, $contentId);
             $this->entityManager->remove($contentListItem);
             $list->setUpdatedAt(new DateTime('now'));
@@ -233,25 +233,25 @@ 
 
             break;
         }
-      }
+        }
 
-      $this->contentListService->repositionStickyItems($list);
+        $this->contentListService->repositionStickyItems($list);
 
-      foreach ($updatedArticles as $updatedArticle) {
+        foreach ($updatedArticles as $updatedArticle) {
         $eventDispatcher->dispatch(new ArticleEvent(
             $updatedArticle,
             $updatedArticle->getPackage(),
             ArticleEvents::POST_UPDATE
         ), ArticleEvents::POST_UPDATE);
-      }
+        }
 
-      return new SingleResourceResponse($list, new ResponseContext(201));
+        return new SingleResourceResponse($list, new ResponseContext(201));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  private function findByContentOr404($listId, $contentId): ContentListItemInterface {
+    private function findByContentOr404($listId, $contentId): ContentListItemInterface {
     /** @var ContentListItemInterface $listItem */
     $listItem = $this->contentListItemRepository->findOneBy([
         'contentList' => $listId,
@@ -259,13 +259,13 @@ 
     ]);
 
     if (null === $listItem) {
-      throw new NotFoundHttpException(sprintf('Content list item with content_id "%s" was not found on that list. If You want to add new item - use action type "add".', $contentId));
+        throw new NotFoundHttpException(sprintf('Content list item with content_id "%s" was not found on that list. If You want to add new item - use action type "add".', $contentId));
     }
 
     return $listItem;
-  }
+    }
 
-  private function findOr404($listId, $id): ContentListItemInterface {
+    private function findOr404($listId, $id): ContentListItemInterface {
     /** @var ContentListItemInterface $listItem */
     $listItem = $this->contentListItemRepository->findOneBy([
         'contentList' => $listId,
@@ -273,29 +273,29 @@ 
     ]);
 
     if (null === $listItem) {
-      throw new NotFoundHttpException(sprintf('Content list item with id "%s" was not found.', $id));
+        throw new NotFoundHttpException(sprintf('Content list item with id "%s" was not found.', $id));
     }
 
     return $listItem;
-  }
+    }
 
-  private function ensureThereIsNoItemOnPositionOrThrow409(
-      int $listId,
-      int $position,
-      bool $isSticky,
-      string $action): void {
-      $existingContentListItem = $this->contentListService->isAnyItemPinnedOnPosition($listId, $position);
+    private function ensureThereIsNoItemOnPositionOrThrow409(
+        int $listId,
+        int $position,
+        bool $isSticky,
+        string $action): void {
+        $existingContentListItem = $this->contentListService->isAnyItemPinnedOnPosition($listId, $position);
 
-      if (!$existingContentListItem && !$isSticky) {
-          return;
-      }
+        if (!$existingContentListItem && !$isSticky) {
+            return;
+        }
 
-      if ($existingContentListItem && $existingContentListItem->isSticky()) {
+        if ($existingContentListItem && $existingContentListItem->isSticky()) {
         throw new ConflictHttpException('There is already an item pinned on that position. Unpin it first.');
-      }
+        }
 
-      if ($action === ContentListAction::ACTION_MOVE && $isSticky) {
-          throw new ConflictHttpException('Cannot move pinned item. Unpin it first.');
-      }
-  }
+        if ($action === ContentListAction::ACTION_MOVE && $isSticky) {
+            throw new ConflictHttpException('Cannot move pinned item. Unpin it first.');
+        }
+    }
 }

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

Spacing +3 added lines, -3 removed lines

@@ -94,15 +94,15 @@
 
             if ($seoMetadata->getMetaMedia()) {
                 $metaImage = $seoMetadata->getMetaMedia()->getImage();
-                $response['_links']['meta_media_url'] = [ 'href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
+                $response['_links']['meta_media_url'] = ['href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
             }
             if ($seoMetadata->getOgMedia()) {
                 $metaImage = $seoMetadata->getOgMedia()->getImage();
-                $response['_links']['og_media_url'] = [ 'href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
+                $response['_links']['og_media_url'] = ['href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
             }
             if ($seoMetadata->getTwitterMedia()) {
                 $metaImage = $seoMetadata->getTwitterMedia()->getImage();
-                $response['_links']['twitter_media_url'] = [ 'href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
+                $response['_links']['twitter_media_url'] = ['href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
             }
 
             return new SingleResourceResponse($response, new ResponseContext(201));

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

Indentation +50 added lines, -50 removed lines

@@ -20,10 +20,10 @@ 
 use FOS\RestBundle\Controller\Annotations\Route;
 
 class SeoMetadataController extends AbstractController {
-  private FormFactoryInterface $formFactory;
-  private FactoryInterface $seoMetadataFactory;
-  private RepositoryInterface $seoMetadataRepository;
-  private EventDispatcherInterface $eventDispatcher;
+    private FormFactoryInterface $formFactory;
+    private FactoryInterface $seoMetadataFactory;
+    private RepositoryInterface $seoMetadataRepository;
+    private EventDispatcherInterface $eventDispatcher;
     protected MediaManagerInterface $mediaManager;
 
     /**
@@ -33,29 +33,29 @@ 
      * @param EventDispatcherInterface $eventDispatcher
      * @param MediaManagerInterface $mediaManager
      */
-  public function __construct(
-      FormFactoryInterface $formFactory,
-      FactoryInterface $seoMetadataFactory,
-      RepositoryInterface  $seoMetadataRepository,
-      EventDispatcherInterface $eventDispatcher,
-      MediaManagerInterface $mediaManager
-  ) {
+    public function __construct(
+        FormFactoryInterface $formFactory,
+        FactoryInterface $seoMetadataFactory,
+        RepositoryInterface  $seoMetadataRepository,
+        EventDispatcherInterface $eventDispatcher,
+        MediaManagerInterface $mediaManager
+    ) {
     $this->formFactory = $formFactory;
     $this->seoMetadataFactory = $seoMetadataFactory;
     $this->seoMetadataRepository = $seoMetadataRepository;
     $this->eventDispatcher = $eventDispatcher;
-      $this->mediaManager = $mediaManager;
-  }
+        $this->mediaManager = $mediaManager;
+    }
 
-  /**
-   * @Route("/api/{version}/packages/seo/{packageGuid}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PUT"}, name="swp_api_core_seo_metadata_put")
-   */
-  public function put(Request $request, string $packageGuid): SingleResourceResponse {
+    /**
+     * @Route("/api/{version}/packages/seo/{packageGuid}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PUT"}, name="swp_api_core_seo_metadata_put")
+     */
+    public function put(Request $request, string $packageGuid): SingleResourceResponse {
     $this->eventDispatcher->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_DISABLE);
 
     $seoMetadata = $this->seoMetadataRepository->findOneByPackageGuid($packageGuid);
     if (null === $seoMetadata) {
-      $seoMetadata = $this->seoMetadataFactory->create();
+        $seoMetadata = $this->seoMetadataFactory->create();
     }
 
     $form = $this->formFactory->createNamed('', SeoMetadataType::class, $seoMetadata, ['method' => $request->getMethod()]);
@@ -63,48 +63,48 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $seoMetadata->setPackageGuid($packageGuid);
-      $this->seoMetadataRepository->add($seoMetadata);
+        $seoMetadata->setPackageGuid($packageGuid);
+        $this->seoMetadataRepository->add($seoMetadata);
 
-      return new SingleResourceResponse($seoMetadata, new ResponseContext(200));
+        return new SingleResourceResponse($seoMetadata, new ResponseContext(200));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/packages/seo/{packageGuid}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_seo_metadata_get")
-   */
-  public function getAction(string $packageGuid): SingleResourceResponse {
+    /**
+     * @Route("/api/{version}/packages/seo/{packageGuid}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_seo_metadata_get")
+     */
+    public function getAction(string $packageGuid): SingleResourceResponse {
     $this->eventDispatcher->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_DISABLE);
 
-      $seoMetadata = $this->seoMetadataRepository->findOneByPackageGuid($packageGuid);
+        $seoMetadata = $this->seoMetadataRepository->findOneByPackageGuid($packageGuid);
     if (null === $seoMetadata) {
-      throw new NotFoundHttpException('SEO metadata not found!');
+        throw new NotFoundHttpException('SEO metadata not found!');
     }
 
-      $response = [
-          "meta_title" => $seoMetadata->getMetaTitle(),
-          "meta_description" => $seoMetadata->getMetaDescription(),
-          "og_title" => $seoMetadata->getOgTitle(),
-          "og_description" => $seoMetadata->getOgDescription(),
-          "twitter_title" => $seoMetadata->getTwitterTitle(),
-          "twitter_description" => $seoMetadata->getTwitterDescription(),
-      ];
-
-      if ($seoMetadata->getMetaMedia()) {
-          $metaImage = $seoMetadata->getMetaMedia()->getImage();
-          $response['_links']['meta_media_url'] = [ 'href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
-      }
-      if ($seoMetadata->getOgMedia()) {
-          $metaImage = $seoMetadata->getOgMedia()->getImage();
-          $response['_links']['og_media_url'] = [ 'href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
-      }
-      if ($seoMetadata->getTwitterMedia()) {
-          $metaImage = $seoMetadata->getTwitterMedia()->getImage();
-          $response['_links']['twitter_media_url'] = [ 'href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
-      }
+        $response = [
+            "meta_title" => $seoMetadata->getMetaTitle(),
+            "meta_description" => $seoMetadata->getMetaDescription(),
+            "og_title" => $seoMetadata->getOgTitle(),
+            "og_description" => $seoMetadata->getOgDescription(),
+            "twitter_title" => $seoMetadata->getTwitterTitle(),
+            "twitter_description" => $seoMetadata->getTwitterDescription(),
+        ];
+
+        if ($seoMetadata->getMetaMedia()) {
+            $metaImage = $seoMetadata->getMetaMedia()->getImage();
+            $response['_links']['meta_media_url'] = [ 'href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
+        }
+        if ($seoMetadata->getOgMedia()) {
+            $metaImage = $seoMetadata->getOgMedia()->getImage();
+            $response['_links']['og_media_url'] = [ 'href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
+        }
+        if ($seoMetadata->getTwitterMedia()) {
+            $metaImage = $seoMetadata->getTwitterMedia()->getImage();
+            $response['_links']['twitter_media_url'] = [ 'href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
+        }
 
     return new SingleResourceResponse($response, new ResponseContext(200));
-  }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -94,15 +94,15 @@
 
       if ($seoMetadata->getMetaMedia()) {
           $metaImage = $seoMetadata->getMetaMedia()->getImage();
-          $response['_links']['meta_media_url'] = [ 'href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
+          $response['_links']['meta_media_url'] = ['href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
       }
       if ($seoMetadata->getOgMedia()) {
           $metaImage = $seoMetadata->getOgMedia()->getImage();
-          $response['_links']['og_media_url'] = [ 'href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
+          $response['_links']['og_media_url'] = ['href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
       }
       if ($seoMetadata->getTwitterMedia()) {
           $metaImage = $seoMetadata->getTwitterMedia()->getImage();
-          $response['_links']['twitter_media_url'] = [ 'href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
+          $response['_links']['twitter_media_url'] = ['href' => $this->mediaManager->getMediaPublicUrl($metaImage)];
       }
 
     return new SingleResourceResponse($response, new ResponseContext(200));

src/SWP/Bundle/CoreBundle/Util/SwpLogger.php

Spacing +3 added lines, -3 removed lines

@@ -5,13 +5,13 @@
 class SwpLogger
 {
 
-    public static function log(string $message,bool $echo = false, string $fileName = 'swp.log')
+    public static function log(string $message, bool $echo = false, string $fileName = 'swp.log')
     {
         $trace = debug_backtrace()[1];
-        $message = '[' . date('Y-m-d H:i:s') . '][' . $trace['class'] . '::' . $trace['function'] . '] ' . $message . PHP_EOL;
+        $message = '['.date('Y-m-d H:i:s').']['.$trace['class'].'::'.$trace['function'].'] '.$message.PHP_EOL;
 
         if (!empty($fileName)) {
-            file_put_contents('/tmp/' . $fileName, $message, FILE_APPEND);
+            file_put_contents('/tmp/'.$fileName, $message, FILE_APPEND);
         }
         if ($echo) {
             echo $message;