X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/03a61db3b514d01a12408021db65dd8edfec0d86..60b5bbf626f4aca106b66be539a9b8c4cf71892e:/Controller/AbstractController.php?ds=inline

diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
index 19e4782..eecc2d0 100644
--- a/Controller/AbstractController.php
+++ b/Controller/AbstractController.php
@@ -13,18 +13,27 @@ namespace Rapsys\UserBundle\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
+
+use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
+
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BaseAbstractController;
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+
 use Twig\Environment;
 
 use Rapsys\PackBundle\Util\SluggerUtil;
@@ -37,96 +46,63 @@ use Rapsys\UserBundle\RapsysUserBundle;
  * {@inheritdoc}
  */
 abstract class AbstractController extends BaseAbstractController implements ServiceSubscriberInterface {
-	///Config array
+	/**
+	 * Config array
+	 */
 	protected array $config;
 
-	///Context array
+	/**
+	 * Context array
+	 */
 	protected array $context;
 
-	///ManagerRegistry
-	protected ManagerRegistry $doctrine;
-
-	///UserPasswordHasherInterface
-	protected UserPasswordHasherInterface $hasher;
-
-	///LoggerInterface
-	protected LoggerInterface $logger;
-
-	///MailerInterface
-	protected MailerInterface $mailer;
-
-	///EntityManagerInterface
-	protected EntityManagerInterface $manager;
-
-	///Router instance
-	protected RouterInterface $router;
-
-	///Slugger util
-	protected SluggerUtil $slugger;
-
-	///Translator instance
-	protected TranslatorInterface $translator;
-
-	///Twig\Environment instance
-	protected Environment $twig;
-
-	///Locale
+	/**
+	 * Locale string
+	 */
 	protected string $locale;
 
+	/**
+	 * Page integer
+	 */
+	protected int $page;
+
 	/**
 	 * Abstract constructor
 	 *
+	 * @param CacheInterface $cache The cache instance
+	 * @param AuthorizationCheckerInterface $checker The checker instance
 	 * @param ContainerInterface $container The container instance
 	 * @param ManagerRegistry $doctrine The doctrine instance
+	 * @param FormFactoryInterface $factory The factory instance
 	 * @param UserPasswordHasherInterface $hasher The password hasher instance
 	 * @param LoggerInterface $logger The logger instance
 	 * @param MailerInterface $mailer The mailer instance
 	 * @param EntityManagerInterface $manager The manager instance
 	 * @param RouterInterface $router The router instance
+	 * @param Security $security The security instance
 	 * @param SluggerUtil $slugger The slugger instance
 	 * @param RequestStack $stack The stack instance
 	 * @param TranslatorInterface $translator The translator instance
 	 * @param Environment $twig The twig environment instance
+	 * @param integer $limit The page limit
 	 */
-	public function __construct(ContainerInterface $container, ManagerRegistry $doctrine, UserPasswordHasherInterface $hasher, LoggerInterface $logger, MailerInterface $mailer, EntityManagerInterface $manager, RouterInterface $router, SluggerUtil $slugger, RequestStack $stack, TranslatorInterface $translator, Environment $twig) {
+	public function __construct(protected CacheInterface $cache, protected AuthorizationCheckerInterface $checker, protected ContainerInterface $container, protected ManagerRegistry $doctrine, protected FormFactoryInterface $factory, protected UserPasswordHasherInterface $hasher, protected LoggerInterface $logger, protected MailerInterface $mailer, protected EntityManagerInterface $manager, protected RouterInterface $router, protected Security $security, protected SluggerUtil $slugger, protected RequestStack $stack, protected TranslatorInterface $translator, protected Environment $twig, protected int $limit = 5) {
 		//Retrieve config
 		$this->config = $container->getParameter(RapsysUserBundle::getAlias());
 
-		//Set container
-		$this->container = $container;
-
-		//Set doctrine
-		$this->doctrine = $doctrine;
-
-		//Set hasher
-		$this->hasher = $hasher;
-
-		//Set logger
-		$this->logger = $logger;
-
-		//Set mailer
-		$this->mailer = $mailer;
-
-		//Set manager
-		$this->manager = $manager;
-
-		//Set router
-		$this->router = $router;
-
-		//Set slugger
-		$this->slugger = $slugger;
-
-		//Set translator
-		$this->translator = $translator;
+		//Get current request
+		$this->request = $stack->getCurrentRequest();
 
-		//Set twig
-		$this->twig = $twig;
+		//Get current page
+		$this->page = (int) $this->request->query->get('page');
 
-		//Get current request
-		$request = $stack->getCurrentRequest();
+		//With negative page
+		if ($this->page < 0) {
+			$this->page = 0;
+		}
 
 		//Get current locale
-		$this->locale = $request->getLocale();
+		$this->locale = $this->request->getLocale();
 
 		//Set translate array
 		$translates = [];
@@ -257,7 +233,7 @@ abstract class AbstractController extends BaseAbstractController implements Serv
 								//With current locale
 								if ($locale == $this->locale) {
 									//Set locale locales context
-									$this->config[$tag][$view]['context']['canonical'] = $this->router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL);
+									$this->config[$tag][$view]['context']['head']['canonical'] = $this->router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL);
 								} else {
 									//Set locale locales context
 									$this->config[$tag][$view]['context']['head']['alternates'][$locale] = [
@@ -339,16 +315,21 @@ abstract class AbstractController extends BaseAbstractController implements Serv
 	public static function getSubscribedServices(): array {
 		//Return subscribed services
 		return [
-			'service_container' => ContainerInterface::class,
 			'doctrine' => ManagerRegistry::class,
 			'doctrine.orm.default_entity_manager' => EntityManagerInterface::class,
+			'form.factory' => FormFactoryInterface::class,
 			'logger' => LoggerInterface::class,
 			'mailer.mailer' => MailerInterface::class,
 			'rapsys_pack.slugger_util' => SluggerUtil::class,
 			'request_stack' => RequestStack::class,
 			'router' => RouterInterface::class,
+			'security.authorization_checker' => AuthorizationCheckerInterface::class,
+			'security.helper' => Security::class,
 			'security.user_password_hasher' => UserPasswordHasherInterface::class,
-			'translator' => TranslatorInterface::class
+			'service_container' => ContainerInterface::class,
+			'translator' => TranslatorInterface::class,
+			'twig' => Environment::class,
+			'user.cache' => CacheInterface::class
 		];
 	}
 }