From d3f27d97ad3ca36c6092ce806f1a2bae6ec09b05 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 12 Oct 2023 16:15:07 +0200 Subject: [PATCH] apply php linter --- src/core/Analytic/DateRangeAnalytic.php | 4 +- src/core/Bundle/CoreBundle.php | 2 +- src/core/Cache/SymfonyCacheManager.php | 10 ++-- .../Dashboard/DashboardAdminController.php | 2 - .../Redirect/RedirectAdminController.php | 4 +- .../NavigationSettingAdminController.php | 2 +- .../Setting/SettingAdminController.php | 2 +- .../Site/NavigationAdminController.php | 2 +- .../Controller/Site/NodeAdminController.php | 7 +-- .../Controller/Site/PageAdminController.php | 8 +-- .../Controller/User/UserAdminController.php | 1 - src/core/Crud/CrudConfiguration.php | 30 +++++----- src/core/Crud/Field/Field.php | 4 +- src/core/Entity/Analytic/Referer.php | 5 +- src/core/Entity/Analytic/View.php | 5 +- src/core/Entity/Site/Navigation.php | 2 +- src/core/Entity/Site/Page/Page.php | 5 +- .../Event/Account/PasswordRequestEvent.php | 2 +- .../EntityManager/EntityManagerEvent.php | 12 ++-- src/core/Event/Page/PageEditEvent.php | 4 +- .../Event/Setting/NavigationSettingEvent.php | 4 +- src/core/Event/Setting/SettingEvent.php | 4 +- src/core/Event/Task/TaskInitEvent.php | 2 +- src/core/Event/Task/TaskRunRequestedEvent.php | 2 +- src/core/EventListener/AbListener.php | 21 ++++--- src/core/EventListener/RedirectListener.php | 3 +- .../Site/ForcedDomainEventSubscriber.php | 7 ++- src/core/Factory/RedirectFactory.php | 1 - src/core/Form/FileManager/FilePickerType.php | 1 - src/core/Form/Filter/RedirectFilterType.php | 2 - src/core/Form/RedirectType.php | 2 +- src/core/Form/Site/NavigationType.php | 2 +- .../Form/Site/Page/FilePickerBlockType.php | 4 +- .../Form/Site/Page/Filter/PageFilterType.php | 2 +- src/core/Maker/MakeCrudController.php | 2 +- src/core/Maker/MakeFactory.php | 1 - src/core/Maker/MakePage.php | 25 ++++---- src/core/Notification/MailNotifier.php | 2 +- .../Repository/Analytic/RefererRepository.php | 4 +- .../Analytic/RefererRepositoryQuery.php | 2 +- .../Repository/Analytic/ViewRepository.php | 4 +- .../Analytic/ViewRepositoryQuery.php | 2 +- .../Repository/FileInformationRepository.php | 4 +- .../NavigationSettingRepository.php | 4 +- src/core/Repository/RedirectRepository.php | 4 +- .../Repository/RedirectRepositoryQuery.php | 3 +- src/core/Repository/RepositoryQuery.php | 22 +++---- src/core/Repository/SettingRepository.php | 4 +- src/core/Repository/Site/NodeRepository.php | 4 +- .../maker/controller/CrudController.tpl.php | 60 +++++++++---------- .../Resources/maker/factory/Factory.tpl.php | 8 +-- .../Resources/maker/page/PageEntity.tpl.php | 26 ++++---- .../maker/repository/RepositoryQuery.tpl.php | 10 ++-- src/core/Twig/Extension/AbTestExtension.php | 2 +- src/core/Twig/Extension/EditorJsExtension.php | 13 ++-- .../Extension/FileInformationExtension.php | 5 +- src/core/Twig/Extension/GrapesJsExtension.php | 3 - src/core/Twig/Extension/RoutingExtension.php | 4 +- src/core/Twig/Extension/SettingExtension.php | 2 +- src/core/Twig/Extension/UrlExtension.php | 4 +- 60 files changed, 186 insertions(+), 208 deletions(-) diff --git a/src/core/Analytic/DateRangeAnalytic.php b/src/core/Analytic/DateRangeAnalytic.php index 15f46ae..0588b95 100644 --- a/src/core/Analytic/DateRangeAnalytic.php +++ b/src/core/Analytic/DateRangeAnalytic.php @@ -83,7 +83,7 @@ class DateRangeAnalytic $datas[$index]['mobileViews'] += $entity->getMobileViews(); } - uasort($datas, function($a, $b) { + uasort($datas, function ($a, $b) { if ($a['views'] > $b['views']) { return -1; } @@ -130,7 +130,7 @@ class DateRangeAnalytic $datas[$index]['uris'][$path] += $entity->getViews(); } - uasort($datas, function($a, $b) { + uasort($datas, function ($a, $b) { if ($a['views'] > $b['views']) { return -1; } diff --git a/src/core/Bundle/CoreBundle.php b/src/core/Bundle/CoreBundle.php index 034a544..4be0b94 100644 --- a/src/core/Bundle/CoreBundle.php +++ b/src/core/Bundle/CoreBundle.php @@ -12,8 +12,8 @@ namespace App\Core\Bundle; use App\Core\DependencyInjection\CoreExtension; -use Symfony\Component\HttpKernel\Bundle\Bundle; use Symfony\Component\DependencyInjection\Extension\ExtensionInterface; +use Symfony\Component\HttpKernel\Bundle\Bundle; class CoreBundle extends Bundle { diff --git a/src/core/Cache/SymfonyCacheManager.php b/src/core/Cache/SymfonyCacheManager.php index a368cd0..c1ad5e3 100644 --- a/src/core/Cache/SymfonyCacheManager.php +++ b/src/core/Cache/SymfonyCacheManager.php @@ -5,13 +5,13 @@ namespace App\Core\Cache; use Symfony\Bundle\FrameworkBundle\Console\Application; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Output\BufferedOutput; -use Symfony\Component\Finder\Finder; -use Symfony\Component\HttpKernel\KernelInterface; -use Symfony\Contracts\HttpClient\HttpClientInterface; -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; -use Symfony\Component\HttpClient\Exception\ClientException; use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Finder\Finder; +use Symfony\Component\HttpClient\Exception\ClientException; use Symfony\Component\HttpClient\Exception\TransportException; +use Symfony\Component\HttpKernel\KernelInterface; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; +use Symfony\Contracts\HttpClient\HttpClientInterface; /** * class SymfonyCacheManager. diff --git a/src/core/Controller/Dashboard/DashboardAdminController.php b/src/core/Controller/Dashboard/DashboardAdminController.php index e81c9f8..502f84c 100644 --- a/src/core/Controller/Dashboard/DashboardAdminController.php +++ b/src/core/Controller/Dashboard/DashboardAdminController.php @@ -3,8 +3,6 @@ namespace App\Core\Controller\Dashboard; use App\Core\Controller\Admin\AdminController; -use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; class DashboardAdminController extends AdminController { diff --git a/src/core/Controller/Redirect/RedirectAdminController.php b/src/core/Controller/Redirect/RedirectAdminController.php index 8f0eef3..6066db2 100644 --- a/src/core/Controller/Redirect/RedirectAdminController.php +++ b/src/core/Controller/Redirect/RedirectAdminController.php @@ -102,11 +102,11 @@ class RedirectAdminController extends CrudController 'attr' => ['class' => 'col-6'], ]) ->setField('index', 'Enabled', Field\ButtonField::class, [ - 'property_builder' => function(EntityInterface $entity) { + 'property_builder' => function (EntityInterface $entity) { return $entity->getIsEnabled() ? 'Yes' : 'No'; }, 'attr' => ['class' => 'col-1'], - 'button_attr_builder' => function(EntityInterface $entity) { + 'button_attr_builder' => function (EntityInterface $entity) { return ['class' => 'btn btn-sm btn-'.($entity->getIsEnabled() ? 'success' : 'primary')]; }, ]) diff --git a/src/core/Controller/Setting/NavigationSettingAdminController.php b/src/core/Controller/Setting/NavigationSettingAdminController.php index bc431f6..4a3be8f 100644 --- a/src/core/Controller/Setting/NavigationSettingAdminController.php +++ b/src/core/Controller/Setting/NavigationSettingAdminController.php @@ -36,7 +36,7 @@ class NavigationSettingAdminController extends AdminController $lastRequestId = sprintf('setting_request_%s_%s', get_class($entity), $entity->getId()); $lastRequest = $session->get($lastRequestId); - if ($lastRequest !== null && !$request->isMethod('POST')) { + if (null !== $lastRequest && !$request->isMethod('POST')) { $fakeRequest = Request::create( uri: $request->getUri(), method: 'POST', diff --git a/src/core/Controller/Setting/SettingAdminController.php b/src/core/Controller/Setting/SettingAdminController.php index 91f0490..317fe77 100644 --- a/src/core/Controller/Setting/SettingAdminController.php +++ b/src/core/Controller/Setting/SettingAdminController.php @@ -56,7 +56,7 @@ class SettingAdminController extends AdminController $lastRequestId = sprintf('setting_request_%s_%s', get_class($entity), $entity->getId()); $lastRequest = $session->get($lastRequestId); - if ($lastRequest !== null && !$request->isMethod('POST')) { + if (null !== $lastRequest && !$request->isMethod('POST')) { $fakeRequest = Request::create( uri: $request->getUri(), method: 'POST', diff --git a/src/core/Controller/Site/NavigationAdminController.php b/src/core/Controller/Site/NavigationAdminController.php index fe26dc9..d72cf86 100644 --- a/src/core/Controller/Site/NavigationAdminController.php +++ b/src/core/Controller/Site/NavigationAdminController.php @@ -67,7 +67,7 @@ class NavigationAdminController extends CrudController } #[Route(path: '/admin/site/navigation/sort/{page}', name: 'admin_site_navigation_sort', methods: ['POST'], requirements: ['page' => '\d+'])] - public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1, ): Response + public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } diff --git a/src/core/Controller/Site/NodeAdminController.php b/src/core/Controller/Site/NodeAdminController.php index 7f47a47..dfa733b 100644 --- a/src/core/Controller/Site/NodeAdminController.php +++ b/src/core/Controller/Site/NodeAdminController.php @@ -2,7 +2,6 @@ namespace App\Core\Controller\Site; -use App\Core\Controller\Admin\AdminController; use App\Core\Entity\Site\Node; use App\Core\Entity\Site\Node as Entity; use App\Core\Entity\Site\Page\Page; @@ -14,15 +13,15 @@ use App\Core\Form\Site\NodeType as EntityType; use App\Core\Manager\EntityManager; use App\Core\Repository\Site\NodeRepository; use App\Core\Site\ControllerLocator; -use App\Core\Site\RoleLocator; use App\Core\Site\PageLocator; +use App\Core\Site\RoleLocator; use App\Core\Sitemap\SitemapBuilder; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; 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 Symfony\Bundle\FrameworkBundle\Controller\AbstractController; #[Route(path: '/admin/site/node')] class NodeAdminController extends AbstractController @@ -145,7 +144,7 @@ class NodeAdminController extends AbstractController $page = $entity->getPage(); - if ($page !== null) { + if (null !== $page) { $pageConfiguration = $pageLocator->getPages()[get_class($page)] ?? null; } else { $pageConfiguration = null; diff --git a/src/core/Controller/Site/PageAdminController.php b/src/core/Controller/Site/PageAdminController.php index f79db32..57384dc 100644 --- a/src/core/Controller/Site/PageAdminController.php +++ b/src/core/Controller/Site/PageAdminController.php @@ -5,19 +5,19 @@ namespace App\Core\Controller\Site; use App\Core\Controller\Admin\Crud\CrudController; use App\Core\Crud\CrudConfiguration; use App\Core\Crud\Field; +use App\Core\Entity\EntityInterface; use App\Core\Entity\Site\Page\Page as Entity; +use App\Core\Event\Page\PageEditEvent; use App\Core\Form\Site\Page\Filter\PageFilterType as FilterType; use App\Core\Form\Site\Page\PageType as Type; use App\Core\Manager\EntityManager; use App\Core\Repository\Site\Page\PageRepositoryQuery as RepositoryQuery; use App\Core\Site\PageLocator; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\Routing\Annotation\Route; -use App\Core\Event\Page\PageEditEvent; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use App\Core\Entity\EntityInterface; class PageAdminController extends CrudController { @@ -114,7 +114,7 @@ class PageAdminController extends CrudController }], 'attr' => ['class' => 'col-6'], ]) - ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) { + ->setBatchAction('index', 'delete', 'Delete', function (EntityInterface $entity, EntityManager $manager) { $manager->delete($entity); }) ; diff --git a/src/core/Controller/User/UserAdminController.php b/src/core/Controller/User/UserAdminController.php index bb5a807..e2edcda 100644 --- a/src/core/Controller/User/UserAdminController.php +++ b/src/core/Controller/User/UserAdminController.php @@ -17,7 +17,6 @@ use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Session\Session; -use Symfony\Component\Routing\Annotation\Route; class UserAdminController extends CrudController { diff --git a/src/core/Crud/CrudConfiguration.php b/src/core/Crud/CrudConfiguration.php index d5039f5..badea06 100644 --- a/src/core/Crud/CrudConfiguration.php +++ b/src/core/Crud/CrudConfiguration.php @@ -40,7 +40,7 @@ class CrudConfiguration return self::$self; } - /* -- */ + // -- public function setPageTitle(string $page, string $title): self { @@ -54,7 +54,7 @@ class CrudConfiguration return $this->pageTitles[$page] ?? $default; } - /* -- */ + // -- public function setPageRoute(string $page, string $route): self { @@ -80,7 +80,7 @@ class CrudConfiguration return $this->pageRouteParams[$page] ?? []; } - /* -- */ + // -- public function setForm(string $context, string $form): self { @@ -106,7 +106,7 @@ class CrudConfiguration return $this->formOptions[$context] ?? []; } - /* -- */ + // -- public function setAction(string $page, string $action, bool|callable $enabled): self { @@ -140,8 +140,7 @@ class CrudConfiguration string $action, string $label, callable $callback - ): self - { + ): self { $this->setBatchAction($page, $action, $label, $callback); $this->batchActions[$page][$action]['isGlobal'] = true; @@ -153,8 +152,7 @@ class CrudConfiguration string $action, string $label, callable $callback - ): self - { + ): self { if (!isset($this->batchActions[$page])) { $this->batchActions[$page] = []; } @@ -162,7 +160,7 @@ class CrudConfiguration $this->batchActions[$page][$action] = [ 'label' => $label, 'callback' => $callback, - 'isGlobal' => false + 'isGlobal' => false, ]; return $this; @@ -183,7 +181,7 @@ class CrudConfiguration return !empty($this->batchActions[$page]); } - /* -- */ + // -- public function setActionTitle(string $page, string $action, string $title): self { @@ -201,7 +199,7 @@ class CrudConfiguration return $this->actionTitles[$page][$action] ?? $default; } - /* -- */ + // -- public function setView(string $context, string $view): self { @@ -249,7 +247,7 @@ class CrudConfiguration return $this->viewDatas[$context][$name] ?? $defaultValue; } - /* -- */ + // -- public function setField(string $context, string $label, string $field, array $options): self { @@ -277,7 +275,7 @@ class CrudConfiguration return $this; } - /* -- */ + // -- public function setMaxPerPage(string $page, int $max): self { @@ -291,7 +289,7 @@ class CrudConfiguration return $this->maxPerPage[$page] ?? $default; } - /* -- */ + // -- public function setDoubleClick(string $page, bool $enabled): self { @@ -305,7 +303,7 @@ class CrudConfiguration return $this->doubleClick[$page] ?? false; } - /* -- */ + // -- public function setI18n(array $locales, string $defaultLocale): self { @@ -330,7 +328,7 @@ class CrudConfiguration return !empty($this->locales); } - /* -- */ + // -- public function setDefaultSort(string $context, string $label, string $direction = 'asc'): self { diff --git a/src/core/Crud/Field/Field.php b/src/core/Crud/Field/Field.php index 2bffa91..e0c6bd1 100644 --- a/src/core/Crud/Field/Field.php +++ b/src/core/Crud/Field/Field.php @@ -51,8 +51,8 @@ abstract class Field $resolver->setAllowedTypes('href_attr', ['array', 'callable']); $resolver->setAllowedTypes('raw', 'boolean'); $resolver->setAllowedTypes('property_builder', ['null', 'callable']); - $resolver->setAllowedValues('sort', function($value) { - if ($value === null) { + $resolver->setAllowedValues('sort', function ($value) { + if (null === $value) { return true; } diff --git a/src/core/Entity/Analytic/Referer.php b/src/core/Entity/Analytic/Referer.php index 84b145d..c0cf79a 100644 --- a/src/core/Entity/Analytic/Referer.php +++ b/src/core/Entity/Analytic/Referer.php @@ -2,10 +2,9 @@ namespace App\Core\Entity\Analytic; -use App\Core\Entity\Site\Node; -use App\Repository\Entity\Analytic\NodeViewRepository; -use Doctrine\ORM\Mapping as ORM; use App\Core\Entity\EntityInterface; +use App\Core\Entity\Site\Node; +use Doctrine\ORM\Mapping as ORM; #[ORM\Table(name: 'analytic_referer')] #[ORM\Entity(repositoryClass: ViewRepository::class)] diff --git a/src/core/Entity/Analytic/View.php b/src/core/Entity/Analytic/View.php index b2ad763..7068151 100644 --- a/src/core/Entity/Analytic/View.php +++ b/src/core/Entity/Analytic/View.php @@ -2,10 +2,9 @@ namespace App\Core\Entity\Analytic; -use App\Core\Entity\Site\Node; -use App\Repository\Entity\Analytic\NodeViewRepository; -use Doctrine\ORM\Mapping as ORM; use App\Core\Entity\EntityInterface; +use App\Core\Entity\Site\Node; +use Doctrine\ORM\Mapping as ORM; #[ORM\Table(name: 'analytic_view')] #[ORM\Entity(repositoryClass: ViewRepository::class)] diff --git a/src/core/Entity/Site/Navigation.php b/src/core/Entity/Site/Navigation.php index e459b4a..679ec3f 100644 --- a/src/core/Entity/Site/Navigation.php +++ b/src/core/Entity/Site/Navigation.php @@ -43,7 +43,7 @@ class Navigation implements EntityInterface protected $locale = 'en'; #[ORM\Column(type: 'string', length: 7, nullable: true)] - protected $color = null; + protected $color; #[ORM\Column(type: 'integer', nullable: true)] protected $sortOrder; diff --git a/src/core/Entity/Site/Page/Page.php b/src/core/Entity/Site/Page/Page.php index 2ad1138..cfd32d7 100644 --- a/src/core/Entity/Site/Page/Page.php +++ b/src/core/Entity/Site/Page/Page.php @@ -5,13 +5,12 @@ namespace App\Core\Entity\Site\Page; use App\Core\Doctrine\Timestampable; use App\Core\Entity\EntityInterface; use App\Core\Entity\Site\Node; +use App\Core\File\FileAttribute; use App\Core\Repository\Site\Page\PageRepository; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\HttpFoundation\File\File; -use App\Core\File\FileAttribute; #[ORM\Entity(repositoryClass: PageRepository::class)] #[ORM\DiscriminatorColumn(name: 'class_key', type: 'string')] @@ -89,7 +88,7 @@ class Page implements EntityInterface } /** - * @return Collection|Block[] + * @return Block[]|Collection */ public function getBlocks(): Collection { diff --git a/src/core/Event/Account/PasswordRequestEvent.php b/src/core/Event/Account/PasswordRequestEvent.php index b5ec7a0..5f10383 100644 --- a/src/core/Event/Account/PasswordRequestEvent.php +++ b/src/core/Event/Account/PasswordRequestEvent.php @@ -12,7 +12,7 @@ use Symfony\Contracts\EventDispatcher\Event; */ class PasswordRequestEvent extends Event { - const EVENT = 'account_event.password_request'; + public const EVENT = 'account_event.password_request'; protected User $user; diff --git a/src/core/Event/EntityManager/EntityManagerEvent.php b/src/core/Event/EntityManager/EntityManagerEvent.php index 7c5c666..7f37961 100644 --- a/src/core/Event/EntityManager/EntityManagerEvent.php +++ b/src/core/Event/EntityManager/EntityManagerEvent.php @@ -12,12 +12,12 @@ use Symfony\Contracts\EventDispatcher\Event; */ class EntityManagerEvent extends Event { - const CREATE_EVENT = 'entity_manager_event.create'; - const UPDATE_EVENT = 'entity_manager_event.update'; - const DELETE_EVENT = 'entity_manager_event.delete'; - const PRE_CREATE_EVENT = 'entity_manager_event.pre_create'; - const PRE_UPDATE_EVENT = 'entity_manager_event.pre_update'; - const PRE_DELETE_EVENT = 'entity_manager_event.pre_delete'; + public const CREATE_EVENT = 'entity_manager_event.create'; + public const UPDATE_EVENT = 'entity_manager_event.update'; + public const DELETE_EVENT = 'entity_manager_event.delete'; + public const PRE_CREATE_EVENT = 'entity_manager_event.pre_create'; + public const PRE_UPDATE_EVENT = 'entity_manager_event.pre_update'; + public const PRE_DELETE_EVENT = 'entity_manager_event.pre_delete'; protected EntityInterface $entity; diff --git a/src/core/Event/Page/PageEditEvent.php b/src/core/Event/Page/PageEditEvent.php index afa7d3d..9893125 100644 --- a/src/core/Event/Page/PageEditEvent.php +++ b/src/core/Event/Page/PageEditEvent.php @@ -2,8 +2,8 @@ namespace App\Core\Event\Page; -use Symfony\Contracts\EventDispatcher\Event; use App\Core\Entity\Site\Page\Page; +use Symfony\Contracts\EventDispatcher\Event; /** * class PageEditEvent. @@ -12,7 +12,7 @@ use App\Core\Entity\Site\Page\Page; */ class PageEditEvent extends Event { - const FORM_INIT_EVENT = 'page_edit_event.form_init'; + public const FORM_INIT_EVENT = 'page_edit_event.form_init'; protected Page $page; protected array $pageBuilderOptions = []; diff --git a/src/core/Event/Setting/NavigationSettingEvent.php b/src/core/Event/Setting/NavigationSettingEvent.php index 60133c7..9646f63 100644 --- a/src/core/Event/Setting/NavigationSettingEvent.php +++ b/src/core/Event/Setting/NavigationSettingEvent.php @@ -11,8 +11,8 @@ use Symfony\Contracts\EventDispatcher\Event; */ class NavigationSettingEvent extends Event { - const INIT_EVENT = 'navigation_setting_event.init'; - const FORM_INIT_EVENT = 'navigation_setting_event.form_init'; + public const INIT_EVENT = 'navigation_setting_event.init'; + public const FORM_INIT_EVENT = 'navigation_setting_event.form_init'; protected $data; diff --git a/src/core/Event/Setting/SettingEvent.php b/src/core/Event/Setting/SettingEvent.php index f5a8805..aa9713e 100644 --- a/src/core/Event/Setting/SettingEvent.php +++ b/src/core/Event/Setting/SettingEvent.php @@ -11,8 +11,8 @@ use Symfony\Contracts\EventDispatcher\Event; */ class SettingEvent extends Event { - const INIT_EVENT = 'setting_event.init'; - const FORM_INIT_EVENT = 'setting_event.form_init'; + public const INIT_EVENT = 'setting_event.init'; + public const FORM_INIT_EVENT = 'setting_event.form_init'; protected $data; diff --git a/src/core/Event/Task/TaskInitEvent.php b/src/core/Event/Task/TaskInitEvent.php index d436195..33fbdf5 100644 --- a/src/core/Event/Task/TaskInitEvent.php +++ b/src/core/Event/Task/TaskInitEvent.php @@ -11,7 +11,7 @@ use Symfony\Contracts\EventDispatcher\Event; */ class TaskInitEvent extends Event { - const INIT_EVENT = 'task_event.init'; + public const INIT_EVENT = 'task_event.init'; protected array $tasks = []; diff --git a/src/core/Event/Task/TaskRunRequestedEvent.php b/src/core/Event/Task/TaskRunRequestedEvent.php index d25ed89..d5ba7d0 100644 --- a/src/core/Event/Task/TaskRunRequestedEvent.php +++ b/src/core/Event/Task/TaskRunRequestedEvent.php @@ -14,7 +14,7 @@ use Symfony\Contracts\EventDispatcher\Event; */ class TaskRunRequestedEvent extends Event { - const RUN_REQUEST_EVENT = 'task_event.run_request'; + public const RUN_REQUEST_EVENT = 'task_event.run_request'; protected string $task; protected InputBag $parameters; diff --git a/src/core/EventListener/AbListener.php b/src/core/EventListener/AbListener.php index 03ba6f2..87fb2a5 100644 --- a/src/core/EventListener/AbListener.php +++ b/src/core/EventListener/AbListener.php @@ -6,7 +6,6 @@ use App\Core\Ab\AbContainer; use App\Core\Ab\AbTest; use App\Core\Entity\Site\Node; use App\Core\Event\Ab\AbTestEvent; -use App\Core\Repository\Site\NodeRepository; use App\Core\Site\SiteRequest; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Cookie; @@ -70,6 +69,16 @@ class AbListener } } + public function onKernelResponse(ResponseEvent $event) + { + $cookies = $event->getRequest()->attributes->get('ab_test_cookies', []); + + foreach ($cookies as $name => $value) { + $cookie = Cookie::create($name, $value['value'], time() + $value['duration']); + $event->getResponse()->headers->setCookie($cookie); + } + } + protected function getCookieName(): string { return 'ab_test_'.$this->getAbTestCode(); @@ -96,14 +105,4 @@ class AbListener return true; } - - public function onKernelResponse(ResponseEvent $event) - { - $cookies = $event->getRequest()->attributes->get('ab_test_cookies', []); - - foreach ($cookies as $name => $value) { - $cookie = Cookie::create($name, $value['value'], time() + $value['duration']); - $event->getResponse()->headers->setCookie($cookie); - } - } } diff --git a/src/core/EventListener/RedirectListener.php b/src/core/EventListener/RedirectListener.php index f0c598f..750a613 100644 --- a/src/core/EventListener/RedirectListener.php +++ b/src/core/EventListener/RedirectListener.php @@ -3,11 +3,10 @@ namespace App\Core\EventListener; use App\Core\Repository\RedirectRepositoryQuery; +use App\Core\Router\RedirectBuilder; use App\Core\Router\RedirectMatcher; -use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpKernel\Event\ExceptionEvent; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use App\Core\Router\RedirectBuilder; /** * class RedirectListener. diff --git a/src/core/EventSubscriber/Site/ForcedDomainEventSubscriber.php b/src/core/EventSubscriber/Site/ForcedDomainEventSubscriber.php index 5aa86fe..f823199 100644 --- a/src/core/EventSubscriber/Site/ForcedDomainEventSubscriber.php +++ b/src/core/EventSubscriber/Site/ForcedDomainEventSubscriber.php @@ -4,9 +4,9 @@ namespace App\Core\EventSubscriber\Site; use App\Core\Site\SiteRequest; use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Symfony\Component\HttpKernel\KernelEvents; -use Symfony\Component\HttpKernel\Event\ResponseEvent; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Event\ResponseEvent; +use Symfony\Component\HttpKernel\KernelEvents; use function Symfony\Component\String\u; class ForcedDomainEventSubscriber implements EventSubscriberInterface @@ -38,7 +38,8 @@ class ForcedDomainEventSubscriber implements EventSubscriberInterface ->replace( '://'.$this->siteRequest->getDomain(), '://'.$navigation->getDomain() - ); + ) + ; $event->getResponse()->headers->set('Location', $uri); $event->getResponse()->setStatusCode(Response::HTTP_MOVED_PERMANENTLY); diff --git a/src/core/Factory/RedirectFactory.php b/src/core/Factory/RedirectFactory.php index d7a138a..cb1fe5f 100644 --- a/src/core/Factory/RedirectFactory.php +++ b/src/core/Factory/RedirectFactory.php @@ -2,7 +2,6 @@ namespace App\Core\Factory; -use App\Core\Factory\FactoryInterface; use App\Core\Entity\Redirect as Entity; class RedirectFactory implements FactoryInterface diff --git a/src/core/Form/FileManager/FilePickerType.php b/src/core/Form/FileManager/FilePickerType.php index 666c789..2dbcd2c 100644 --- a/src/core/Form/FileManager/FilePickerType.php +++ b/src/core/Form/FileManager/FilePickerType.php @@ -6,7 +6,6 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; -use Symfony\Component\Form\Extension\Core\Type\HiddenType; class FilePickerType extends AbstractType { diff --git a/src/core/Form/Filter/RedirectFilterType.php b/src/core/Form/Filter/RedirectFilterType.php index 2cf4cd4..c694663 100644 --- a/src/core/Form/Filter/RedirectFilterType.php +++ b/src/core/Form/Filter/RedirectFilterType.php @@ -2,13 +2,11 @@ namespace App\Core\Form\Filter; -use App\Core\Entity\Redirect; 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; class RedirectFilterType extends AbstractType { diff --git a/src/core/Form/RedirectType.php b/src/core/Form/RedirectType.php index 3acce35..ef2b836 100644 --- a/src/core/Form/RedirectType.php +++ b/src/core/Form/RedirectType.php @@ -4,12 +4,12 @@ namespace App\Core\Form; use App\Core\Entity\Redirect; 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; -use Symfony\Component\Form\Extension\Core\Type\CheckboxType; class RedirectType extends AbstractType { diff --git a/src/core/Form/Site/NavigationType.php b/src/core/Form/Site/NavigationType.php index 4d7ec5c..01cc54e 100644 --- a/src/core/Form/Site/NavigationType.php +++ b/src/core/Form/Site/NavigationType.php @@ -6,12 +6,12 @@ use App\Core\Entity\Site\Navigation; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CollectionType; +use Symfony\Component\Form\Extension\Core\Type\ColorType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Validator\Constraints\Length; use Symfony\Component\Validator\Constraints\NotBlank; -use Symfony\Component\Form\Extension\Core\Type\ColorType; class NavigationType extends AbstractType { diff --git a/src/core/Form/Site/Page/FilePickerBlockType.php b/src/core/Form/Site/Page/FilePickerBlockType.php index 85a7ed9..87d87af 100644 --- a/src/core/Form/Site/Page/FilePickerBlockType.php +++ b/src/core/Form/Site/Page/FilePickerBlockType.php @@ -2,11 +2,11 @@ namespace App\Core\Form\Site\Page; +use App\Core\Entity\Site\Page\Block; use App\Core\Form\FileManager\FilePickerType; +use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Form\AbstractType; -use App\Core\Entity\Site\Page\Block; class FilePickerBlockType extends AbstractType { diff --git a/src/core/Form/Site/Page/Filter/PageFilterType.php b/src/core/Form/Site/Page/Filter/PageFilterType.php index 0aee47f..09c8331 100644 --- a/src/core/Form/Site/Page/Filter/PageFilterType.php +++ b/src/core/Form/Site/Page/Filter/PageFilterType.php @@ -6,10 +6,10 @@ 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\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Form\Extension\Core\Type\ChoiceType; class PageFilterType extends AbstractType { diff --git a/src/core/Maker/MakeCrudController.php b/src/core/Maker/MakeCrudController.php index fcec46d..f24e4a1 100644 --- a/src/core/Maker/MakeCrudController.php +++ b/src/core/Maker/MakeCrudController.php @@ -11,8 +11,8 @@ use Symfony\Bundle\MakerBundle\Maker\AbstractMaker; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; -use function Symfony\Component\String\u; use Symfony\Component\Filesystem\Filesystem; +use function Symfony\Component\String\u; class MakeCrudController extends AbstractMaker { diff --git a/src/core/Maker/MakeFactory.php b/src/core/Maker/MakeFactory.php index 4ed7369..9fd007a 100644 --- a/src/core/Maker/MakeFactory.php +++ b/src/core/Maker/MakeFactory.php @@ -11,7 +11,6 @@ use Symfony\Bundle\MakerBundle\Maker\AbstractMaker; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; -use function Symfony\Component\String\u; class MakeFactory extends AbstractMaker { diff --git a/src/core/Maker/MakePage.php b/src/core/Maker/MakePage.php index 5243d25..12a02b2 100644 --- a/src/core/Maker/MakePage.php +++ b/src/core/Maker/MakePage.php @@ -8,11 +8,11 @@ use Symfony\Bundle\MakerBundle\DependencyBuilder; use Symfony\Bundle\MakerBundle\Generator; use Symfony\Bundle\MakerBundle\InputConfiguration; use Symfony\Bundle\MakerBundle\Maker\AbstractMaker; +use Symfony\Bundle\MakerBundle\Str; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Question\Question; -use Symfony\Bundle\MakerBundle\Str; use Symfony\Component\Filesystem\Filesystem; class MakePage extends AbstractMaker @@ -92,7 +92,8 @@ class MakePage extends AbstractMaker $this->writeSuccessMessage($io); $io->text('Register the page in config/packages/app.yaml: '); - $io->text(<<< EOF + $io->text( + <<< EOF core: site: @@ -100,10 +101,18 @@ core: {$pageClassNameDetails->getFullName()}: name: {$pageClassNameDetails->getShortName()} templates: - - {name: "Default", file: "${templatePath}"} + - {name: "Default", file: "{$templatePath}"} EOF -); + ); + } + + public function configureDependencies(DependencyBuilder $dependencies) + { + $dependencies->addClassDependency( + Annotation::class, + 'doctrine/annotations' + ); } private function askForNextBlock(ConsoleStyle $io, array $blocks, bool $isFirstField) @@ -183,12 +192,4 @@ EOF $io->writeln(sprintf(' * %s', $type)); } } - - public function configureDependencies(DependencyBuilder $dependencies) - { - $dependencies->addClassDependency( - Annotation::class, - 'doctrine/annotations' - ); - } } diff --git a/src/core/Notification/MailNotifier.php b/src/core/Notification/MailNotifier.php index e2a71e2..f788e0b 100644 --- a/src/core/Notification/MailNotifier.php +++ b/src/core/Notification/MailNotifier.php @@ -2,10 +2,10 @@ namespace App\Core\Notification; +use App\Entity\User; use Symfony\Bridge\Twig\Mime\TemplatedEmail; use Symfony\Component\Mailer\MailerInterface; use Twig\Environment as TwigEnvironment; -use App\Entity\User; /** * class MailNotifier. diff --git a/src/core/Repository/Analytic/RefererRepository.php b/src/core/Repository/Analytic/RefererRepository.php index 2bd6b73..a24de60 100644 --- a/src/core/Repository/Analytic/RefererRepository.php +++ b/src/core/Repository/Analytic/RefererRepository.php @@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; /** - * @method Referer|null find($id, $lockMode = null, $lockVersion = null) - * @method Referer|null findOneBy(array $criteria, array $orderBy = null) + * @method null|Referer find($id, $lockMode = null, $lockVersion = null) + * @method null|Referer findOneBy(array $criteria, array $orderBy = null) * @method Referer[] findAll() * @method Referer[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) */ diff --git a/src/core/Repository/Analytic/RefererRepositoryQuery.php b/src/core/Repository/Analytic/RefererRepositoryQuery.php index 3b052be..579b6e3 100644 --- a/src/core/Repository/Analytic/RefererRepositoryQuery.php +++ b/src/core/Repository/Analytic/RefererRepositoryQuery.php @@ -3,9 +3,9 @@ namespace App\Core\Repository\Analytic; use App\Core\Repository\Analytic\RefererRepository as Repository; +use App\Core\Repository\RepositoryQuery; use Knp\Component\Pager\PaginatorInterface; use Symfony\Component\HttpFoundation\Request; -use App\Core\Repository\RepositoryQuery; class RefererRepositoryQuery extends RepositoryQuery { diff --git a/src/core/Repository/Analytic/ViewRepository.php b/src/core/Repository/Analytic/ViewRepository.php index 4ddf0a3..5cf6cda 100644 --- a/src/core/Repository/Analytic/ViewRepository.php +++ b/src/core/Repository/Analytic/ViewRepository.php @@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; /** - * @method View|null find($id, $lockMode = null, $lockVersion = null) - * @method View|null findOneBy(array $criteria, array $orderBy = null) + * @method null|View find($id, $lockMode = null, $lockVersion = null) + * @method null|View findOneBy(array $criteria, array $orderBy = null) * @method View[] findAll() * @method View[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) */ diff --git a/src/core/Repository/Analytic/ViewRepositoryQuery.php b/src/core/Repository/Analytic/ViewRepositoryQuery.php index 0fcae6d..49a6058 100644 --- a/src/core/Repository/Analytic/ViewRepositoryQuery.php +++ b/src/core/Repository/Analytic/ViewRepositoryQuery.php @@ -3,9 +3,9 @@ namespace App\Core\Repository\Analytic; use App\Core\Repository\Analytic\ViewRepository as Repository; +use App\Core\Repository\RepositoryQuery; use Knp\Component\Pager\PaginatorInterface; use Symfony\Component\HttpFoundation\Request; -use App\Core\Repository\RepositoryQuery; class ViewRepositoryQuery extends RepositoryQuery { diff --git a/src/core/Repository/FileInformationRepository.php b/src/core/Repository/FileInformationRepository.php index faad05a..288be58 100644 --- a/src/core/Repository/FileInformationRepository.php +++ b/src/core/Repository/FileInformationRepository.php @@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; /** - * @method FileInformation|null find($id, $lockMode = null, $lockVersion = null) - * @method FileInformation|null findOneBy(array $criteria, array $orderBy = null) + * @method null|FileInformation find($id, $lockMode = null, $lockVersion = null) + * @method null|FileInformation findOneBy(array $criteria, array $orderBy = null) * @method FileInformation[] findAll() * @method FileInformation[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) */ diff --git a/src/core/Repository/NavigationSettingRepository.php b/src/core/Repository/NavigationSettingRepository.php index 32a8382..8ad84ef 100644 --- a/src/core/Repository/NavigationSettingRepository.php +++ b/src/core/Repository/NavigationSettingRepository.php @@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; /** - * @method NavigationSetting|null find($id, $lockMode = null, $lockVersion = null) - * @method NavigationSetting|null findOneBy(array $criteria, array $orderBy = null) + * @method null|NavigationSetting find($id, $lockMode = null, $lockVersion = null) + * @method null|NavigationSetting findOneBy(array $criteria, array $orderBy = null) * @method NavigationSetting[] findAll() * @method NavigationSetting[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) */ diff --git a/src/core/Repository/RedirectRepository.php b/src/core/Repository/RedirectRepository.php index c6d6070..5fefeae 100644 --- a/src/core/Repository/RedirectRepository.php +++ b/src/core/Repository/RedirectRepository.php @@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; /** - * @method Redirect|null find($id, $lockMode = null, $lockVersion = null) - * @method Redirect|null findOneBy(array $criteria, array $orderBy = null) + * @method null|Redirect find($id, $lockMode = null, $lockVersion = null) + * @method null|Redirect findOneBy(array $criteria, array $orderBy = null) * @method Redirect[] findAll() * @method Redirect[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) */ diff --git a/src/core/Repository/RedirectRepositoryQuery.php b/src/core/Repository/RedirectRepositoryQuery.php index fcce4a5..18ba64d 100644 --- a/src/core/Repository/RedirectRepositoryQuery.php +++ b/src/core/Repository/RedirectRepositoryQuery.php @@ -2,9 +2,8 @@ namespace App\Core\Repository; -use App\Core\Repository\RepositoryQuery; -use Knp\Component\Pager\PaginatorInterface; use App\Core\Repository\RedirectRepository as Repository; +use Knp\Component\Pager\PaginatorInterface; class RedirectRepositoryQuery extends RepositoryQuery { diff --git a/src/core/Repository/RepositoryQuery.php b/src/core/Repository/RepositoryQuery.php index fbb0b50..904c965 100644 --- a/src/core/Repository/RepositoryQuery.php +++ b/src/core/Repository/RepositoryQuery.php @@ -98,6 +98,17 @@ abstract class RepositoryQuery return $this; } + public function count() + { + return $this + ->select(sprintf('COUNT(%s.id) as total', $this->id)) + ->query + ->getQuery() + ->setMaxResults(1) + ->getOneOrNullResult()['total'] + ; + } + protected function addForcedFilterHandler(string $name): self { if (!in_array($name, $this->forcedFilterHandlers)) { @@ -131,15 +142,4 @@ abstract class RepositoryQuery protected function filterHandler(string $name, $value) { } - - public function count() - { - return $this - ->select(sprintf('COUNT(%s.id) as total', $this->id)) - ->query - ->getQuery() - ->setMaxResults(1) - ->getOneOrNullResult()['total'] - ; - } } diff --git a/src/core/Repository/SettingRepository.php b/src/core/Repository/SettingRepository.php index 6976ae2..5d4fb72 100644 --- a/src/core/Repository/SettingRepository.php +++ b/src/core/Repository/SettingRepository.php @@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; /** - * @method Setting|null find($id, $lockMode = null, $lockVersion = null) - * @method Setting|null findOneBy(array $criteria, array $orderBy = null) + * @method null|Setting find($id, $lockMode = null, $lockVersion = null) + * @method null|Setting findOneBy(array $criteria, array $orderBy = null) * @method Setting[] findAll() * @method Setting[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) */ diff --git a/src/core/Repository/Site/NodeRepository.php b/src/core/Repository/Site/NodeRepository.php index 13a5c73..b962835 100644 --- a/src/core/Repository/Site/NodeRepository.php +++ b/src/core/Repository/Site/NodeRepository.php @@ -32,9 +32,9 @@ class NodeRepository extends NestedTreeRepository ; } - return $query->getQuery() + return null !== $query->getQuery() ->setMaxResults(1) - ->getOneOrNullResult() !== null + ->getOneOrNullResult() ; } } diff --git a/src/core/Resources/maker/controller/CrudController.tpl.php b/src/core/Resources/maker/controller/CrudController.tpl.php index f4404b4..ec89f3b 100644 --- a/src/core/Resources/maker/controller/CrudController.tpl.php +++ b/src/core/Resources/maker/controller/CrudController.tpl.php @@ -1,78 +1,78 @@ - + -namespace ; +namespace ; use App\Core\Controller\Admin\Crud\CrudController; use App\Core\Crud\CrudConfiguration; use App\Core\Crud\Field; use App\Core\Entity\EntityInterface; use App\Core\Manager\EntityManager; -use as Entity; -use as Factory; -use as Type; -use as RepositoryQuery; +use as Entity; +use as Factory; +use as Type; +use as RepositoryQuery; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Http\Attribute\IsGranted; -class extends CrudController +class extends CrudController { protected ?CrudConfiguration $configuration = null; - #[Route(path: '/admin//{page}', name: 'admin__index', methods: ['GET'], requirements: ['page' => '\d+'])] + #[Route(path: '/admin//{page}', name: 'admin__index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { return $this->doIndex($page, $query, $request, $session); } - #[Route(path: '/admin//new', name: 'admin__new', methods: ['GET', 'POST'])] + #[Route(path: '/admin//new', name: 'admin__new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request): Response { return $this->doNew($factory->create(), $entityManager, $request); } - #[Route(path: '/admin//show/{entity}', name: 'admin__show', methods: ['GET'])] + #[Route(path: '/admin//show/{entity}', name: 'admin__show', methods: ['GET'])] #[IsGranted('show', 'entity')] public function show(Entity $entity): Response { return $this->doShow($entity); } - #[Route(path: '/admin//filter', name: 'admin__filter', methods: ['GET'])] + #[Route(path: '/admin//filter', name: 'admin__filter', methods: ['GET'])] public function filter(Session $session): Response { return $this->doFilter($session); } - #[Route(path: '/admin//edit/{entity}', name: 'admin__edit', methods: ['GET', 'POST'])] + #[Route(path: '/admin//edit/{entity}', name: 'admin__edit', methods: ['GET', 'POST'])] #[IsGranted('edit', 'entity')] public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doEdit($entity, $entityManager, $request); } - #[Route(path: '/admin//inline_edit/{entity}/{context}/{label}', name: 'admin__inline_edit', methods: ['GET', 'POST'])] + #[Route(path: '/admin//inline_edit/{entity}/{context}/{label}', name: 'admin__inline_edit', methods: ['GET', 'POST'])] #[IsGranted('edit', 'entity')] public function inlineEdit(string $context, string $label, Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doInlineEdit($context, $label, $entity, $entityManager, $request); } - #[Route(path: '/admin//sort/{page}', name: 'admin__sort', methods: ['POST'], requirements: ['page' => '\d+'])] + #[Route(path: '/admin//sort/{page}', name: 'admin__sort', methods: ['POST'], requirements: ['page' => '\d+'])] public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } - #[Route(path: '/admin//batch/{page}', name: 'admin__batch', methods: ['POST'], requirements: ['page' => '\d+'])] + #[Route(path: '/admin//batch/{page}', name: 'admin__batch', methods: ['POST'], requirements: ['page' => '\d+'])] public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doBatch($page, $query, $entityManager, $request, $session); } - #[Route(path: '/admin//delete/{entity}', name: 'admin__delete', methods: ['DELETE', 'POST'])] + #[Route(path: '/admin//delete/{entity}', name: 'admin__delete', methods: ['DELETE', 'POST'])] #[IsGranted('delete', 'entity')] public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response { @@ -86,26 +86,26 @@ class extends CrudController } return $this->configuration = CrudConfiguration::create() - ->setPageTitle('index', 'List of ') + ->setPageTitle('index', 'List of ') ->setPageTitle('edit', 'Edition of {id}') - ->setPageTitle('new', 'New ') + ->setPageTitle('new', 'New ') ->setPageTitle('show', 'View of {id}') - ->setPageRoute('index', 'admin__index') - ->setPageRoute('new', 'admin__new') - ->setPageRoute('edit', 'admin__edit') - ->setPageRoute('inline_edit', 'admin__inline_edit') - ->setPageRoute('show', 'admin__show') - ->setPageRoute('sort', 'admin__sort') - ->setPageRoute('batch', 'admin__batch') - ->setPageRoute('delete', 'admin__delete') - ->setPageRoute('filter', 'admin__filter') + ->setPageRoute('index', 'admin__index') + ->setPageRoute('new', 'admin__new') + ->setPageRoute('edit', 'admin__edit') + ->setPageRoute('inline_edit', 'admin__inline_edit') + ->setPageRoute('show', 'admin__show') + ->setPageRoute('sort', 'admin__sort') + ->setPageRoute('batch', 'admin__batch') + ->setPageRoute('delete', 'admin__delete') + ->setPageRoute('filter', 'admin__filter') ->setForm('edit', Type::class) ->setForm('new', Type::class) - ->setView('form', 'admin/_admin/_form.html.twig') - ->setView('show_entity', 'admin/_admin/_show.html.twig') + ->setView('form', 'admin/_admin/_form.html.twig') + ->setView('show_entity', 'admin/_admin/_show.html.twig') // ->setForm('filter', Type::class) @@ -149,6 +149,6 @@ class extends CrudController protected function getSection(): string { - return ''; + return ''; } } diff --git a/src/core/Resources/maker/factory/Factory.tpl.php b/src/core/Resources/maker/factory/Factory.tpl.php index 3545fbd..c0f9e0c 100644 --- a/src/core/Resources/maker/factory/Factory.tpl.php +++ b/src/core/Resources/maker/factory/Factory.tpl.php @@ -1,11 +1,11 @@ - + -namespace ; +namespace ; use App\Core\Factory\FactoryInterface; -use as Entity; +use as Entity; -class implements FactoryInterface +class implements FactoryInterface { public function create(): Entity { diff --git a/src/core/Resources/maker/page/PageEntity.tpl.php b/src/core/Resources/maker/page/PageEntity.tpl.php index dbc3d61..3073890 100644 --- a/src/core/Resources/maker/page/PageEntity.tpl.php +++ b/src/core/Resources/maker/page/PageEntity.tpl.php @@ -1,6 +1,6 @@ - + -namespace ; +namespace ; use App\Core\Entity\Site\Page\Page; use App\Core\Entity\Site\Page as BlockEntity; @@ -9,28 +9,28 @@ use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Form\FormBuilderInterface; #[ORM\Entity] -class extends Page +class extends Page { public function buildForm(FormBuilderInterface $builder, array $options) { - $builder - - ->add('', ) - + $builder + + ->add('', ) + ; - + } - - public function set(BlockEntity\Block $block) + + public function set(BlockEntity\Block $block) { return $this->setBlock($block); } - public function get() + public function get() { - return $this->getBlock('', ); + return $this->getBlock('', ); } - + } diff --git a/src/core/Resources/maker/repository/RepositoryQuery.tpl.php b/src/core/Resources/maker/repository/RepositoryQuery.tpl.php index bec52b1..e8f0174 100644 --- a/src/core/Resources/maker/repository/RepositoryQuery.tpl.php +++ b/src/core/Resources/maker/repository/RepositoryQuery.tpl.php @@ -1,15 +1,15 @@ - + -namespace ; +namespace ; use App\Core\Repository\RepositoryQuery; use Knp\Component\Pager\PaginatorInterface; -use as Repository; +use as Repository; -class extends RepositoryQuery +class extends RepositoryQuery { public function __construct(Repository $repository, PaginatorInterface $paginator) { - parent::__construct($repository, '', $paginator); + parent::__construct($repository, '', $paginator); } } diff --git a/src/core/Twig/Extension/AbTestExtension.php b/src/core/Twig/Extension/AbTestExtension.php index 3727c17..ac2226b 100644 --- a/src/core/Twig/Extension/AbTestExtension.php +++ b/src/core/Twig/Extension/AbTestExtension.php @@ -3,9 +3,9 @@ namespace App\Core\Twig\Extension; use App\Core\Ab\AbContainer; +use App\Core\Ab\AbTestInterface; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; -use App\Core\Ab\AbTestInterface; class AbTestExtension extends AbstractExtension { diff --git a/src/core/Twig/Extension/EditorJsExtension.php b/src/core/Twig/Extension/EditorJsExtension.php index 406fcd4..9259f48 100644 --- a/src/core/Twig/Extension/EditorJsExtension.php +++ b/src/core/Twig/Extension/EditorJsExtension.php @@ -2,11 +2,10 @@ namespace App\Core\Twig\Extension; -use App\Core\String\StringBuilder; +use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; +use Twig\Environment; use Twig\Extension\AbstractExtension; use Twig\TwigFilter; -use Twig\Environment; -use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; class EditorJsExtension extends AbstractExtension { @@ -68,23 +67,23 @@ class EditorJsExtension extends AbstractExtension $data = json_decode(json_encode($data), true); } - if ($data === null) { + if (null === $data) { return ''; } - if ($allowedBlocks === null) { + if (null === $allowedBlocks) { $allowedBlocks = $this->defaultAllowedBlocks; } $blocks = $data['blocks'] ?? []; $renders = ''; - $blocks = array_filter($data['blocks'] ?? [], function($block) use ($allowedBlocks) { + $blocks = array_filter($data['blocks'] ?? [], function ($block) use ($allowedBlocks) { return isset($block['type']) && in_array($block['type'], $allowedBlocks); }); foreach ($blocks as $block) { - $renders.= $this->twig->render($this->views[$block['type']], $block['data'] ?? []); + $renders .= $this->twig->render($this->views[$block['type']], $block['data'] ?? []); } return $renders; diff --git a/src/core/Twig/Extension/FileInformationExtension.php b/src/core/Twig/Extension/FileInformationExtension.php index 31eb989..a97f126 100644 --- a/src/core/Twig/Extension/FileInformationExtension.php +++ b/src/core/Twig/Extension/FileInformationExtension.php @@ -4,10 +4,10 @@ namespace App\Core\Twig\Extension; use App\Core\FileManager\FsFileManager; use App\Core\Repository\FileInformationRepositoryQuery; +use App\Core\String\FileInformationBuilder; use function Symfony\Component\String\u; use Twig\Extension\AbstractExtension; use Twig\TwigFilter; -use App\Core\String\FileInformationBuilder; class FileInformationExtension extends AbstractExtension { @@ -17,8 +17,7 @@ class FileInformationExtension extends AbstractExtension FileInformationBuilder $fileInfoBuilder, FsFileManager $fsManager, FileInformationRepositoryQuery $query - ) - { + ) { $this->fileInfoBuilder = $fileInfoBuilder; $this->fsManager = $fsManager; $this->query = $query; diff --git a/src/core/Twig/Extension/GrapesJsExtension.php b/src/core/Twig/Extension/GrapesJsExtension.php index 0e3c4b9..0f7b76d 100644 --- a/src/core/Twig/Extension/GrapesJsExtension.php +++ b/src/core/Twig/Extension/GrapesJsExtension.php @@ -2,11 +2,8 @@ namespace App\Core\Twig\Extension; -use App\Core\String\StringBuilder; use Twig\Extension\AbstractExtension; use Twig\TwigFilter; -use Twig\Environment; -use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; class GrapesJsExtension extends AbstractExtension { diff --git a/src/core/Twig/Extension/RoutingExtension.php b/src/core/Twig/Extension/RoutingExtension.php index 25e40dc..daccaa0 100644 --- a/src/core/Twig/Extension/RoutingExtension.php +++ b/src/core/Twig/Extension/RoutingExtension.php @@ -164,8 +164,8 @@ class RoutingExtension extends AbstractExtension $argsNode->hasNode(1) ? $argsNode->getNode(1) : null ); - if (null === $paramsNode || $paramsNode instanceof ArrayExpression && \count($paramsNode) <= 2 && - (!$paramsNode->hasNode(1) || $paramsNode->getNode(1) instanceof ConstantExpression) + if (null === $paramsNode || $paramsNode instanceof ArrayExpression && \count($paramsNode) <= 2 + && (!$paramsNode->hasNode(1) || $paramsNode->getNode(1) instanceof ConstantExpression) ) { return ['html']; } diff --git a/src/core/Twig/Extension/SettingExtension.php b/src/core/Twig/Extension/SettingExtension.php index 06a5cf4..dbe7e52 100644 --- a/src/core/Twig/Extension/SettingExtension.php +++ b/src/core/Twig/Extension/SettingExtension.php @@ -2,8 +2,8 @@ namespace App\Core\Twig\Extension; -use App\Core\Setting\SettingManager; use App\Core\Setting\NavigationSettingManager; +use App\Core\Setting\SettingManager; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; diff --git a/src/core/Twig/Extension/UrlExtension.php b/src/core/Twig/Extension/UrlExtension.php index f541d2f..0f75046 100644 --- a/src/core/Twig/Extension/UrlExtension.php +++ b/src/core/Twig/Extension/UrlExtension.php @@ -2,11 +2,9 @@ namespace App\Core\Twig\Extension; -use App\Core\Site\SiteRequest; -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; +use App\Core\String\UrlBuilder; use Twig\Extension\AbstractExtension; use Twig\TwigFilter; -use App\Core\String\UrlBuilder; class UrlExtension extends AbstractExtension {