PSR 2 compliance

src/Bundle/AppBundle.php

@@ -11,9 +11,8 @@
 
 namespace App\Bundle;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
 use App\DependencyInjection\AppExtension;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class AppBundle extends Bundle
 {

src/Controller/Site/NodeAdminController.php

@@ -5,20 +5,20 @@ namespace App\Controller\Site;
 use App\Controller\Admin\AdminController;
 use App\Entity\Site\Node;
 use App\Entity\Site\Node as Entity;
+use App\Entity\Site\Page\Page;
 use App\Event\EntityManager\EntityManagerEvent;
 use App\Factory\Site\NodeFactory as EntityFactory;
+use App\Factory\Site\Page\PageFactory;
 use App\Form\Site\NodeMoveType;
 use App\Form\Site\NodeType as EntityType;
 use App\Manager\EntityManager;
 use App\Repository\Site\NodeRepository;
+use App\Site\PageLocator;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use App\Site\PageLocator;
-use App\Factory\Site\Page\PageFactory;
-use App\Entity\Site\Page\Page;
 
 /**
  * @Route("/admin/site/node")
@@ -134,32 +134,6 @@ class NodeAdminController extends AdminController
         ]);
     }
 
-    protected function handlePageAssociation(
-        string $pageAction,
-        ?Page $pageEntity,
-        string $pageType,
-        Entity $entity,
-        PageFactory $pageFactory,
-        PageLocator $pageLocator
-    )
-    {
-        if ($pageAction === 'new') {
-            $pageConfiguration = $pageLocator->getPage($pageType);
-            $page = $pageFactory->create($pageType, $entity->getLabel());
-            $page->setTemplate($pageConfiguration->getTemplates()[0]['file']);
-
-            $entity->setPage($page);
-        } elseif ($pageAction === 'existing') {
-            if ($pageEntity) {
-                $entity->setPage($pageEntity);
-            } else {
-                $this->addFlash('info', 'Aucun changement de page effectué.');
-            }
-        } elseif ($pageAction === 'none') {
-            $entity->setPage(null);
-        }
-    }
-
     /**
      * @Route("/move/{entity}", name="admin_site_node_move")
      */
@@ -261,4 +235,29 @@ class NodeAdminController extends AdminController
     {
         return '';
     }
+
+    protected function handlePageAssociation(
+        string $pageAction,
+        ?Page $pageEntity,
+        string $pageType,
+        Entity $entity,
+        PageFactory $pageFactory,
+        PageLocator $pageLocator
+    ) {
+        if ('new' === $pageAction) {
+            $pageConfiguration = $pageLocator->getPage($pageType);
+            $page = $pageFactory->create($pageType, $entity->getLabel());
+            $page->setTemplate($pageConfiguration->getTemplates()[0]['file']);
+
+            $entity->setPage($page);
+        } elseif ('existing' === $pageAction) {
+            if ($pageEntity) {
+                $entity->setPage($pageEntity);
+            } else {
+                $this->addFlash('info', 'Aucun changement de page effectué.');
+            }
+        } elseif ('none' === $pageAction) {
+            $entity->setPage(null);
+        }
+    }
 }

src/Controller/Site/PageAdminController.php

@@ -10,10 +10,10 @@ use App\Manager\EntityManager;
 use App\Page\FooPage;
 use App\Page\SimplePage;
 use App\Repository\Site\Page\PageRepositoryQuery as RepositoryQuery;
+use App\Site\PageLocator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use App\Site\PageLocator;
 
 /**
  * @Route("/admin/site/page")

src/Controller/Site/PageController.php

@@ -2,11 +2,10 @@
 
 namespace App\Controller\Site;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\HttpFoundation\Request;
 use App\Site\SiteRequest;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 class PageController extends AbstractController
 {

src/DependencyInjection/AppExtension.php

@@ -4,23 +4,22 @@ namespace App\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
-use App\DependencyInjection\Configuration;
 
 class AppExtension extends Extension
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
 
-		$container->setParameter('app', $config);
+        $container->setParameter('app', $config);
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getConfiguration(array $configs, ContainerBuilder $container)
     {

src/EventSuscriber/Site/NodeEventSubscriber.php

@@ -10,10 +10,10 @@ use App\Factory\Site\NodeFactory;
 use App\Manager\EntityManager;
 use App\Repository\Site\NodeRepository;
 use App\Slugify\Slugify;
-use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;
+use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
  * class NodeEventSubscriber.
@@ -79,7 +79,7 @@ class NodeEventSubscriber extends EntityManagerEventSubscriber
             $number = 1;
 
             while ($this->nodeRepository->urlExists($generatedUrl.'-'.$number, $node)) {
-                $number++;
+                ++$number;
             }
 
             $generatedUrl = $generatedUrl.'-'.$number;

src/Form/Site/NodeType.php

@@ -3,15 +3,15 @@
 namespace App\Form\Site;
 
 use App\Entity\Site\Node;
+use App\Entity\Site\Page\Page;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use App\Entity\Site\Page\Page;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Doctrine\ORM\EntityRepository;
 
 class NodeType extends AbstractType
 {
@@ -77,7 +77,7 @@ class NodeType extends AbstractType
                 'label' => false,
                 'required' => true,
                 'mapped' => false,
-                'choices' => call_user_func(function() use ($options) {
+                'choices' => call_user_func(function () use ($options) {
                     $choices = [];
 
                     foreach ($options['pages'] as $page) {
@@ -111,7 +111,7 @@ class NodeType extends AbstractType
             ]
         );
 
-        if ($builder->getData()->getId() === null) {
+        if (null === $builder->getData()->getId()) {
             $builder->add(
                 'position',
                 ChoiceType::class,

src/Form/Site/Page/PageType.php

@@ -4,11 +4,11 @@ namespace App\Form\Site\Page;
 
 use App\Entity\Site\Page\Page;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
 class PageType extends AbstractType
 {
@@ -86,7 +86,7 @@ class PageType extends AbstractType
             [
                 'label' => 'Rendu',
                 'required' => true,
-                'choices' => call_user_func(function() use ($options) {
+                'choices' => call_user_func(function () use ($options) {
                     $choices = [];
 
                     foreach ($options['pageConfiguration']->getTemplates() as $template) {
@@ -103,7 +103,6 @@ class PageType extends AbstractType
             ]
         );
 
-
         $builder->getData()->buildForm($builder);
     }
 

src/Repository/Site/NodeRepository.php

@@ -17,16 +17,19 @@ class NodeRepository extends NestedTreeRepository
     {
         $query = $this->createQueryBuilder('n')
             ->where('n.url = :url')
-            ->setParameter(':url', $url);
+            ->setParameter(':url', $url)
+        ;
 
         if ($node->getId()) {
             $query
                 ->andWhere('n.id != :id')
-                ->setParameter(':id', $node->getId());
+                ->setParameter(':id', $node->getId())
+            ;
         }
 
         return $query->getQuery()
             ->setMaxResults(1)
-            ->getOneOrNullResult();
+            ->getOneOrNullResult()
+        ;
     }
 }

src/Router/SiteRouteLoader.php

@@ -2,11 +2,11 @@
 
 namespace App\Router;
 
+use App\Controller\Site\PageController;
 use App\Repository\Site\NavigationRepositoryQuery;
 use Symfony\Component\Config\Loader\Loader;
-use Symfony\Component\Routing\RouteCollection;
-use App\Controller\Site\PageController;
 use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 
 /**
  * class SiteRouteLoader.

src/Site/PageLocator.php

@@ -20,6 +20,16 @@ class PageLocator
         $this->loadPages();
     }
 
+    public function getPages(): array
+    {
+        return $this->pages;
+    }
+
+    public function getPage($className)
+    {
+        return $this->pages[$className] ?? null;
+    }
+
     protected function loadPages(): void
     {
         $params = $this->params['site']['pages'] ?? [];
@@ -35,14 +45,4 @@ class PageLocator
             $this->pages[$className] = $pageConfiguration;
         }
     }
-
-    public function getPages(): array
-    {
-        return $this->pages;
-    }
-
-    public function getPage($className)
-    {
-        return $this->pages[$className] ?? null;
-    }
 }

src/Site/SiteRequest.php

@@ -2,14 +2,14 @@
 
 namespace App\Site;
 
+use App\Entity\Site\Menu;
+use App\Entity\Site\Navigation;
 use App\Entity\Site\Node;
 use App\Entity\Site\Page\Page;
 use App\Repository\Site\NavigationRepositoryQuery;
 use App\Repository\Site\NodeRepository;
 use App\Repository\Site\Page\PageRepositoryQuery;
 use Symfony\Component\HttpFoundation\RequestStack;
-use App\Entity\Site\Menu;
-use App\Entity\Site\Navigation;
 
 /**
  * class SiteRequest.