From 775d4562bdd273af027bf70d31bfdef62f7386f1 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 12 May 2021 11:56:48 +0200 Subject: [PATCH] PSR 2 compliance --- core/Controller/Admin/AdminController.php | 2 +- core/Controller/Admin/Crud/CrudController.php | 6 +-- core/Controller/Auth/AuthController.php | 2 +- .../Setting/SettingAdminController.php | 4 +- .../Site/NavigationAdminController.php | 3 +- core/Controller/Site/PageAdminController.php | 19 ++++----- core/Controller/Site/PageController.php | 1 - core/Controller/Site/TreeAdminController.php | 3 +- core/Controller/User/UserAdminController.php | 1 - .../EntityManagerEventSubscriber.php | 2 +- .../Site/MenuEventSubscriber.php | 2 +- .../Site/SiteEventSubscriber.php | 3 +- core/Form/Site/NavigationType.php | 2 +- core/Form/Site/Page/Filter/PageFilterType.php | 11 ++--- core/Repository/RepositoryQuery.php | 42 +++++++++---------- .../Site/Page/PageRepositoryQuery.php | 23 +++++----- core/Setting/SettingManager.php | 2 +- core/Twig/Extension/CrudExtension.php | 4 +- src/Entity/User.php | 2 - 19 files changed, 62 insertions(+), 72 deletions(-) diff --git a/core/Controller/Admin/AdminController.php b/core/Controller/Admin/AdminController.php index f7cce81..799ae7a 100644 --- a/core/Controller/Admin/AdminController.php +++ b/core/Controller/Admin/AdminController.php @@ -3,8 +3,8 @@ namespace App\Core\Controller\Admin; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -use Symfony\Component\HttpFoundation\Response; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; +use Symfony\Component\HttpFoundation\Response; abstract class AdminController extends AbstractController { diff --git a/core/Controller/Admin/Crud/CrudController.php b/core/Controller/Admin/Crud/CrudController.php index 76710be..abba5ea 100644 --- a/core/Controller/Admin/Crud/CrudController.php +++ b/core/Controller/Admin/Crud/CrudController.php @@ -18,10 +18,10 @@ use Symfony\Component\HttpFoundation\Session\Session; */ abstract class CrudController extends AdminController { - abstract protected function getConfiguration(): CrudConfiguration; - protected array $filters = []; + abstract protected function getConfiguration(): CrudConfiguration; + protected function doIndex(int $page = 1, RepositoryQuery $query, Request $request, Session $session): Response { $configuration = $this->getConfiguration(); @@ -37,7 +37,7 @@ abstract class CrudController extends AdminController 'configuration' => $configuration, 'pager' => $pager, 'filters' => [ - 'show' => $configuration->getForm('filter') !== null, + 'show' => null !== $configuration->getForm('filter'), 'isEmpty' => empty($this->filters), ], ]); diff --git a/core/Controller/Auth/AuthController.php b/core/Controller/Auth/AuthController.php index 2aa4881..054ce3a 100644 --- a/core/Controller/Auth/AuthController.php +++ b/core/Controller/Auth/AuthController.php @@ -6,6 +6,7 @@ use App\Core\Event\Account\PasswordRequestEvent; use App\Core\Manager\EntityManager; use App\Repository\UserRepository; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -14,7 +15,6 @@ use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface; use Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface; use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; use ZxcvbnPhp\Zxcvbn; -use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; class AuthController extends AbstractController { diff --git a/core/Controller/Setting/SettingAdminController.php b/core/Controller/Setting/SettingAdminController.php index e466193..1cb6ef9 100644 --- a/core/Controller/Setting/SettingAdminController.php +++ b/core/Controller/Setting/SettingAdminController.php @@ -5,7 +5,6 @@ namespace App\Core\Controller\Setting; use App\Core\Controller\Admin\AdminController; use App\Core\Entity\Setting as Entity; use App\Core\Event\Setting\SettingEvent; -use App\Core\Factory\SettingFactory as EntityFactory; use App\Core\Manager\EntityManager; use App\Core\Repository\SettingRepositoryQuery as RepositoryQuery; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -47,8 +46,7 @@ class SettingAdminController extends AdminController EntityManager $entityManager, EventDispatcherInterface $eventDispatcher, Request $request - ): Response - { + ): Response { $builder = $this->createFormBuilder($entity); $eventDispatcher->dispatch(new SettingEvent([ diff --git a/core/Controller/Site/NavigationAdminController.php b/core/Controller/Site/NavigationAdminController.php index 59b4270..816edf6 100644 --- a/core/Controller/Site/NavigationAdminController.php +++ b/core/Controller/Site/NavigationAdminController.php @@ -24,7 +24,8 @@ class NavigationAdminController extends AdminController { $pager = $query ->orderBy('.label, .domain') - ->paginate($page); + ->paginate($page) + ; return $this->render('@Core/site/navigation_admin/index.html.twig', [ 'pager' => $pager, diff --git a/core/Controller/Site/PageAdminController.php b/core/Controller/Site/PageAdminController.php index 257fd55..b363b08 100644 --- a/core/Controller/Site/PageAdminController.php +++ b/core/Controller/Site/PageAdminController.php @@ -5,17 +5,15 @@ namespace App\Core\Controller\Site; use App\Core\Controller\Admin\AdminController; use App\Core\Entity\Site\Page\Page as Entity; use App\Core\Factory\Site\Page\PageFactory as EntityFactory; -use App\Core\Form\Site\Page\PageType as EntityType; use App\Core\Form\Site\Page\Filter\PageFilterType as FilterType; +use App\Core\Form\Site\Page\PageType as EntityType; use App\Core\Manager\EntityManager; -use App\Core\Page\FooPage; -use App\Core\Page\SimplePage; use App\Core\Repository\Site\Page\PageRepositoryQuery as RepositoryQuery; use App\Core\Site\PageLocator; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\HttpFoundation\Session\Session; +use Symfony\Component\Routing\Annotation\Route; /** * @Route("/admin/site/page") @@ -31,7 +29,8 @@ class PageAdminController extends AdminController $pager = $query ->useFilters($this->filters) - ->paginate($page); + ->paginate($page) + ; return $this->render('@Core/site/page_admin/index.html.twig', [ 'pager' => $pager, @@ -104,6 +103,11 @@ class PageAdminController extends AdminController ]); } + public function getSection(): string + { + return 'site_page'; + } + protected function updateFilters(Request $request, Session $session) { if ($request->query->has('page_filter')) { @@ -129,9 +133,4 @@ class PageAdminController extends AdminController $session->set('page_filter', $filters); } } - - public function getSection(): string - { - return 'site_page'; - } } diff --git a/core/Controller/Site/PageController.php b/core/Controller/Site/PageController.php index 6a1a3fb..81a88e4 100644 --- a/core/Controller/Site/PageController.php +++ b/core/Controller/Site/PageController.php @@ -5,7 +5,6 @@ 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; class PageController extends AbstractController diff --git a/core/Controller/Site/TreeAdminController.php b/core/Controller/Site/TreeAdminController.php index bb8f512..876e4b9 100644 --- a/core/Controller/Site/TreeAdminController.php +++ b/core/Controller/Site/TreeAdminController.php @@ -56,7 +56,8 @@ class TreeAdminController extends AdminController ): Response { $navigations = $navigationQuery->create() ->orderBy('.label, .domain') - ->find(); + ->find() + ; $session->set('site_tree_last_navigation', $navigation->getId()); diff --git a/core/Controller/User/UserAdminController.php b/core/Controller/User/UserAdminController.php index 7d7281d..6096cc0 100644 --- a/core/Controller/User/UserAdminController.php +++ b/core/Controller/User/UserAdminController.php @@ -13,7 +13,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; -use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface; /** * @Route("/admin/user") diff --git a/core/EventSuscriber/EntityManagerEventSubscriber.php b/core/EventSuscriber/EntityManagerEventSubscriber.php index 8d663dc..9ba7a91 100644 --- a/core/EventSuscriber/EntityManagerEventSubscriber.php +++ b/core/EventSuscriber/EntityManagerEventSubscriber.php @@ -12,7 +12,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; */ abstract class EntityManagerEventSubscriber implements EventSubscriberInterface { - static protected int $priority = 0; + protected static int $priority = 0; public static function getSubscribedEvents() { diff --git a/core/EventSuscriber/Site/MenuEventSubscriber.php b/core/EventSuscriber/Site/MenuEventSubscriber.php index 56ab531..1edc129 100644 --- a/core/EventSuscriber/Site/MenuEventSubscriber.php +++ b/core/EventSuscriber/Site/MenuEventSubscriber.php @@ -2,6 +2,7 @@ namespace App\Core\EventSuscriber\Site; +use App\Core\Cache\SymfonyCacheManager; use App\Core\Entity\EntityInterface; use App\Core\Entity\Site\Menu; use App\Core\Event\EntityManager\EntityManagerEvent; @@ -10,7 +11,6 @@ use App\Core\Factory\Site\NodeFactory; use App\Core\Manager\EntityManager; use App\Core\Repository\Site\NodeRepository; use App\Core\Slugify\CodeSlugify; -use App\Core\Cache\SymfonyCacheManager; /** * class MenuEventSubscriber. diff --git a/core/EventSuscriber/Site/SiteEventSubscriber.php b/core/EventSuscriber/Site/SiteEventSubscriber.php index db9d5e6..7655cc8 100644 --- a/core/EventSuscriber/Site/SiteEventSubscriber.php +++ b/core/EventSuscriber/Site/SiteEventSubscriber.php @@ -2,15 +2,14 @@ namespace App\Core\EventSuscriber\Site; +use App\Core\Cache\SymfonyCacheManager; 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 Symfony\Component\Finder\Finder; use Symfony\Component\HttpKernel\KernelInterface; -use App\Core\Cache\SymfonyCacheManager; /** * class SiteEventSubscriber. diff --git a/core/Form/Site/NavigationType.php b/core/Form/Site/NavigationType.php index 09f551f..291c7a0 100644 --- a/core/Form/Site/NavigationType.php +++ b/core/Form/Site/NavigationType.php @@ -7,8 +7,8 @@ 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\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\Length; +use Symfony\Component\Validator\Constraints\NotBlank; class NavigationType extends AbstractType { diff --git a/core/Form/Site/Page/Filter/PageFilterType.php b/core/Form/Site/Page/Filter/PageFilterType.php index fc3cc0f..8eebd68 100644 --- a/core/Form/Site/Page/Filter/PageFilterType.php +++ b/core/Form/Site/Page/Filter/PageFilterType.php @@ -2,18 +2,13 @@ namespace App\Core\Form\Site\Page\Filter; -use App\Core\Entity\Site\Page\Page; +use App\Core\Entity\Site\Navigation; +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\FileType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Validator\Constraints\Image; -use Symfony\Component\Validator\Constraints\NotBlank; -use Symfony\Bridge\Doctrine\Form\Type\EntityType; -use App\Core\Entity\Site\Navigation; -use Doctrine\ORM\EntityRepository; class PageFilterType extends AbstractType { diff --git a/core/Repository/RepositoryQuery.php b/core/Repository/RepositoryQuery.php index 8022548..2792efb 100644 --- a/core/Repository/RepositoryQuery.php +++ b/core/Repository/RepositoryQuery.php @@ -74,6 +74,27 @@ abstract class RepositoryQuery return $this->repository; } + public function useFilters(array $filters) + { + foreach ($filters as $name => $value) { + if (null === $value) { + continue; + } + + if (is_int($value) || is_bool($value)) { + $this->andWhere('.'.$name.' = :'.$name); + $this->setParameter(':'.$name, $value); + } elseif (is_string($value)) { + $this->andWhere('.'.$name.' LIKE :'.$name); + $this->setParameter(':'.$name, '%'.$value.'%'); + } else { + $this->filterHandler($name, $value); + } + } + + return $this; + } + protected function populateDqlId(&$data) { if (is_string($data)) { @@ -98,25 +119,4 @@ abstract class RepositoryQuery protected function filterHandler(string $name, $value) { } - - public function useFilters(array $filters) - { - foreach ($filters as $name => $value) { - if (null === $value) { - continue; - } - - if (is_int($value) || is_bool($value)) { - $this->andWhere('.'.$name.' = :'.$name); - $this->setParameter(':'.$name, $value); - } elseif (is_string($value)) { - $this->andWhere('.'.$name.' LIKE :'.$name); - $this->setParameter(':'.$name, '%'.$value.'%'); - } else { - $this->filterHandler($name, $value); - } - } - - return $this; - } } diff --git a/core/Repository/Site/Page/PageRepositoryQuery.php b/core/Repository/Site/Page/PageRepositoryQuery.php index 3746684..efd9145 100644 --- a/core/Repository/Site/Page/PageRepositoryQuery.php +++ b/core/Repository/Site/Page/PageRepositoryQuery.php @@ -2,9 +2,9 @@ namespace App\Core\Repository\Site\Page; +use App\Core\Entity\Site\Navigation; use App\Core\Repository\RepositoryQuery; use Knp\Component\Pager\PaginatorInterface; -use App\Core\Entity\Site\Navigation; /** * class PageRepositoryQuery. @@ -18,15 +18,6 @@ class PageRepositoryQuery extends RepositoryQuery parent::__construct($repository, 'p', $paginator); } - protected function filterHandler(string $name, $value) - { - if ($name === 'navigation') { - return $this->filterByNavigation($value); - } else { - return parent::filterHandler($name, $value); - } - } - public function filterByNavigation(Navigation $navigation) { return $this @@ -34,7 +25,8 @@ class PageRepositoryQuery extends RepositoryQuery ->leftJoin('node.menu', 'menu') ->leftJoin('menu.navigation', 'navigation') ->where('navigation.id = :navigationId') - ->setParameter(':navigationId', $navigation->getId()); + ->setParameter(':navigationId', $navigation->getId()) + ; } public function filterById($id) @@ -46,4 +38,13 @@ class PageRepositoryQuery extends RepositoryQuery return $this; } + + protected function filterHandler(string $name, $value) + { + if ('navigation' === $name) { + return $this->filterByNavigation($value); + } + + return parent::filterHandler($name, $value); + } } diff --git a/core/Setting/SettingManager.php b/core/Setting/SettingManager.php index f6018ec..01d2937 100644 --- a/core/Setting/SettingManager.php +++ b/core/Setting/SettingManager.php @@ -2,10 +2,10 @@ namespace App\Core\Setting; +use App\Core\Entity\Setting; use App\Core\Factory\SettingFactory; use App\Core\Manager\EntityManager; use App\Core\Repository\SettingRepositoryQuery; -use App\Core\Entity\Setting; /** * class SettingManager. diff --git a/core/Twig/Extension/CrudExtension.php b/core/Twig/Extension/CrudExtension.php index 46800fd..480d421 100644 --- a/core/Twig/Extension/CrudExtension.php +++ b/core/Twig/Extension/CrudExtension.php @@ -2,12 +2,12 @@ namespace App\Core\Twig\Extension; +use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\PropertyAccess\PropertyAccess; use Symfony\Component\PropertyAccess\PropertyAccessor; use Twig\Environment; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; -use Symfony\Component\OptionsResolver\OptionsResolver; class CrudExtension extends AbstractExtension { @@ -36,7 +36,7 @@ class CrudExtension extends AbstractExtension public function renderField($entity, array $config): string { $field = $config['field']; - $instance = new $field; + $instance = new $field(); $resolver = $instance->configureOptions(new OptionsResolver()); return $instance->buildView($this->twig, $entity, $resolver->resolve($config['options'])); diff --git a/src/Entity/User.php b/src/Entity/User.php index e533ec9..ac74eb7 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -5,8 +5,6 @@ namespace App\Entity; use App\Core\Doctrine\Timestampable; use App\Core\Entity\EntityInterface; use App\Repository\UserRepository; -use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; use Scheb\TwoFactorBundle\Model\Google\TwoFactorInterface; use Symfony\Component\Security\Core\User\UserInterface;