superdesk / web-publisher

src/SWP/Component/TemplatesSystem/Gimme/Context/Context.php

Indentation +12 added lines, -12 removed lines

@@ -131,14 +131,14 @@ 
                 $finder->in($configsPath)->files()->name('*.{yaml,yml}');
                 $files = [];
                 foreach ($finder as $file) {
-                  $files[] = $file->getRealPath();
+                    $files[] = $file->getRealPath();
                 }
                 return $files;
             });
 
-          foreach ($files as $file) {
+            foreach ($files as $file) {
             $this->addNewConfig($file);
-          }
+            }
         }
     }
 
@@ -190,11 +190,11 @@ 
     {
         $cacheKey = md5($filePath);
         $configuration  = $this->metadataCache->get($cacheKey, function () use ($filePath) {
-              if (!is_readable($filePath)) {
-                  throw new \InvalidArgumentException('Configuration file is not readable for parser');
-              }
-              $parser = new Parser();
-              return $parser->parse(file_get_contents($filePath));
+                if (!is_readable($filePath)) {
+                    throw new \InvalidArgumentException('Configuration file is not readable for parser');
+                }
+                $parser = new Parser();
+                return $parser->parse(file_get_contents($filePath));
         });
         $this->addAvailableConfig($configuration);
         $this->supportedCache = [];
@@ -222,15 +222,15 @@ 
     {
         $configuration = $meta->getConfiguration();
         if(array_key_exists("name" ,$configuration)) {
-          $name = $configuration['name'];
-          if (!array_key_exists($name, $this->registeredMeta)) {
+            $name = $configuration['name'];
+            if (!array_key_exists($name, $this->registeredMeta)) {
             $this->registeredMeta[$name] = $configuration;
             if (null !== $meta) {
-              $this[$name] = $meta;
+                $this[$name] = $meta;
             }
 
             return true;
-          }
+            }
         }
 
         return false;

Spacing +3 added lines, -3 removed lines

@@ -126,7 +126,7 @@ 
     public function loadConfigsFromPath($configsPath)
     {
         if (file_exists($configsPath)) {
-            $files = $this->metadataCache->get('metadata_config_files', function () use ($configsPath) {
+            $files = $this->metadataCache->get('metadata_config_files', function() use ($configsPath) {
                 $finder = new Finder();
                 $finder->in($configsPath)->files()->name('*.{yaml,yml}');
                 $files = [];
@@ -189,7 +189,7 @@ 
     public function addNewConfig(string $filePath)
     {
         $cacheKey = md5($filePath);
-        $configuration  = $this->metadataCache->get($cacheKey, function () use ($filePath) {
+        $configuration = $this->metadataCache->get($cacheKey, function() use ($filePath) {
               if (!is_readable($filePath)) {
                   throw new \InvalidArgumentException('Configuration file is not readable for parser');
               }
@@ -221,7 +221,7 @@ 
     public function registerMeta(Meta $meta = null)
     {
         $configuration = $meta->getConfiguration();
-        if(array_key_exists("name" ,$configuration)) {
+        if (array_key_exists("name", $configuration)) {
           $name = $configuration['name'];
           if (!array_key_exists($name, $this->registeredMeta)) {
             $this->registeredMeta[$name] = $configuration;

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

Indentation +68 added lines, -68 removed lines

@@ -41,29 +41,29 @@ 
 use FOS\RestBundle\Controller\Annotations\Route;
 
 class OrganizationRuleController extends AbstractController {
-  private FormFactoryInterface $formFactory;
-  private EventDispatcherInterface $eventDispatcher;
-  private CachedTenantContextInterface $cachedTenantContext;
-  private EntityManagerInterface $entityManager;
-  private RuleRepositoryInterface $ruleRepository;
-  private RulesMatcherInterface $rulesMatcher;
-  private FactoryInterface $ruleFactory;
-  private DataTransformerInterface $dataTransformer;
-
-  /**
-   * @param FormFactoryInterface $formFactory
-   * @param EventDispatcherInterface $eventDispatcher
-   * @param CachedTenantContextInterface $cachedTenantContext
-   * @param EntityManagerInterface $entityManager
-   * @param RuleRepositoryInterface $ruleRepository
-   * @param RulesMatcherInterface $rulesMatcher
-   * @param FactoryInterface $ruleFactory
-   * @param DataTransformerInterface $dataTransformer
-   */
-  public function __construct(FormFactoryInterface         $formFactory, EventDispatcherInterface $eventDispatcher,
-                              CachedTenantContextInterface $cachedTenantContext, EntityManagerInterface $entityManager,
-                              RuleRepositoryInterface      $ruleRepository, RulesMatcherInterface $rulesMatcher,
-                              FactoryInterface             $ruleFactory, DataTransformerInterface $dataTransformer) {
+    private FormFactoryInterface $formFactory;
+    private EventDispatcherInterface $eventDispatcher;
+    private CachedTenantContextInterface $cachedTenantContext;
+    private EntityManagerInterface $entityManager;
+    private RuleRepositoryInterface $ruleRepository;
+    private RulesMatcherInterface $rulesMatcher;
+    private FactoryInterface $ruleFactory;
+    private DataTransformerInterface $dataTransformer;
+
+    /**
+     * @param FormFactoryInterface $formFactory
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param CachedTenantContextInterface $cachedTenantContext
+     * @param EntityManagerInterface $entityManager
+     * @param RuleRepositoryInterface $ruleRepository
+     * @param RulesMatcherInterface $rulesMatcher
+     * @param FactoryInterface $ruleFactory
+     * @param DataTransformerInterface $dataTransformer
+     */
+    public function __construct(FormFactoryInterface         $formFactory, EventDispatcherInterface $eventDispatcher,
+                                CachedTenantContextInterface $cachedTenantContext, EntityManagerInterface $entityManager,
+                                RuleRepositoryInterface      $ruleRepository, RulesMatcherInterface $rulesMatcher,
+                                FactoryInterface             $ruleFactory, DataTransformerInterface $dataTransformer) {
     $this->formFactory = $formFactory;
     $this->eventDispatcher = $eventDispatcher;
     $this->cachedTenantContext = $cachedTenantContext;
@@ -72,13 +72,13 @@ 
     $this->rulesMatcher = $rulesMatcher;
     $this->ruleFactory = $ruleFactory;
     $this->dataTransformer = $dataTransformer;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/organization/rules/evaluate", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_organization_rules_evaluate")
-   */
-  public function rulesEvaluationAction(Request $request): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/organization/rules/evaluate", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_organization_rules_evaluate")
+     */
+    public function rulesEvaluationAction(Request $request): SingleResourceResponseInterface {
     $content = $request->getContent();
     $dispatcher = $this->eventDispatcher;
     $package = $this->dataTransformer->transform($content);
@@ -89,12 +89,12 @@ 
     $context = new ResponseContext();
     $context->setSerializationGroups(['Default', 'api']);
     return new SingleResourceResponse($rules, $context);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/organization/rules/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_organization_rules")
-   */
-  public function rulesAction(Request $request): ResourcesListResponseInterface {
+    /**
+     * @Route("/api/{version}/organization/rules/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_organization_rules")
+     */
+    public function rulesAction(Request $request): ResourcesListResponseInterface {
     $tenantContext = $this->cachedTenantContext;
 
     $this->getEventDispatcher()->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_DISABLE);
@@ -111,12 +111,12 @@ 
     );
 
     return new ResourcesListResponse($rules);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/organization/rules/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_create_organization_rule")
-   */
-  public function createAction(Request $request): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/organization/rules/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_create_organization_rule")
+     */
+    public function createAction(Request $request): SingleResourceResponseInterface {
     $ruleRepository = $this->getRuleRepository();
 
     $rule = $this->ruleFactory->create();
@@ -124,54 +124,54 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $ruleRepository->add($rule);
-      $rule->setTenantCode(null);
-      $ruleRepository->flush();
+        $ruleRepository->add($rule);
+        $rule->setTenantCode(null);
+        $ruleRepository->flush();
 
-      return new SingleResourceResponse($rule, new ResponseContext(201));
+        return new SingleResourceResponse($rule, new ResponseContext(201));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/organization/rules/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_show_organization_rule", requirements={"id"="\d+"})
-   */
-  public function getAction(int $id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/organization/rules/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_show_organization_rule", requirements={"id"="\d+"})
+     */
+    public function getAction(int $id): SingleResourceResponseInterface {
     return new SingleResourceResponse($this->findOr404($id));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/organization/rules/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_organization_rule", requirements={"id"="\d+"})
-   */
-  public function updateRuleAction(Request $request, int $id) {
+    /**
+     * @Route("/api/{version}/organization/rules/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_organization_rule", requirements={"id"="\d+"})
+     */
+    public function updateRuleAction(Request $request, int $id) {
     $objectManager = $this->entityManager;
     $rule = $this->findOr404($id);
     $form = $this->formFactory->createNamed('', RuleType::class, $rule, ['method' => $request->getMethod()]);
 
     $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(500));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/organization/rules/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_core_delete_organization_rule", requirements={"id"="\d+"})
-   */
-  public function deleteAction(int $id) {
+    /**
+     * @Route("/api/{version}/organization/rules/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_core_delete_organization_rule", requirements={"id"="\d+"})
+     */
+    public function deleteAction(int $id) {
     $rule = $this->findOr404($id);
     $ruleRepository = $this->ruleRepository;
     $ruleRepository->remove($rule);
 
     return new SingleResourceResponse(null, new ResponseContext(204));
-  }
+    }
 
-  private function findOr404(int $id) {
+    private function findOr404(int $id) {
     $tenantContext = $this->cachedTenantContext;
     $this->getEventDispatcher()->dispatch(new GenericEvent(), MultiTenancyEvents::TENANTABLE_DISABLE);
 
@@ -180,17 +180,17 @@ 
             'organization' => $tenantContext->getTenant()->getOrganization(),
             'tenantCode' => null,
         ]))) {
-      throw new NotFoundHttpException('Organization rule was not found.');
+        throw new NotFoundHttpException('Organization rule was not found.');
     }
 
     return $rule;
-  }
+    }
 
-  private function getRuleRepository() {
+    private function getRuleRepository() {
     return $this->ruleRepository;
-  }
+    }
 
-  private function getEventDispatcher() {
+    private function getEventDispatcher() {
     return $this->eventDispatcher;
-  }
+    }
 }

src/SWP/Bundle/ContentBundle/Model/Article.php

Spacing +3 added lines, -3 removed lines

@@ -333,7 +333,7 @@ 
     {
         return $this->getExtraCollection()
             ->map(
-                function (ArticleExtraFieldInterface $field) {
+                function(ArticleExtraFieldInterface $field) {
                     return $field->toApiFormat();
                 }
             )->toArray();
@@ -536,8 +536,8 @@ 
             if (is_array($value)) {
                 $this->addEmbedExtra(ArticleExtraEmbedField::newFromValue($key, $value));
             } else {
-                if(is_int($value)) {
-                    $value = (string)$value;
+                if (is_int($value)) {
+                    $value = (string) $value;
                 }
                 $this->addTextExtra(ArticleExtraTextField::newFromValue($key, $value));
             }

src/SWP/Bundle/MenuBundle/Model/MenuItem.php

Spacing +1 added lines, -1 removed lines

@@ -691,7 +691,7 @@
      */
     public function isCurrent(): bool
     {
-        return ($this->isCurrent?true:false);
+        return ($this->isCurrent ?true:false);
     }
 
     /**

src/SWP/Bundle/CoreBundle/Migrations/Version20170207132939.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     {
         // this up() migration is auto-generated, please modify it to your needs
         $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
-	$this->addSql('ALTER TABLE swp_article ADD COLUMN IF NOT EXISTS feature_media INT DEFAULT NULL');
+    $this->addSql('ALTER TABLE swp_article ADD COLUMN IF NOT EXISTS feature_media INT DEFAULT NULL');
         $this->addSql('ALTER TABLE swp_article ADD CONSTRAINT FK_FB21E858A372AB05 FOREIGN KEY (feature_media) REFERENCES swp_article_media (id) ON DELETE SET NULL NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_FB21E858A372AB05 ON swp_article (feature_media)');
     }

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

Spacing +2 added lines, -2 removed lines

@@ -126,9 +126,9 @@
             return $data;
         }
 
-        $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].'";';
         };
 
         $data = preg_replace_callback('!s:(\d+):"(.*?)";!s', $callback, $data);

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/ContentListController.php

Spacing +3 added lines, -3 removed lines

@@ -97,7 +97,7 @@ 
               'secret' => $token,
           ];
 
-          $response = $client->request('POST', $url,  [
+          $response = $client->request('POST', $url, [
               'headers' => $headers,
               'json' => $data,
               'query' => $queryParams
@@ -116,9 +116,9 @@ 
               ]
           ];
 
-          file_put_contents('/tmp/cache_invalidation.json', json_encode($result) . PHP_EOL, FILE_APPEND);
+          file_put_contents('/tmp/cache_invalidation.json', json_encode($result).PHP_EOL, FILE_APPEND);
       } catch (\Throwable $e) {
-          file_put_contents('/tmp/cache_invalidation_errors.json', $e->getMessage() . PHP_EOL, FILE_APPEND);
+          file_put_contents('/tmp/cache_invalidation_errors.json', $e->getMessage().PHP_EOL, FILE_APPEND);
       }
   }
 

Indentation +154 added lines, -154 removed lines

@@ -44,36 +44,36 @@ 
 
 class ContentListController extends AbstractController {
 
-  private ContentListRepositoryInterface $contentListRepository;
-  private ContentListItemRepositoryInterface $contentListItemRepository;
-  private ContentListServiceInterface $contentListService;
-  private FormFactoryInterface $formFactory;
-  private EntityManagerInterface $entityManager;
-  private EventDispatcherInterface $eventDispatcher;
-  private FactoryInterface $factory;
-  private string $invalidationCacheUrl;
-  private string $invalidationToken;
-
-  /**
-   * @param ContentListRepositoryInterface $contentListRepository
-   * @param ContentListItemRepositoryInterface $contentListItemRepository
-   * @param ContentListServiceInterface $contentListService
-   * @param FormFactoryInterface $formFactory
-   * @param EntityManagerInterface $entityManager
-   * @param EventDispatcherInterface $eventDispatcher
-   * @param FactoryInterface $factory
-   */
-  public function __construct(
-      ContentListRepositoryInterface     $contentListRepository,
-      ContentListItemRepositoryInterface $contentListItemRepository,
-      ContentListServiceInterface        $contentListService,
-      FormFactoryInterface               $formFactory,
-      EntityManagerInterface             $entityManager,
-      EventDispatcherInterface           $eventDispatcher,
-      FactoryInterface                   $factory,
-      string $invalidationCacheUrl,
-      string $invalidationToken
-  ) {
+    private ContentListRepositoryInterface $contentListRepository;
+    private ContentListItemRepositoryInterface $contentListItemRepository;
+    private ContentListServiceInterface $contentListService;
+    private FormFactoryInterface $formFactory;
+    private EntityManagerInterface $entityManager;
+    private EventDispatcherInterface $eventDispatcher;
+    private FactoryInterface $factory;
+    private string $invalidationCacheUrl;
+    private string $invalidationToken;
+
+    /**
+     * @param ContentListRepositoryInterface $contentListRepository
+     * @param ContentListItemRepositoryInterface $contentListItemRepository
+     * @param ContentListServiceInterface $contentListService
+     * @param FormFactoryInterface $formFactory
+     * @param EntityManagerInterface $entityManager
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param FactoryInterface $factory
+     */
+    public function __construct(
+        ContentListRepositoryInterface     $contentListRepository,
+        ContentListItemRepositoryInterface $contentListItemRepository,
+        ContentListServiceInterface        $contentListService,
+        FormFactoryInterface               $formFactory,
+        EntityManagerInterface             $entityManager,
+        EventDispatcherInterface           $eventDispatcher,
+        FactoryInterface                   $factory,
+        string $invalidationCacheUrl,
+        string $invalidationToken
+    ) {
     $this->contentListRepository = $contentListRepository;
     $this->contentListItemRepository = $contentListItemRepository;
     $this->contentListService = $contentListService;
@@ -83,65 +83,65 @@ 
     $this->factory = $factory;
     $this->invalidationCacheUrl = $invalidationCacheUrl;
     $this->invalidationToken = $invalidationToken;
-  }
-
-  public static function invalidateCache(string $url, string $token, array $data = [])
-  {
-      try {
-          $client = new Client();
-
-          $headers = [
-              'Content-Type' => 'application/json',
-          ];
-          $queryParams = [
-              'secret' => $token,
-          ];
-
-          $response = $client->request('POST', $url,  [
-              'headers' => $headers,
-              'json' => $data,
-              'query' => $queryParams
-          ]);
-          $responseBody = $response->getBody()->getContents();
-          $result = [
-              'request' => [
-                  'headers' => $headers,
-                  'json' => $data,
-                  'query' => $queryParams
-              ],
-              'response' => [
-                  'status' => $response->getStatusCode(),
-                  'body' => $responseBody,
-                  'ReasonPhrase' => $response->getReasonPhrase()
-              ]
-          ];
-
-          file_put_contents('/tmp/cache_invalidation.json', json_encode($result) . PHP_EOL, FILE_APPEND);
-      } catch (\Throwable $e) {
-          file_put_contents('/tmp/cache_invalidation_errors.json', $e->getMessage() . PHP_EOL, FILE_APPEND);
-      }
-  }
-
-  /**
-   * @Route("/api/{version}/content/lists/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_content_list_lists")
-   */
-  public function listAction(Request $request): ResourcesListResponseInterface {
+    }
+
+    public static function invalidateCache(string $url, string $token, array $data = [])
+    {
+        try {
+            $client = new Client();
+
+            $headers = [
+                'Content-Type' => 'application/json',
+            ];
+            $queryParams = [
+                'secret' => $token,
+            ];
+
+            $response = $client->request('POST', $url,  [
+                'headers' => $headers,
+                'json' => $data,
+                'query' => $queryParams
+            ]);
+            $responseBody = $response->getBody()->getContents();
+            $result = [
+                'request' => [
+                    'headers' => $headers,
+                    'json' => $data,
+                    'query' => $queryParams
+                ],
+                'response' => [
+                    'status' => $response->getStatusCode(),
+                    'body' => $responseBody,
+                    'ReasonPhrase' => $response->getReasonPhrase()
+                ]
+            ];
+
+            file_put_contents('/tmp/cache_invalidation.json', json_encode($result) . PHP_EOL, FILE_APPEND);
+        } catch (\Throwable $e) {
+            file_put_contents('/tmp/cache_invalidation_errors.json', $e->getMessage() . PHP_EOL, FILE_APPEND);
+        }
+    }
+
+    /**
+     * @Route("/api/{version}/content/lists/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_content_list_lists")
+     */
+    public function listAction(Request $request): ResourcesListResponseInterface {
     $lists = $this->contentListRepository->getPaginatedByCriteria($this->eventDispatcher, new Criteria(), $request->query->all('sorting'), new PaginationData($request));
 
     return new ResourcesListResponse($lists);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/lists/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_content_show_lists", requirements={"id"="\d+"})
-   */
-  public function getAction($id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/lists/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_content_show_lists", requirements={"id"="\d+"})
+     */
+    public function getAction($id): SingleResourceResponseInterface {
     return new SingleResourceResponse($this->findOr404($id));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/lists/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_content_create_lists")
-   */
-  public function createAction(Request $request): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/lists/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_content_create_lists")
+     */
+    public function createAction(Request $request): SingleResourceResponseInterface {
     /* @var ContentListInterface $contentList */
     $contentList = $this->factory->create();
     $form = $this->formFactory->createNamed('', ContentListType::class, $contentList, ['method' => $request->getMethod()]);
@@ -150,28 +150,28 @@ 
     $this->ensureContentListExists($contentList->getName());
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $this->contentListRepository->add($contentList);
-      self::invalidateCache(
-          $this->invalidationCacheUrl,
-          $this->invalidationToken,
-          [
-              'id' => $contentList->getId(),
-              'name' => $contentList->getName(),
-              'type' => $contentList->getType(),
-              'action' => 'CREATE'
-          ]
+        $this->contentListRepository->add($contentList);
+        self::invalidateCache(
+            $this->invalidationCacheUrl,
+            $this->invalidationToken,
+            [
+                'id' => $contentList->getId(),
+                'name' => $contentList->getName(),
+                'type' => $contentList->getType(),
+                'action' => 'CREATE'
+            ]
         );
 
-      return new SingleResourceResponse($contentList, new ResponseContext(201));
+        return new SingleResourceResponse($contentList, new ResponseContext(201));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/lists/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_content_update_lists", requirements={"id"="\d+"})
-   */
-  public function updateAction(Request $request, int $id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/lists/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_content_update_lists", requirements={"id"="\d+"})
+     */
+    public function updateAction(Request $request, int $id): SingleResourceResponseInterface {
     $objectManager = $this->entityManager;
     /** @var ContentListInterface $contentList */
     $contentList = $this->findOr404($id);
@@ -182,12 +182,12 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $this->eventDispatcher->dispatch(
-          new GenericEvent($contentList, ['filters' => $filters, 'previousLimit' => $listLimit]),
-          ContentListEvents::LIST_CRITERIA_CHANGE
-      );
+        $this->eventDispatcher->dispatch(
+            new GenericEvent($contentList, ['filters' => $filters, 'previousLimit' => $listLimit]),
+            ContentListEvents::LIST_CRITERIA_CHANGE
+        );
 
-      $objectManager->flush();
+        $objectManager->flush();
         self::invalidateCache(
             $this->invalidationCacheUrl,
             $this->invalidationToken,
@@ -199,54 +199,54 @@ 
             ]
         );
 
-      return new SingleResourceResponse($contentList);
+        return new SingleResourceResponse($contentList);
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/lists/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_content_delete_lists", requirements={"id"="\d+"})
-   */
-  public function deleteAction($id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/lists/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_content_delete_lists", requirements={"id"="\d+"})
+     */
+    public function deleteAction($id): SingleResourceResponseInterface {
     $repository = $this->contentListRepository;
     $contentList = $this->findOr404($id);
 
     $repository->remove($contentList);
-      self::invalidateCache(
-          $this->invalidationCacheUrl,
-          $this->invalidationToken,
-          [
-              'id' => $contentList->getId(),
-              'name' => $contentList->getName(),
-              'type' => $contentList->getType(),
-              'action' => 'DELETE'
-          ]
-      );
+        self::invalidateCache(
+            $this->invalidationCacheUrl,
+            $this->invalidationToken,
+            [
+                'id' => $contentList->getId(),
+                'name' => $contentList->getName(),
+                'type' => $contentList->getType(),
+                'action' => 'DELETE'
+            ]
+        );
 
     return new SingleResourceResponse(null, new ResponseContext(204));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/lists/{id}", requirements={"id"="\w+"}, defaults={"version"="v2"}, methods={"LINK","UNLINK"}, name="swp_api_content_list_link_unlink")
-   */
-  public function linkUnlinkToContentListAction(Request $request, string $id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/lists/{id}", requirements={"id"="\w+"}, defaults={"version"="v2"}, methods={"LINK","UNLINK"}, name="swp_api_content_list_link_unlink")
+     */
+    public function linkUnlinkToContentListAction(Request $request, string $id): SingleResourceResponseInterface {
     $objectManager = $this->entityManager;
     /** @var ContentListInterface $contentList */
     $contentList = $this->findOr404($id);
 
     $matched = false;
     foreach ($request->attributes->get('links', []) as $key => $objectArray) {
-      if (!is_array($objectArray)) {
+        if (!is_array($objectArray)) {
         continue;
-      }
+        }
 
-      $object = $objectArray['object'];
-      if ($object instanceof Exception) {
+        $object = $objectArray['object'];
+        if ($object instanceof Exception) {
         throw $object;
-      }
+        }
 
-      if ($object instanceof ArticleInterface) {
+        if ($object instanceof ArticleInterface) {
         $contentListItem = $this->contentListItemRepository
             ->findOneBy([
                 'contentList' => $contentList,
@@ -254,59 +254,59 @@ 
             ]);
 
         if ('LINK' === $request->getMethod()) {
-          $position = 0;
-          if (count($notConvertedLinks = RequestParser::getNotConvertedLinks($request->attributes->get('links'))) > 0) {
+            $position = 0;
+            if (count($notConvertedLinks = RequestParser::getNotConvertedLinks($request->attributes->get('links'))) > 0) {
             foreach ($notConvertedLinks as $link) {
-              if (isset($link['resourceType']) && 'position' === $link['resourceType']) {
+                if (isset($link['resourceType']) && 'position' === $link['resourceType']) {
                 $position = $link['resource'];
-              }
+                }
+            }
             }
-          }
 
-          if (false === $position && $contentListItem) {
+            if (false === $position && $contentListItem) {
             throw new ConflictHttpException('This content is already linked to Content List');
-          }
+            }
 
-          if (!$contentListItem) {
+            if (!$contentListItem) {
             $contentListItem = $this->contentListService->addArticleToContentList($contentList, $object, $position);
             $objectManager->persist($contentListItem);
-          } else {
+            } else {
             $contentListItem->setPosition($position);
-          }
+            }
 
-          $objectManager->flush();
+            $objectManager->flush();
         } elseif ('UNLINK' === $request->getMethod()) {
-          if ($contentListItem->getContentList() !== $contentList) {
+            if ($contentListItem->getContentList() !== $contentList) {
             throw new ConflictHttpException('Content is not linked to content list');
-          }
-          $objectManager->remove($contentListItem);
+            }
+            $objectManager->remove($contentListItem);
         }
 
         $matched = true;
 
         break;
-      }
+        }
     }
     if (false === $matched) {
-      throw new NotFoundHttpException('Any supported link object was not found');
+        throw new NotFoundHttpException('Any supported link object was not found');
     }
 
     $objectManager->flush();
 
     return new SingleResourceResponse($contentList, new ResponseContext(201));
-  }
+    }
 
-  private function findOr404($id) {
+    private function findOr404($id) {
     if (null === $list = $this->contentListRepository->find($id)) {
-      throw new NotFoundHttpException(sprintf('Content list with id "%s" was not found.', $id));
+        throw new NotFoundHttpException(sprintf('Content list with id "%s" was not found.', $id));
     }
 
     return $list;
-  }
+    }
 
-  private function ensureContentListExists($name) {
+    private function ensureContentListExists($name) {
     if (null !== $this->contentListRepository->findOneBy(['name' => $name])) {
-      throw new ConflictHttpException(sprintf('Content list named "%s" already exists!', $name));
+        throw new ConflictHttpException(sprintf('Content list named "%s" already exists!', $name));
+    }
     }
-  }
 }

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

Indentation +103 added lines, -103 removed lines

@@ -45,41 +45,41 @@ 
 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,
-      string $invalidationCacheUrl,
-      string $invalidationToken
-  ) {
-      $this->contentListItemRepository = $contentListItemRepository;
-      $this->entityManager = $entityManager;
-      $this->contentListService = $contentListService;
-      $this->eventDispatcher = $eventDispatcher;
-      $this->invalidationCacheUrl = $invalidationCacheUrl;
-      $this->invalidationToken = $invalidationToken;
-  }
-
-
-  /**
-   * @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 {
+    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,
+        string $invalidationCacheUrl,
+        string $invalidationToken
+    ) {
+        $this->contentListItemRepository = $contentListItemRepository;
+        $this->entityManager = $entityManager;
+        $this->contentListService = $contentListService;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->invalidationCacheUrl = $invalidationCacheUrl;
+        $this->invalidationToken = $invalidationToken;
+    }
+
+
+    /**
+     * @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(
@@ -112,20 +112,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(
         '',
@@ -137,13 +137,13 @@ 
     $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();
         ContentListController::invalidateCache(
             $this->invalidationCacheUrl,
             $this->invalidationToken,
@@ -155,51 +155,51 @@ 
             ]
         );
 
-      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);
 
@@ -227,7 +227,7 @@ 
             $updatedArticles[$contentId] = $contentListItem->getContent();
 
             break;
-          case ContentListAction::ACTION_ADD:
+            case ContentListAction::ACTION_ADD:
             $this->ensureThereIsNoItemOnPositionOrThrow409(
                 $listId,
                 $position,
@@ -241,7 +241,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'));
@@ -250,17 +250,17 @@ 
 
             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);
-      }
+        }
         ContentListController::invalidateCache(
             $this->invalidationCacheUrl,
             $this->invalidationToken,
@@ -272,13 +272,13 @@ 
             ]
         );
 
-      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,
@@ -286,13 +286,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,
@@ -300,29 +300,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.');
+        }
+    }
 }