Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
lib
unicaen
auth
Commits
0240732b
Commit
0240732b
authored
Oct 12, 2021
by
Bertrand Gauthier
Browse files
Migration vers laminas
parent
d507f84b
Pipeline
#11068
passed with stage
in 25 seconds
Changes
135
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/UnicaenAuth/View/Helper/AbstractConnectViewHelper.php
View file @
0240732b
...
...
@@ -2,10 +2,10 @@
namespace
UnicaenAuth\View\Helper
;
use
Zend
\Form\Form
;
use
Zend
\View\Helper\AbstractHelper
;
use
Zend
\View\Renderer\PhpRenderer
;
use
Zend
\View\Resolver\TemplatePathStack
;
use
Laminas
\Form\Form
;
use
Laminas
\View\Helper\AbstractHelper
;
use
Laminas
\View\Renderer\PhpRenderer
;
use
Laminas
\View\Resolver\TemplatePathStack
;
/**
* Aide de vue dessinant un formulaire d'authentification d'un type particulier,
...
...
src/UnicaenAuth/View/Helper/CasConnectViewHelper.php
View file @
0240732b
...
...
@@ -2,7 +2,7 @@
namespace
UnicaenAuth\View\Helper
;
use
Zend
\View\Renderer\PhpRenderer
;
use
Laminas
\View\Renderer\PhpRenderer
;
/**
* Aide de vue dessinant le bouton de connexion via Shibboleth,
...
...
src/UnicaenAuth/View/Helper/ConnectViewHelper.php
View file @
0240732b
...
...
@@ -2,9 +2,9 @@
namespace
UnicaenAuth\View\Helper
;
use
Zend
\Form\Form
;
use
Zend
\View\Helper\AbstractHelper
;
use
Zend
\View\Renderer\PhpRenderer
;
use
Laminas
\Form\Form
;
use
Laminas
\View\Helper\AbstractHelper
;
use
Laminas
\View\Renderer\PhpRenderer
;
/**
* Aide de vue dessinant le formulaire correspondant au type d'authentification spécifié.
...
...
src/UnicaenAuth/View/Helper/DbConnectViewHelper.php
View file @
0240732b
...
...
@@ -2,7 +2,7 @@
namespace
UnicaenAuth\View\Helper
;
use
Zend
\View\Renderer\PhpRenderer
;
use
Laminas
\View\Renderer\PhpRenderer
;
/**
* Aide de vue dessinant le formulaire d'authentification locale,
...
...
src/UnicaenAuth/View/Helper/LocalConnectViewHelper.php
View file @
0240732b
...
...
@@ -2,7 +2,7 @@
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),
...
...
src/UnicaenAuth/View/Helper/ShibConnectViewHelper.php
View file @
0240732b
...
...
@@ -2,7 +2,7 @@
namespace
UnicaenAuth\View\Helper
;
use
Zend
\View\Renderer\PhpRenderer
;
use
Laminas
\View\Renderer\PhpRenderer
;
/**
* Aide de vue dessinant le bouton de connexion via Shibboleth,
...
...
src/UnicaenAuth/View/Helper/UserAbstract.php
View file @
0240732b
...
...
@@ -3,7 +3,7 @@
namespace
UnicaenAuth\View\Helper
;
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é.
...
...
src/UnicaenAuth/View/Helper/UserConnectionFactory.php
View file @
0240732b
...
...
@@ -3,8 +3,8 @@
namespace
UnicaenAuth\View\Helper
;
use
Interop\Container\ContainerInterface
;
use
Zend
\ServiceManager\FactoryInterface
;
use
Zend
\ServiceManager\ServiceLocatorInterface
;
use
Laminas
\ServiceManager\FactoryInterface
;
use
Laminas
\ServiceManager\ServiceLocatorInterface
;
/**
* Description of UserConnectionFactory
...
...
src/UnicaenAuth/View/Helper/UserCurrentFactory.php
View file @
0240732b
...
...
@@ -3,8 +3,8 @@
namespace
UnicaenAuth\View\Helper
;
use
Interop\Container\ContainerInterface
;
use
Zend
\ServiceManager\FactoryInterface
;
use
Zend
\ServiceManager\ServiceLocatorInterface
;
use
Laminas
\ServiceManager\FactoryInterface
;
use
Laminas
\ServiceManager\ServiceLocatorInterface
;
/**
* Description of UserCurrentFactory
...
...
src/UnicaenAuth/View/Helper/UserInfo.php
View file @
0240732b
...
...
@@ -3,7 +3,7 @@ namespace UnicaenAuth\View\Helper;
use
UnicaenApp\Entity\Ldap\People
;
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é :
...
...
src/UnicaenAuth/View/Helper/UserInfoFactory.php
View file @
0240732b
...
...
@@ -3,8 +3,8 @@
namespace
UnicaenAuth\View\Helper
;
use
Interop\Container\ContainerInterface
;
use
Zend
\ServiceManager\FactoryInterface
;
use
Zend
\ServiceManager\ServiceLocatorInterface
;
use
Laminas
\ServiceManager\FactoryInterface
;
use
Laminas
\ServiceManager\ServiceLocatorInterface
;
/**
* Description of UserInfoFactory
...
...
src/UnicaenAuth/View/Helper/UserProfileFactory.php
View file @
0240732b
...
...
@@ -3,8 +3,8 @@
namespace
UnicaenAuth\View\Helper
;
use
Interop\Container\ContainerInterface
;
use
Zend
\ServiceManager\FactoryInterface
;
use
Zend
\ServiceManager\ServiceLocatorInterface
;
use
Laminas
\ServiceManager\FactoryInterface
;
use
Laminas
\ServiceManager\ServiceLocatorInterface
;
/**
* Description of UserProfileFactory
...
...
src/UnicaenAuth/View/Helper/UserProfileSelect.php
View file @
0240732b
<?php
namespace
UnicaenAuth\View\Helper
;
use
Zend
\Permissions\Acl\Role\RoleInterface
;
use
Zend
\View\Helper\HeadScript
;
use
Laminas
\Permissions\Acl\Role\RoleInterface
;
use
Laminas
\View\Helper\HeadScript
;
/**
* Aide de vue permettant à l'utilisateur de sélectionner son profil courant parmi
...
...
@@ -42,7 +42,7 @@ class UserProfileSelect extends UserAbstract
$formClass
=
'user-profile-select-form'
;
$inputClass
=
'user-profile-select-input'
;
$form
=
new
\
Zend
\Form\Form
();
$form
=
new
\
Laminas
\Form\Form
();
$form
->
setAttribute
(
'class'
,
"
$formClass
"
.
$this
->
formClass
);
$html
=
$this
->
getView
()
->
form
()
->
openTag
(
$form
);
...
...
@@ -55,7 +55,7 @@ class UserProfileSelect extends UserAbstract
return
''
;
}
$select
=
new
\
Zend
\Form\Element\Select
(
'role'
);
$select
=
new
\
Laminas
\Form\Element\Select
(
'role'
);
$select
->
setValueOptions
(
$rolesAsOptions
)
->
setAttributes
([
...
...
src/UnicaenAuth/View/Helper/UserProfileSelectRadioItem.php
View file @
0240732b
<?php
namespace
UnicaenAuth\View\Helper
;
use
Zend
\Permissions\Acl\Role\RoleInterface
;
use
Zend
\Form\Element\Radio
;
use
Laminas
\Permissions\Acl\Role\RoleInterface
;
use
Laminas
\Form\Element\Radio
;
/**
* Aide de vue dessinant un item de sélection d'un profil utilisateur.
...
...
src/UnicaenAuth/View/Helper/UserStatusFactory.php
View file @
0240732b
...
...
@@ -3,8 +3,8 @@
namespace
UnicaenAuth\View\Helper
;
use
Interop\Container\ContainerInterface
;
use
Zend
\ServiceManager\FactoryInterface
;
use
Zend
\ServiceManager\ServiceLocatorInterface
;
use
Laminas
\ServiceManager\FactoryInterface
;
use
Laminas
\ServiceManager\ServiceLocatorInterface
;
/**
* Description of UserStatusFactory
...
...
src/UnicaenAuth/View/Helper/UserUsurpationHelper.php
View file @
0240732b
...
...
@@ -5,14 +5,14 @@ namespace UnicaenAuth\View\Helper;
use
UnicaenApp\Form\View\Helper\FormControlGroup
;
use
UnicaenAuth\Entity\Db\AbstractUser
;
use
UnicaenAuth\Options\ModuleOptions
;
use
Zend
\Form\Element\Hidden
;
use
Zend
\Form\Element\Submit
;
use
Zend
\Form\Element\Text
;
use
Zend
\Form\Form
;
use
Zend
\Form\View\Helper\Form
as
FormHelper
;
use
Zend
\Form\View\Helper\FormElement
;
use
Zend
\View\Helper\HeadScript
;
use
Zend
\View\Renderer\PhpRenderer
;
use
Laminas
\Form\Element\Hidden
;
use
Laminas
\Form\Element\Submit
;
use
Laminas
\Form\Element\Text
;
use
Laminas
\Form\Form
;
use
Laminas
\Form\View\Helper\Form
as
FormHelper
;
use
Laminas
\Form\View\Helper\FormElement
;
use
Laminas
\View\Helper\HeadScript
;
use
Laminas
\View\Renderer\PhpRenderer
;
/**
* Aide de vue consacrée à l'usurpation d'identité.
...
...
@@ -214,7 +214,7 @@ EOS;
$submit
=
new
Submit
(
'submit'
);
$submit
->
setValue
(
"Usurper"
);
$submit
->
setAttributes
([
'disabled'
=>
true
,
'disabled'
=>
!
$this
->
asButton
,
'class'
=>
'user-usurpation-submit btn btn-danger'
,
]);
...
...
src/UnicaenAuth/View/Helper/UserUsurpationHelperFactory.php
View file @
0240732b
...
...
@@ -5,7 +5,7 @@ namespace UnicaenAuth\View\Helper;
use
Interop\Container\ContainerInterface
;
use
UnicaenAuth\Options\ModuleOptions
;
use
UnicaenAuth\Service\UserContext
;
use
Zend
\View\Helper\Url
;
use
Laminas
\View\Helper\Url
;
class
UserUsurpationHelperFactory
{
...
...
src/UnicaenAuth/View/Helper/partial/connect.phtml
View file @
0240732b
<?php
use
Application\View\Renderer\PhpRenderer
;
use
Zend
\Form\Form
;
use
Laminas
\Form\Form
;
/**
* @var PhpRenderer $this
...
...
src/UnicaenAuth/View/RedirectionStrategy.php
View file @
0240732b
...
...
@@ -2,7 +2,7 @@
namespace
UnicaenAuth\View
;
use
Zend
\Mvc\MvcEvent
;
use
Laminas
\Mvc\MvcEvent
;
use
BjyAuthorize\View\UnauthorizedStrategy
;
/**
...
...
@@ -15,18 +15,18 @@ class RedirectionStrategy extends \BjyAuthorize\View\RedirectionStrategy
/**
* 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
)
{
$request
=
$event
->
getRequest
();
$router
=
$event
->
getRouter
();
$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 */
// 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
);
}
...
...
@@ -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
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
([],
[
'name'
=>
$this
->
redirectRoute
,
'query'
=>
[
'redirect'
=>
$uri
->
toString
()]]);
...
...
tests/Bootstrap.php
View file @
0240732b
<?php
namespace
UnicaenAppTest
;
use
Zend
\Loader\AutoloaderFactory
;
use
Zend
\Mvc\Service\ServiceManagerConfig
;
use
Zend
\ServiceManager\ServiceManager
;
use
Laminas
\Loader\AutoloaderFactory
;
use
Laminas
\Mvc\Service\ServiceManagerConfig
;
use
Laminas
\ServiceManager\ServiceManager
;
use
RuntimeException
;
error_reporting
(
E_ALL
|
E_STRICT
);
...
...
@@ -63,7 +63,7 @@ class Bootstrap
include
$zf2Path
.
'/Zend/Loader/AutoloaderFactory.php'
;
AutoloaderFactory
::
factory
([
'
Zend
\Loader\StandardAutoloader'
=>
[
'
Laminas
\Loader\StandardAutoloader'
=>
[
'autoregister_zf'
=>
true
,
'namespaces'
=>
[
__NAMESPACE__
=>
__DIR__
.
'/'
.
__NAMESPACE__
,
...
...
Prev
1
2
3
4
5
6
7
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment