superdesk / web-publisher

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

Indentation +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
         }
         $this->load($name);
         if (array_key_exists($name, $this->copiedValues)) {
-          return $this->copiedValues[$name];
+            return $this->copiedValues[$name];
         }
         return null;
     }

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;

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

Indentation +41 added lines, -41 removed lines

@@ -27,73 +27,73 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class WebhookController extends AbstractAPIController {
-  private WebhookRepositoryInterface $webhookRepository;
-  private FormFactoryInterface $formFactory;
-  private FactoryInterface $webhookFactory;
-  private EntityManagerInterface $entityManager;
-  private EventDispatcherInterface $eventDispatcher;
+    private WebhookRepositoryInterface $webhookRepository;
+    private FormFactoryInterface $formFactory;
+    private FactoryInterface $webhookFactory;
+    private EntityManagerInterface $entityManager;
+    private EventDispatcherInterface $eventDispatcher;
 
-  /**
-   * @param WebhookRepositoryInterface $webhookRepository
-   * @param FormFactoryInterface $formFactory
-   * @param FactoryInterface $webhookFactory
-   * @param EntityManagerInterface $entityManager
-   * @param EventDispatcherInterface $eventDispatcher
-   */
-  public function __construct(WebhookRepositoryInterface $webhookRepository, FormFactoryInterface $formFactory,
-                              FactoryInterface           $webhookFactory, EntityManagerInterface $entityManager,
-                              EventDispatcherInterface            $eventDispatcher) {
+    /**
+     * @param WebhookRepositoryInterface $webhookRepository
+     * @param FormFactoryInterface $formFactory
+     * @param FactoryInterface $webhookFactory
+     * @param EntityManagerInterface $entityManager
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(WebhookRepositoryInterface $webhookRepository, FormFactoryInterface $formFactory,
+                                FactoryInterface           $webhookFactory, EntityManagerInterface $entityManager,
+                                EventDispatcherInterface            $eventDispatcher) {
     $this->webhookRepository = $webhookRepository;
     $this->formFactory = $formFactory;
     $this->webhookFactory = $webhookFactory;
     $this->entityManager = $entityManager;
     $this->eventDispatcher = $eventDispatcher;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/webhooks/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_webhook")
-   */
-  public function listAction(Request $request): ResourcesListResponseInterface {
+    /**
+     * @Route("/api/{version}/webhooks/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_webhook")
+     */
+    public function listAction(Request $request): ResourcesListResponseInterface {
     return $this->listWebhooks($this->eventDispatcher,$this->webhookRepository, $request);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/webhooks/{id}", requirements={"id"="\d+"}, options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_get_webhook")
-   */
-  public function getAction(int $id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/webhooks/{id}", requirements={"id"="\d+"}, options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_get_webhook")
+     */
+    public function getAction(int $id): SingleResourceResponseInterface {
     return $this->getSingleWebhook($this->findOr404($id));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/webhooks/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_create_webhook")
-   */
-  public function createAction(Request $request): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/webhooks/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_create_webhook")
+     */
+    public function createAction(Request $request): SingleResourceResponseInterface {
     $ruleRepository = $this->webhookRepository;
     $ruleFactory = $this->webhookFactory;
     $formFactory = $this->formFactory;
 
     return $this->createWebhook($ruleRepository, $ruleFactory, $request, $formFactory);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/webhooks/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_core_delete_webhook", requirements={"id"="\d+"})
-   */
-  public function deleteAction(int $id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/webhooks/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_core_delete_webhook", requirements={"id"="\d+"})
+     */
+    public function deleteAction(int $id): SingleResourceResponseInterface {
     $webhookRepository = $this->webhookRepository;
 
     return $this->deleteWebhook($webhookRepository, $this->findOr404($id));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/webhooks/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_webhook", requirements={"id"="\d+"})
-   */
-  public function updateAction(Request $request, int $id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/webhooks/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_webhook", requirements={"id"="\d+"})
+     */
+    public function updateAction(Request $request, int $id): SingleResourceResponseInterface {
     $objectManager = $this->entityManager;
     $formFactory = $this->formFactory;
 
     return $this->updateWebhook($objectManager, $request, $this->findOr404($id), $formFactory);
-  }
+    }
 
     private function findOr404(int $id)
     {

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

Indentation +43 added lines, -43 removed lines

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

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

Indentation +57 added lines, -57 removed lines

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

src/SWP/Bundle/ContentBundle/Controller/ContentPushController.php

Indentation +40 added lines, -40 removed lines

@@ -41,14 +41,14 @@ 
 use FOS\RestBundle\Controller\Annotations\Route;
 
 class ContentPushController extends AbstractController {
-  private EventDispatcherInterface $eventDispatcher;
-  private FormFactoryInterface $formFactory;
-  private MessageBusInterface $messageBus;//swp_multi_tenancy.tenant_context
-  private DataTransformerInterface $dataTransformer; // swp_bridge.transformer.json_to_package
-  private MediaManagerInterface $mediaManager; // swp_content_bundle.manager.media
-  private EntityManagerInterface $entityManager; // swp.object_manager.media
-  private PackageRepository $packageRepository;//swp.repository.package
-  private FileProviderInterface $fileProvider;
+    private EventDispatcherInterface $eventDispatcher;
+    private FormFactoryInterface $formFactory;
+    private MessageBusInterface $messageBus;//swp_multi_tenancy.tenant_context
+    private DataTransformerInterface $dataTransformer; // swp_bridge.transformer.json_to_package
+    private MediaManagerInterface $mediaManager; // swp_content_bundle.manager.media
+    private EntityManagerInterface $entityManager; // swp.object_manager.media
+    private PackageRepository $packageRepository;//swp.repository.package
+    private FileProviderInterface $fileProvider;
 
     /**
      * @param EventDispatcherInterface $eventDispatcher
@@ -60,11 +60,11 @@ 
      * @param PackageRepository $packageRepository
      * @param FileProviderInterface $fileProvider
      */
-  public function __construct(EventDispatcherInterface $eventDispatcher, FormFactoryInterface $formFactory,
-                              MessageBusInterface      $messageBus,
-                              DataTransformerInterface $dataTransformer, MediaManagerInterface $mediaManager,
-                              EntityManagerInterface   $entityManager, PackageRepository $packageRepository,
-                              FileProviderInterface    $fileProvider) {
+    public function __construct(EventDispatcherInterface $eventDispatcher, FormFactoryInterface $formFactory,
+                                MessageBusInterface      $messageBus,
+                                DataTransformerInterface $dataTransformer, MediaManagerInterface $mediaManager,
+                                EntityManagerInterface   $entityManager, PackageRepository $packageRepository,
+                                FileProviderInterface    $fileProvider) {
     $this->eventDispatcher = $eventDispatcher;
     $this->formFactory = $formFactory;
     $this->messageBus = $messageBus;
@@ -73,13 +73,13 @@ 
     $this->entityManager = $entityManager;
     $this->packageRepository = $packageRepository;
     $this->fileProvider = $fileProvider;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/content/push", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_push")
-   */
-  public function pushContentAction(Request $request, TenantContextInterface $tenantContext): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/push", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_content_push")
+     */
+    public function pushContentAction(Request $request, TenantContextInterface $tenantContext): SingleResourceResponseInterface {
     $package = $this->dataTransformer->transform($request->getContent());
     $this->eventDispatcher->dispatch(new GenericEvent($package), Events::SWP_VALIDATION);
 
@@ -88,27 +88,27 @@ 
     $this->messageBus->dispatch(new ContentPushMessage($currentTenant->getId(), $request->getContent()));
 
     return new SingleResourceResponse(['status' => 'OK'], new ResponseContext(201));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/assets/push", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_assets_push")
-   */
-  public function pushAssetsAction(Request $request): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/assets/push", methods={"POST"}, options={"expose"=true}, defaults={"version"="v2"}, name="swp_api_assets_push")
+     */
+    public function pushAssetsAction(Request $request): SingleResourceResponseInterface {
     $form = $this->formFactory->createNamed('', MediaFileType::class);
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $mediaManager = $this->mediaManager;
-      $uploadedFile = $form->getData()['media'];
-      $mediaId = $request->request->get('mediaId');
+        $mediaManager = $this->mediaManager;
+        $uploadedFile = $form->getData()['media'];
+        $mediaId = $request->request->get('mediaId');
 
-      if ($uploadedFile->isValid()) {
+        if ($uploadedFile->isValid()) {
         $fileProvider = $this->fileProvider;
         $file = $fileProvider->getFile(ArticleMedia::handleMediaId($mediaId), $uploadedFile->guessExtension());
 
         if (null === $file) {
-          $file = $mediaManager->handleUploadedFile($uploadedFile, $mediaId);
-          $this->entityManager->flush();
+            $file = $mediaManager->handleUploadedFile($uploadedFile, $mediaId);
+            $this->entityManager->flush();
         }
 
         return new SingleResourceResponse(
@@ -121,23 +121,23 @@ 
             ],
             new ResponseContext(201)
         );
-      }
+        }
 
-      throw new \Exception('Uploaded file is not valid:' . $uploadedFile->getErrorMessage());
+        throw new \Exception('Uploaded file is not valid:' . $uploadedFile->getErrorMessage());
     }
 
     return new SingleResourceResponse($form);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/assets/{action}/{mediaId}.{extension}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, requirements={"mediaId"=".+", "action"="get|push"}, name="swp_api_assets_get")
-   */
-  public function getAssetsAction(string $mediaId, string $extension): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/assets/{action}/{mediaId}.{extension}", methods={"GET"}, options={"expose"=true}, defaults={"version"="v2"}, requirements={"mediaId"=".+", "action"="get|push"}, name="swp_api_assets_get")
+     */
+    public function getAssetsAction(string $mediaId, string $extension): SingleResourceResponseInterface {
     $fileProvider = $this->fileProvider;
     $file = $fileProvider->getFile(ArticleMedia::handleMediaId($mediaId), $extension);
 
     if (null === $file) {
-      throw new NotFoundHttpException('Media don\'t exist in storage');
+        throw new NotFoundHttpException('Media don\'t exist in storage');
     }
 
     $mediaManager = $this->mediaManager;
@@ -149,9 +149,9 @@ 
         'mime_type' => MimeTypeHelper::getByExtension($file->getFileExtension()),
         'filemeta' => [],
     ]);
-  }
+    }
 
-  protected function getPackageRepository() {
+    protected function getPackageRepository() {
     return $this->packageRepository;
-  }
+    }
 }

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

Indentation +85 added lines, -85 removed lines

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