Skip to content
Snippets Groups Projects
Commit 0240732b authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Migration vers laminas

parent d507f84b
No related branches found
No related tags found
No related merge requests found
Pipeline #11068 passed
Showing
with 49 additions and 49 deletions
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Zend\Form\Form; use Laminas\Form\Form;
use Zend\View\Helper\AbstractHelper; use Laminas\View\Helper\AbstractHelper;
use Zend\View\Renderer\PhpRenderer; use Laminas\View\Renderer\PhpRenderer;
use Zend\View\Resolver\TemplatePathStack; use Laminas\View\Resolver\TemplatePathStack;
/** /**
* Aide de vue dessinant un formulaire d'authentification d'un type particulier, * Aide de vue dessinant un formulaire d'authentification d'un type particulier,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Zend\View\Renderer\PhpRenderer; use Laminas\View\Renderer\PhpRenderer;
/** /**
* Aide de vue dessinant le bouton de connexion via Shibboleth, * Aide de vue dessinant le bouton de connexion via Shibboleth,
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Zend\Form\Form; use Laminas\Form\Form;
use Zend\View\Helper\AbstractHelper; use Laminas\View\Helper\AbstractHelper;
use Zend\View\Renderer\PhpRenderer; use Laminas\View\Renderer\PhpRenderer;
/** /**
* Aide de vue dessinant le formulaire correspondant au type d'authentification spécifié. * Aide de vue dessinant le formulaire correspondant au type d'authentification spécifié.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Zend\View\Renderer\PhpRenderer; use Laminas\View\Renderer\PhpRenderer;
/** /**
* Aide de vue dessinant le formulaire d'authentification locale, * Aide de vue dessinant le formulaire d'authentification locale,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Zend\View\Renderer\PhpRenderer; use Laminas\View\Renderer\PhpRenderer;
/** /**
* Aide de vue dessinant le formulaire d'authentification locale (ldap ou db), * Aide de vue dessinant le formulaire d'authentification locale (ldap ou db),
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Zend\View\Renderer\PhpRenderer; use Laminas\View\Renderer\PhpRenderer;
/** /**
* Aide de vue dessinant le bouton de connexion via Shibboleth, * Aide de vue dessinant le bouton de connexion via Shibboleth,
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use UnicaenAuth\Service\UserContext; use UnicaenAuth\Service\UserContext;
use Zend\I18n\View\Helper\AbstractTranslatorHelper; use Laminas\I18n\View\Helper\AbstractTranslatorHelper;
/** /**
* Classe mère des aides de vue concernant l'utilisateur connecté. * Classe mère des aides de vue concernant l'utilisateur connecté.
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use Zend\ServiceManager\FactoryInterface; use Laminas\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface; use Laminas\ServiceManager\ServiceLocatorInterface;
/** /**
* Description of UserConnectionFactory * Description of UserConnectionFactory
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use Zend\ServiceManager\FactoryInterface; use Laminas\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface; use Laminas\ServiceManager\ServiceLocatorInterface;
/** /**
* Description of UserCurrentFactory * Description of UserCurrentFactory
......
...@@ -3,7 +3,7 @@ namespace UnicaenAuth\View\Helper; ...@@ -3,7 +3,7 @@ namespace UnicaenAuth\View\Helper;
use UnicaenApp\Entity\Ldap\People; use UnicaenApp\Entity\Ldap\People;
use UnicaenApp\Mapper\Ldap\Structure as MapperStructure; use UnicaenApp\Mapper\Ldap\Structure as MapperStructure;
use Zend\View\Helper\HtmlList; use Laminas\View\Helper\HtmlList;
/** /**
* Aide de vue affichant des info sur l'utilisateur connecté : * Aide de vue affichant des info sur l'utilisateur connecté :
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use Zend\ServiceManager\FactoryInterface; use Laminas\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface; use Laminas\ServiceManager\ServiceLocatorInterface;
/** /**
* Description of UserInfoFactory * Description of UserInfoFactory
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use Zend\ServiceManager\FactoryInterface; use Laminas\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface; use Laminas\ServiceManager\ServiceLocatorInterface;
/** /**
* Description of UserProfileFactory * Description of UserProfileFactory
......
<?php <?php
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Zend\Permissions\Acl\Role\RoleInterface; use Laminas\Permissions\Acl\Role\RoleInterface;
use Zend\View\Helper\HeadScript; use Laminas\View\Helper\HeadScript;
/** /**
* Aide de vue permettant à l'utilisateur de sélectionner son profil courant parmi * Aide de vue permettant à l'utilisateur de sélectionner son profil courant parmi
...@@ -42,7 +42,7 @@ class UserProfileSelect extends UserAbstract ...@@ -42,7 +42,7 @@ class UserProfileSelect extends UserAbstract
$formClass = 'user-profile-select-form'; $formClass = 'user-profile-select-form';
$inputClass = 'user-profile-select-input'; $inputClass = 'user-profile-select-input';
$form = new \Zend\Form\Form(); $form = new \Laminas\Form\Form();
$form->setAttribute('class', "$formClass " . $this->formClass); $form->setAttribute('class', "$formClass " . $this->formClass);
$html = $this->getView()->form()->openTag($form); $html = $this->getView()->form()->openTag($form);
...@@ -55,7 +55,7 @@ class UserProfileSelect extends UserAbstract ...@@ -55,7 +55,7 @@ class UserProfileSelect extends UserAbstract
return ''; return '';
} }
$select = new \Zend\Form\Element\Select('role'); $select = new \Laminas\Form\Element\Select('role');
$select $select
->setValueOptions($rolesAsOptions) ->setValueOptions($rolesAsOptions)
->setAttributes([ ->setAttributes([
......
<?php <?php
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Zend\Permissions\Acl\Role\RoleInterface; use Laminas\Permissions\Acl\Role\RoleInterface;
use Zend\Form\Element\Radio; use Laminas\Form\Element\Radio;
/** /**
* Aide de vue dessinant un item de sélection d'un profil utilisateur. * Aide de vue dessinant un item de sélection d'un profil utilisateur.
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace UnicaenAuth\View\Helper; namespace UnicaenAuth\View\Helper;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use Zend\ServiceManager\FactoryInterface; use Laminas\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface; use Laminas\ServiceManager\ServiceLocatorInterface;
/** /**
* Description of UserStatusFactory * Description of UserStatusFactory
......
...@@ -5,14 +5,14 @@ namespace UnicaenAuth\View\Helper; ...@@ -5,14 +5,14 @@ namespace UnicaenAuth\View\Helper;
use UnicaenApp\Form\View\Helper\FormControlGroup; use UnicaenApp\Form\View\Helper\FormControlGroup;
use UnicaenAuth\Entity\Db\AbstractUser; use UnicaenAuth\Entity\Db\AbstractUser;
use UnicaenAuth\Options\ModuleOptions; use UnicaenAuth\Options\ModuleOptions;
use Zend\Form\Element\Hidden; use Laminas\Form\Element\Hidden;
use Zend\Form\Element\Submit; use Laminas\Form\Element\Submit;
use Zend\Form\Element\Text; use Laminas\Form\Element\Text;
use Zend\Form\Form; use Laminas\Form\Form;
use Zend\Form\View\Helper\Form as FormHelper; use Laminas\Form\View\Helper\Form as FormHelper;
use Zend\Form\View\Helper\FormElement; use Laminas\Form\View\Helper\FormElement;
use Zend\View\Helper\HeadScript; use Laminas\View\Helper\HeadScript;
use Zend\View\Renderer\PhpRenderer; use Laminas\View\Renderer\PhpRenderer;
/** /**
* Aide de vue consacrée à l'usurpation d'identité. * Aide de vue consacrée à l'usurpation d'identité.
...@@ -214,7 +214,7 @@ EOS; ...@@ -214,7 +214,7 @@ EOS;
$submit = new Submit('submit'); $submit = new Submit('submit');
$submit->setValue("Usurper"); $submit->setValue("Usurper");
$submit->setAttributes([ $submit->setAttributes([
'disabled' => true, 'disabled' => !$this->asButton,
'class' => 'user-usurpation-submit btn btn-danger', 'class' => 'user-usurpation-submit btn btn-danger',
]); ]);
......
...@@ -5,7 +5,7 @@ namespace UnicaenAuth\View\Helper; ...@@ -5,7 +5,7 @@ namespace UnicaenAuth\View\Helper;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use UnicaenAuth\Options\ModuleOptions; use UnicaenAuth\Options\ModuleOptions;
use UnicaenAuth\Service\UserContext; use UnicaenAuth\Service\UserContext;
use Zend\View\Helper\Url; use Laminas\View\Helper\Url;
class UserUsurpationHelperFactory class UserUsurpationHelperFactory
{ {
......
<?php <?php
use Application\View\Renderer\PhpRenderer; use Application\View\Renderer\PhpRenderer;
use Zend\Form\Form; use Laminas\Form\Form;
/** /**
* @var PhpRenderer $this * @var PhpRenderer $this
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace UnicaenAuth\View; namespace UnicaenAuth\View;
use Zend\Mvc\MvcEvent; use Laminas\Mvc\MvcEvent;
use BjyAuthorize\View\UnauthorizedStrategy; use BjyAuthorize\View\UnauthorizedStrategy;
/** /**
...@@ -15,18 +15,18 @@ class RedirectionStrategy extends \BjyAuthorize\View\RedirectionStrategy ...@@ -15,18 +15,18 @@ class RedirectionStrategy extends \BjyAuthorize\View\RedirectionStrategy
/** /**
* Handles redirects in case of dispatch errors caused by unauthorized access * Handles redirects in case of dispatch errors caused by unauthorized access
* *
* @param \Zend\Mvc\MvcEvent $event * @param \Laminas\Mvc\MvcEvent $event
*/ */
public function onDispatchError(MvcEvent $event) public function onDispatchError(MvcEvent $event)
{ {
$request = $event->getRequest(); $request = $event->getRequest();
$router = $event->getRouter(); $router = $event->getRouter();
$sl = $event->getApplication()->getServiceManager(); $sl = $event->getApplication()->getServiceManager();
$authService = $sl->get('Zend\Authentication\AuthenticationService'); //'zfcuser_auth_service' $authService = $sl->get('Laminas\Authentication\AuthenticationService'); //'zfcuser_auth_service'
$unauthStrategy = $sl->get('BjyAuthorize\View\UnauthorizedStrategy'); /* @var $unauthorizedStrategy UnauthorizedStrategy */ $unauthStrategy = $sl->get('BjyAuthorize\View\UnauthorizedStrategy'); /* @var $unauthorizedStrategy UnauthorizedStrategy */
// s'il s'agit d'une requête issue d'une console (CLI), délégation à la stratégie standard // s'il s'agit d'une requête issue d'une console (CLI), délégation à la stratégie standard
if ($request instanceof \Zend\Console\Request) { if ($request instanceof \Laminas\Console\Request) {
return parent::onDispatchError($event); return parent::onDispatchError($event);
} }
...@@ -43,7 +43,7 @@ class RedirectionStrategy extends \BjyAuthorize\View\RedirectionStrategy ...@@ -43,7 +43,7 @@ class RedirectionStrategy extends \BjyAuthorize\View\RedirectionStrategy
// cuisine nécessaire pour ajouter en paramètre GET l'URL demandée avant redirection vers la page d'authentification // cuisine nécessaire pour ajouter en paramètre GET l'URL demandée avant redirection vers la page d'authentification
if (null === $this->redirectUri) { if (null === $this->redirectUri) {
if (($uri = $router->getRequestUri()) && $uri->getPath()) { /* @var $uri \Zend\Uri\Uri */ if (($uri = $router->getRequestUri()) && $uri->getPath()) { /* @var $uri \Laminas\Uri\Uri */
$this->redirectUri = $router->assemble([], [ $this->redirectUri = $router->assemble([], [
'name' => $this->redirectRoute, 'name' => $this->redirectRoute,
'query' => ['redirect' => $uri->toString()]]); 'query' => ['redirect' => $uri->toString()]]);
......
<?php <?php
namespace UnicaenAppTest; namespace UnicaenAppTest;
use Zend\Loader\AutoloaderFactory; use Laminas\Loader\AutoloaderFactory;
use Zend\Mvc\Service\ServiceManagerConfig; use Laminas\Mvc\Service\ServiceManagerConfig;
use Zend\ServiceManager\ServiceManager; use Laminas\ServiceManager\ServiceManager;
use RuntimeException; use RuntimeException;
error_reporting(E_ALL | E_STRICT); error_reporting(E_ALL | E_STRICT);
...@@ -63,7 +63,7 @@ class Bootstrap ...@@ -63,7 +63,7 @@ class Bootstrap
include $zf2Path . '/Zend/Loader/AutoloaderFactory.php'; include $zf2Path . '/Zend/Loader/AutoloaderFactory.php';
AutoloaderFactory::factory([ AutoloaderFactory::factory([
'Zend\Loader\StandardAutoloader' => [ 'Laminas\Loader\StandardAutoloader' => [
'autoregister_zf' => true, 'autoregister_zf' => true,
'namespaces' => [ 'namespaces' => [
__NAMESPACE__ => __DIR__ . '/' . __NAMESPACE__, __NAMESPACE__ => __DIR__ . '/' . __NAMESPACE__,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment