Laminas migration (!1) · Merge requests · lib / unicaen / auth-token

config/module.config.php

+2 −2

Changes for config/module.config.php: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ use UnicaenAuthToken\Service\TokenService;
		use UnicaenAuthToken\Service\TokenServiceFactory;
		use UnicaenAuthToken\View\Helper\TokenConnectViewHelper;
		use UnicaenAuthToken\View\Helper\TokenConnectViewHelperFactory;
		use Zend\Router\Http\Literal;
		use Zend\Router\Http\Segment;
		use Laminas\Router\Http\Literal;
		use Laminas\Router\Http\Segment;

		return [
		'unicaen-auth-token' => [

+2 −2

Changes for src/UnicaenAuthToken/Authentication/Adapter/TokenAdapter.php: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ use RuntimeException;
		use UnicaenAuth\Authentication\Adapter\AbstractDb;
		use UnicaenAuthToken\Service\TokenServiceAwareTrait;
		use UnicaenAuthToken\Service\TokenServiceException;
		use Zend\Authentication\Result as AuthenticationResult;
		use Laminas\Authentication\Result as AuthenticationResult;
		use ZfcUser\Entity\UserInterface;

		/**
		@@ -28,7 +28,7 @@ class TokenAdapter extends AbstractDb
		*/
		protected function fetchUserObject(): ?UserInterface
		{
		/** @var \Zend\Http\Request $request */
		/** @var \Laminas\Http\Request $request */
		$request = $this->event->getRequest();
		$token = $request->getPost()->get('identity');

+1 −1

Changes for src/UnicaenAuthToken/Authentication/Adapter/TokenAdapterFactory.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ use Interop\Container\ContainerInterface;
		use UnicaenAuth\Authentication\Adapter\Db as DbAdapter;
		use UnicaenAuth\Options\ModuleOptions;
		use UnicaenAuthToken\Service\TokenService;
		use Zend\Authentication\Storage\Session;
		use Laminas\Authentication\Storage\Session;
		use ZfcUser\Mapper\UserInterface as UserMapperInterface;

		class TokenAdapterFactory

+9 −9

Changes for src/UnicaenAuthToken/Controller/TokenController.php: 9 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		@@ -12,13 +12,13 @@ use UnicaenAuthToken\Entity\Db\AbstractUserToken;
		use UnicaenAuthToken\Form\UserTokenForm;
		use UnicaenAuthToken\Service\TokenServiceAwareTrait;
		use UnicaenAuthToken\Service\TokenServiceException;
		use Zend\EventManager\EventManagerInterface;
		use Zend\EventManager\ListenerAggregateInterface;
		use Zend\EventManager\ListenerAggregateTrait;
		use Zend\Http\Response;
		use Zend\Mvc\Controller\AbstractActionController;
		use Zend\Mvc\Plugin\FlashMessenger\FlashMessenger;
		use Zend\View\Model\ViewModel;
		use Laminas\EventManager\EventManagerInterface;
		use Laminas\EventManager\ListenerAggregateInterface;
		use Laminas\EventManager\ListenerAggregateTrait;
		use Laminas\Http\Response;
		use Laminas\Mvc\Controller\AbstractActionController;
		use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;
		use Laminas\View\Model\ViewModel;

		/**
		* Class TokenController
		@@ -55,7 +55,7 @@ class TokenController extends AbstractActionController
		private $redirectResponse;

		/**
		* @var \Zend\View\Renderer\PhpRenderer
		* @var \Laminas\View\Renderer\PhpRenderer
		*/
		private $renderer;

		@@ -86,7 +86,7 @@ class TokenController extends AbstractActionController
		}

		/**
		* @return \Zend\Http\Response\|\Zend\View\Model\ViewModel
		* @return \Laminas\Http\Response\|\Laminas\View\Model\ViewModel
		*/
		public function creerAction()
		{

+5 −5

Changes for src/UnicaenAuthToken/Entity/Db/AbstractUserToken.php: 5 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ use InvalidArgumentException;
		use LogicException;
		use UnicaenAuth\Entity\Db\UserInterface;
		use UnicaenAuthToken\Service\TokenService;
		use Zend\Permissions\Acl\Resource\ResourceInterface;
		use Zend\Uri\Uri;
		use Laminas\Permissions\Acl\Resource\ResourceInterface;
		use Laminas\Uri\Uri;

		abstract class AbstractUserToken implements ResourceInterface
		{
		@@ -72,7 +72,7 @@ abstract class AbstractUserToken implements ResourceInterface
		protected $user;

		/**
		* @var \Zend\Uri\Uri\|null
		* @var \Laminas\Uri\Uri\|null
		*/
		protected $logInUri;

		@@ -96,7 +96,7 @@ abstract class AbstractUserToken implements ResourceInterface
		}

		/**
		* @return \Zend\Uri\Uri
		* @return \Laminas\Uri\Uri
		*/
		public function getLogInUri(): Uri
		{
		@@ -113,7 +113,7 @@ abstract class AbstractUserToken implements ResourceInterface

		/**
		* @param string $redirect
		* @return \Zend\Uri\Uri\|null
		* @return \Laminas\Uri\Uri\|null
		*/
		public function getLogInUriWithRedirect(string $redirect): ?Uri
		{