From c8156eb709ba2f74e2815d001c2ff5e18a081183 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Tue, 23 Mar 2021 22:27:55 +0100 Subject: [PATCH] PSR 2 compliance --- core/Controller/Site/NodeAdminController.php | 7 ++-- core/Controller/Site/PageController.php | 2 +- core/Entity/Site/Node.php | 2 +- core/Entity/Site/Page/TextBlock.php | 2 -- .../Site/Page/BlockEventSubscriber.php | 5 ++- .../Site/SiteEventSubscriber.php | 36 +++++++++---------- core/Factory/Site/NodeFactory.php | 1 - core/Form/Site/NodeAttributeType.php | 3 +- core/Form/Site/NodeParameterType.php | 2 +- core/Form/Site/NodeSitemapParametersType.php | 1 - core/Form/Site/NodeType.php | 2 +- core/Form/Site/Page/FileBlockType.php | 9 ++--- core/Form/Site/Page/ImageBlockType.php | 9 +---- core/Form/Site/Page/PageType.php | 4 +-- core/Notification/MailNotifier.php | 2 +- .../Site/NavigationRepositoryQuery.php | 3 +- core/Router/SiteRouteLoader.php | 4 +-- core/Site/SiteStore.php | 2 +- core/Twig/Extension/StringExtension.php | 2 +- 19 files changed, 38 insertions(+), 60 deletions(-) diff --git a/core/Controller/Site/NodeAdminController.php b/core/Controller/Site/NodeAdminController.php index cda8e29..9b83a2e 100644 --- a/core/Controller/Site/NodeAdminController.php +++ b/core/Controller/Site/NodeAdminController.php @@ -14,12 +14,12 @@ use App\Core\Form\Site\NodeType as EntityType; use App\Core\Manager\EntityManager; use App\Core\Repository\Site\NodeRepository; use App\Core\Site\PageLocator; +use App\Core\Sitemap\SitemapBuilder; 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\Core\Sitemap\SitemapBuilder; /** * @Route("/admin/site/node") @@ -79,9 +79,8 @@ class NodeAdminController extends AdminController 'navigation' => $node->getMenu()->getNavigation()->getId(), 'data-modal' => $this->generateUrl('admin_site_node_edit', ['entity' => $entity->getId()]), ]); - } else { - $this->addFlash('warning', 'Le formulaire est invalide.'); } + $this->addFlash('warning', 'Le formulaire est invalide.'); return $this->redirectToRoute('admin_site_tree_navigation', [ 'navigation' => $node->getMenu()->getNavigation()->getId(), @@ -147,7 +146,7 @@ class NodeAdminController extends AdminController /** * @Route("/urls/{entity}", name="admin_site_node_urls") */ - public function urls(Entity $entity, SitemapBuilder $builder): Response + public function urls(Entity $entity, SitemapBuilder $builder): Response { return $this->render('@Core/site/node_admin/urls.html.twig', [ 'entity' => $entity, diff --git a/core/Controller/Site/PageController.php b/core/Controller/Site/PageController.php index d85901f..bf08f41 100644 --- a/core/Controller/Site/PageController.php +++ b/core/Controller/Site/PageController.php @@ -3,10 +3,10 @@ namespace App\Core\Controller\Site; use App\Core\Site\SiteRequest; +use App\Core\Site\SiteStore; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use App\Core\Site\SiteStore; class PageController extends AbstractController { diff --git a/core/Entity/Site/Node.php b/core/Entity/Site/Node.php index fe25cf4..b06c339 100644 --- a/core/Entity/Site/Node.php +++ b/core/Entity/Site/Node.php @@ -381,7 +381,7 @@ class Node implements EntityInterface public function getSitemapParameters(): ?array { if (!is_array($this->sitemapParameters)) { - $this->sitemapParameters= [ + $this->sitemapParameters = [ 'isVisible' => false, 'priority' => 0, 'changeFrequency' => 'daily', diff --git a/core/Entity/Site/Page/TextBlock.php b/core/Entity/Site/Page/TextBlock.php index 5b59861..54ec679 100644 --- a/core/Entity/Site/Page/TextBlock.php +++ b/core/Entity/Site/Page/TextBlock.php @@ -2,8 +2,6 @@ namespace App\Core\Entity\Site\Page; -use App\Core\Doctrine\Timestampable; -use App\Core\Repository\Site\Page\BlockRepository; use Doctrine\ORM\Mapping as ORM; /** diff --git a/core/EventSuscriber/Site/Page/BlockEventSubscriber.php b/core/EventSuscriber/Site/Page/BlockEventSubscriber.php index aa98fe5..0cc299f 100644 --- a/core/EventSuscriber/Site/Page/BlockEventSubscriber.php +++ b/core/EventSuscriber/Site/Page/BlockEventSubscriber.php @@ -3,12 +3,11 @@ namespace App\Core\EventSuscriber\Site\Page; use App\Core\Entity\EntityInterface; -use App\Core\Entity\Site\Page\Block; +use App\Core\Entity\Site\Page\FileBlock; +use App\Core\Entity\Site\Page\Page; use App\Core\Event\EntityManager\EntityManagerEvent; use App\Core\EventSuscriber\EntityManagerEventSubscriber; use App\Core\Form\FileUploadHandler; -use App\Core\Entity\Site\Page\FileBlock; -use App\Core\Entity\Site\Page\Page; use Symfony\Component\HttpFoundation\File\UploadedFile; /** diff --git a/core/EventSuscriber/Site/SiteEventSubscriber.php b/core/EventSuscriber/Site/SiteEventSubscriber.php index a4cc73b..cf95a5d 100644 --- a/core/EventSuscriber/Site/SiteEventSubscriber.php +++ b/core/EventSuscriber/Site/SiteEventSubscriber.php @@ -3,19 +3,15 @@ namespace App\Core\EventSuscriber\Site; use App\Core\Entity\EntityInterface; +use App\Core\Entity\Site\Menu; +use App\Core\Entity\Site\Navigation; use App\Core\Entity\Site\Node; use App\Core\Event\EntityManager\EntityManagerEvent; use App\Core\EventSuscriber\EntityManagerEventSubscriber; -use App\Core\Factory\Site\NodeFactory; -use App\Core\Manager\EntityManager; -use App\Core\Repository\Site\NodeRepository; -use App\Core\Slugify\Slugify; use Symfony\Bundle\FrameworkBundle\Console\Application; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Output\BufferedOutput; use Symfony\Component\HttpKernel\KernelInterface; -use App\Core\Entity\Site\Menu; -use App\Core\Entity\Site\Navigation; /** * class SiteEventSubscriber. @@ -26,7 +22,8 @@ class SiteEventSubscriber extends EntityManagerEventSubscriber { protected KernelInterface $kernel; - public function __construct(KernelInterface $kernel) { + public function __construct(KernelInterface $kernel) + { $this->kernel = $kernel; } @@ -35,19 +32,6 @@ class SiteEventSubscriber extends EntityManagerEventSubscriber return $entity instanceof Node || $entity instanceof Menu || $entity instanceof Navigation; } - protected function cleanCache() - { - $application = new Application($this->kernel); - $application->setAutoExit(false); - - $input = new ArrayInput([ - 'command' => 'cache:clear', - ]); - - $output = new BufferedOutput(); - $application->run($input, $output); - } - public function onUpdate(EntityManagerEvent $event) { if (!$this->support($event->getEntity())) { @@ -67,4 +51,16 @@ class SiteEventSubscriber extends EntityManagerEventSubscriber return $this->onUpdate($event); } + protected function cleanCache() + { + $application = new Application($this->kernel); + $application->setAutoExit(false); + + $input = new ArrayInput([ + 'command' => 'cache:clear', + ]); + + $output = new BufferedOutput(); + $application->run($input, $output); + } } diff --git a/core/Factory/Site/NodeFactory.php b/core/Factory/Site/NodeFactory.php index d9aa180..288c0ba 100644 --- a/core/Factory/Site/NodeFactory.php +++ b/core/Factory/Site/NodeFactory.php @@ -24,7 +24,6 @@ class NodeFactory $entity->setUrl($url); } - return $entity; } } diff --git a/core/Form/Site/NodeAttributeType.php b/core/Form/Site/NodeAttributeType.php index 12ff3d5..19bcb6b 100644 --- a/core/Form/Site/NodeAttributeType.php +++ b/core/Form/Site/NodeAttributeType.php @@ -3,9 +3,9 @@ namespace App\Core\Form\Site; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Validator\Constraints\NotBlank; class NodeAttributeType extends AbstractType @@ -38,7 +38,6 @@ class NodeAttributeType extends AbstractType ], ] ); - } public function configureOptions(OptionsResolver $resolver) diff --git a/core/Form/Site/NodeParameterType.php b/core/Form/Site/NodeParameterType.php index acbcb23..93744ad 100644 --- a/core/Form/Site/NodeParameterType.php +++ b/core/Form/Site/NodeParameterType.php @@ -3,9 +3,9 @@ namespace App\Core\Form\Site; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Validator\Constraints\NotBlank; class NodeParameterType extends AbstractType diff --git a/core/Form/Site/NodeSitemapParametersType.php b/core/Form/Site/NodeSitemapParametersType.php index fdc15ee..824976b 100644 --- a/core/Form/Site/NodeSitemapParametersType.php +++ b/core/Form/Site/NodeSitemapParametersType.php @@ -5,7 +5,6 @@ namespace App\Core\Form\Site; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; 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; diff --git a/core/Form/Site/NodeType.php b/core/Form/Site/NodeType.php index 497e11f..a919ca7 100644 --- a/core/Form/Site/NodeType.php +++ b/core/Form/Site/NodeType.php @@ -8,11 +8,11 @@ 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\CollectionType; 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\CollectionType; class NodeType extends AbstractType { diff --git a/core/Form/Site/Page/FileBlockType.php b/core/Form/Site/Page/FileBlockType.php index ea1c41f..7f9de07 100644 --- a/core/Form/Site/Page/FileBlockType.php +++ b/core/Form/Site/Page/FileBlockType.php @@ -2,15 +2,10 @@ namespace App\Core\Form\Site\Page; -use App\Core\Entity\Site\Page\Block; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\Extension\Core\Type\TextType; +use App\Core\Entity\Site\Page\FileBlock; +use Symfony\Component\Form\Extension\Core\Type\FileType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\HttpFoundation\File\File; -use Symfony\Component\Form\CallbackTransformer; -use Symfony\Component\Form\Extension\Core\Type\FileType; -use App\Core\Entity\Site\Page\FileBlock; class FileBlockType extends TextBlockType { diff --git a/core/Form/Site/Page/ImageBlockType.php b/core/Form/Site/Page/ImageBlockType.php index c52e8b8..df651b6 100644 --- a/core/Form/Site/Page/ImageBlockType.php +++ b/core/Form/Site/Page/ImageBlockType.php @@ -2,15 +2,8 @@ namespace App\Core\Form\Site\Page; -use App\Core\Entity\Site\Page\Block; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\Extension\Core\Type\TextType; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\HttpFoundation\File\File; -use Symfony\Component\Form\CallbackTransformer; use Symfony\Component\Form\Extension\Core\Type\FileType; -use App\Core\Entity\Site\Page\FileBlock; +use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints\Image; class ImageBlockType extends FileBlockType diff --git a/core/Form/Site/Page/PageType.php b/core/Form/Site/Page/PageType.php index 649e566..6a67c94 100644 --- a/core/Form/Site/Page/PageType.php +++ b/core/Form/Site/Page/PageType.php @@ -5,12 +5,12 @@ namespace App\Core\Form\Site\Page; use App\Core\Entity\Site\Page\Page; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\FileType; 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\FileType; use Symfony\Component\Validator\Constraints\Image; +use Symfony\Component\Validator\Constraints\NotBlank; class PageType extends AbstractType { diff --git a/core/Notification/MailNotifier.php b/core/Notification/MailNotifier.php index d830c53..63aefd4 100644 --- a/core/Notification/MailNotifier.php +++ b/core/Notification/MailNotifier.php @@ -288,7 +288,7 @@ class MailNotifier { $message = $this->createMessage( $this->twig->render( - sprintf('mail/%s.html.twig', $template), + $template, $data ), $type diff --git a/core/Repository/Site/NavigationRepositoryQuery.php b/core/Repository/Site/NavigationRepositoryQuery.php index 320cd27..a04f0f9 100644 --- a/core/Repository/Site/NavigationRepositoryQuery.php +++ b/core/Repository/Site/NavigationRepositoryQuery.php @@ -21,6 +21,7 @@ class NavigationRepositoryQuery extends RepositoryQuery { return $this ->andWhere('.domain = :domain') - ->setParameter(':domain', $domain); + ->setParameter(':domain', $domain) + ; } } diff --git a/core/Router/SiteRouteLoader.php b/core/Router/SiteRouteLoader.php index d6858e3..885d765 100644 --- a/core/Router/SiteRouteLoader.php +++ b/core/Router/SiteRouteLoader.php @@ -35,7 +35,7 @@ class SiteRouteLoader extends Loader foreach ($navigations as $navigation) { foreach ($navigation->getMenus() as $menu) { foreach ($menu->getRootNode()->getAllChildren() as $node) { - if ($node->getParent() === null) { + if (null === $node->getParent()) { continue; } @@ -58,7 +58,7 @@ class SiteRouteLoader extends Loader if (null !== $parameter['requirement']) { $requirements[$name] = $parameter['requirement']; - }; + } if (null !== $parameter['defaultValue']) { $defaults[$name] = $parameter['defaultValue']; diff --git a/core/Site/SiteStore.php b/core/Site/SiteStore.php index 9264137..1147a68 100644 --- a/core/Site/SiteStore.php +++ b/core/Site/SiteStore.php @@ -3,8 +3,8 @@ namespace App\Core\Site; use App\Core\Entity\Site\Navigation; -use App\Core\Repository\Site\NavigationRepositoryQuery; use App\Core\Entity\Site\Node; +use App\Core\Repository\Site\NavigationRepositoryQuery; /** * class SiteStore. diff --git a/core/Twig/Extension/StringExtension.php b/core/Twig/Extension/StringExtension.php index 749b356..bd816ca 100644 --- a/core/Twig/Extension/StringExtension.php +++ b/core/Twig/Extension/StringExtension.php @@ -2,9 +2,9 @@ namespace App\Core\Twig\Extension; +use App\Core\String\StringBuilder; use Twig\Extension\AbstractExtension; use Twig\TwigFilter; -use App\Core\String\StringBuilder; class StringExtension extends AbstractExtension {