Merge branch 'laminas_migration' into 'master' (c686f241) · Commits · lib / unicaen / auth-token

Module.php

+4 −4

Original line number	Diff line number	Diff line
		@@ -2,9 +2,9 @@

		namespace UnicaenAuthToken;

		use Zend\Mvc\ModuleRouteListener;
		use Zend\Mvc\MvcEvent;
		use Zend\Config\Factory as ConfigFactory;
		use Laminas\Mvc\ModuleRouteListener;
		use Laminas\Mvc\MvcEvent;
		use Laminas\Config\Factory as ConfigFactory;

		class Module
		{
		@@ -26,7 +26,7 @@ class Module
		public function getAutoloaderConfig(): array
		{
		return array(
		'Zend\Loader\StandardAutoloader' => array(
		'Laminas\Loader\StandardAutoloader' => array(
		'namespaces' => array(
		__NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
		),

+24 −23

Original line number	Diff line number	Diff line
		@@ -8,9 +8,10 @@
		}
		],
		"require": {
		"unicaen/app": "^3.0",
		"unicaen/auth": ">= 3.2.1",
		"ramsey/uuid": "^3.7"
		"unicaen/app": "dev-laminas_migration",
		"unicaen/auth": "dev-laminas_migration",
		"ramsey/uuid": "^3.7",
		"laminas/laminas-dependency-plugin": "^2.1"
		},
		"require-dev": {
		"phpunit/phpunit": "^5.6"

+2 −2

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

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

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