Skip to content

GitLab

Commit bea9c6d2 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Migration vers laminas

parent ad8f5627
Expand all Hide whitespace changes
Inline Side-by-side
Module.php
View file @ bea9c6d2
......@@ -2,8 +2,8 @@
namespace UnicaenLdap;
use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
use Zend\ModuleManager\Feature\ConfigProviderInterface;
use Laminas\ModuleManager\Feature\AutoloaderProviderInterface;
use Laminas\ModuleManager\Feature\ConfigProviderInterface;
class Module implements ConfigProviderInterface
{
......@@ -25,10 +25,10 @@ class Module implements ConfigProviderInterface
public function getAutoloaderConfig()
{
return array(
'Zend\Loader\ClassMapAutoloader' => array(
'Laminas\Loader\ClassMapAutoloader' => array(
__DIR__ . '/autoload_classmap.php',
),
'Zend\Loader\StandardAutoloader' => array(
'Laminas\Loader\StandardAutoloader' => array(
'namespaces' => array(
__NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
),
......
composer.json
View file @ bea9c6d2
{
"name": "unicaen/ldap",
"description": "Module Ldap des applications Unicaen",
"require": {
"php": "7.3.*",
"zendframework/zend-config": "^3.2",
"zendframework/zend-i18n": "^2.9",
"zendframework/zend-ldap": "^2.10",
"zendframework/zend-log": "^2.10",
"zendframework/zend-modulemanager": "^2.8",
"zendframework/zend-serializer": "^2.9",
"zendframework/zend-servicemanager": "^3.4",
"zendframework/zend-stdlib": "^3.2"
},
"require-dev": {
"phpunit/phpunit": ">=3.7",
"zendframework/zend-test": "^3.2"
},
"autoload": {
"psr-0": {
"UnicaenLdap": "src/",
"UnicaenLdapUnitTest": "tests/unit/",
"UnicaenLdapFuncTest": "tests/func/"
"name": "unicaen/ldap",
"description": "Module Ldap des applications Unicaen",
"require": {
"php": "7.3.*",
"laminas/laminas-config": "^3.2",
"laminas/laminas-i18n": "^2.9",
"laminas/laminas-ldap": "^2.10",
"laminas/laminas-log": "^2.10",
"laminas/laminas-modulemanager": "^2.8",
"laminas/laminas-serializer": "^2.9",
"laminas/laminas-servicemanager": "^3.4",
"laminas/laminas-stdlib": "^3.2",
"laminas/laminas-dependency-plugin": "^2.1"
},
"classmap": [
"./Module.php"
]
}
"require-dev": {
"phpunit/phpunit": ">=3.7",
"laminas/laminas-test": "^3.2"
},
"autoload": {
"psr-0": {
"UnicaenLdap": "src/",
"UnicaenLdapUnitTest": "tests/unit/",
"UnicaenLdapFuncTest": "tests/func/"
},
"classmap": [
"./Module.php"
]
}
}
composer.lock deleted 100644 → 0
View file @ ad8f5627
This diff is collapsed.
config/module.config.php
View file @ bea9c6d2
......@@ -20,7 +20,7 @@ use UnicaenLdap\Service\Structure as LdapStructureService;
use UnicaenLdap\Service\StructureFactory as StructureServiceFactory;
use UnicaenLdap\Service\System as LdapSystemService;
use UnicaenLdap\Service\SystemFactory as SystemServiceFactory;
use Zend\ServiceManager\Proxy\LazyServiceFactory;
use Laminas\ServiceManager\Proxy\LazyServiceFactory;
return array(
'unicaen-ldap' => [
......
src/UnicaenLdap/Entity/Base/Generic.php
View file @ bea9c6d2
......@@ -4,8 +4,8 @@ namespace UnicaenLdap\Entity\Base;
use UnicaenLdap\Entity\Entity;
use UnicaenLdap\Exception;
use Zend\Ldap\Attribute;
use Zend\Ldap\Exception\LdapException;
use Laminas\Ldap\Attribute;
use Laminas\Ldap\Exception\LdapException;
/**
* Classe mère des entités de la branche "generic" de l'annuaire LDAP.
......
src/UnicaenLdap/Entity/Base/Group.php
View file @ bea9c6d2
......@@ -7,8 +7,8 @@ use UnicaenLdap\Entity\People as PeopleEntity;
use UnicaenLdap\Entity\Structure as StructureEntity;
use UnicaenLdap\Entity\System as SystemEntity;
use UnicaenLdap\Exception;
use Zend\Ldap\Dn;
use Zend\Ldap\Exception\LdapException;
use Laminas\Ldap\Dn;
use Laminas\Ldap\Exception\LdapException;
/**
* Classe mère des entités de la branche "groups" de l'annuaire LDAP.
......
src/UnicaenLdap/Entity/Base/People.php
View file @ bea9c6d2
......@@ -7,9 +7,9 @@ use UnicaenLdap\Entity\Entity;
use UnicaenLdap\Entity\People as PeopleEntity;
use UnicaenLdap\Entity\Structure as StructureEntity;
use UnicaenLdap\Exception;
use Zend\Ldap\Attribute;
use Zend\Ldap\Dn;
use Zend\Ldap\Exception\LdapException;
use Laminas\Ldap\Attribute;
use Laminas\Ldap\Dn;
use Laminas\Ldap\Exception\LdapException;
/**
* Classe mère des entités de la branche "people" de l'annuaire LDAP.
......
src/UnicaenLdap/Entity/Base/Root.php
View file @ bea9c6d2
......@@ -5,7 +5,7 @@ namespace UnicaenLdap\Entity\Base;
use UnicaenLdap\Entity\Entity;
use UnicaenLdap\Entity\Structure as StructureEntity;
use UnicaenLdap\Exception;
use Zend\Ldap\Exception\LdapException;
use Laminas\Ldap\Exception\LdapException;
/**
* Classe mère de l'entité racine de l'annuaire LDAP.
......
src/UnicaenLdap/Entity/Base/Structure.php
View file @ bea9c6d2
......@@ -5,7 +5,7 @@ namespace UnicaenLdap\Entity\Base;
use UnicaenLdap\Entity\Entity;
use UnicaenLdap\Entity\Structure as StructureEntity;
use UnicaenLdap\Exception;
use Zend\Ldap\Exception\LdapException;
use Laminas\Ldap\Exception\LdapException;
/**
* Classe mère des entités de la branche "structures" de l'annuaire LDAP.
......
src/UnicaenLdap/Entity/Base/System.php
View file @ bea9c6d2
......@@ -3,8 +3,8 @@
namespace UnicaenLdap\Entity\Base;
use UnicaenLdap\Entity\Entity;
use Zend\Ldap\Attribute;
use Zend\Ldap\Exception\LdapException;
use Laminas\Ldap\Attribute;
use Laminas\Ldap\Exception\LdapException;
/**
* Classe mère des entités de la branche "system" de l'annuaire LDAP.
......
src/UnicaenLdap/Entity/Entity.php
View file @ bea9c6d2
......@@ -6,8 +6,8 @@ use UnicaenLdap\Node;
use UnicaenLdap\Exception;
use UnicaenLdap\Service\AbstractService;
use UnicaenLdap\Util;
use Zend\Ldap\Dn;
use Zend\Ldap\Exception\LdapException;
use Laminas\Ldap\Dn;
use Laminas\Ldap\Exception\LdapException;
/**
* Classe mère des entrées de l'annuaire LDAP.
......@@ -473,7 +473,7 @@ abstract class Entity
* Node will be moved on calling update().
*
* @param string | Dn $newDn
* @throws \Zend\Ldap\Exception\LdapException
* @throws \Laminas\Ldap\Exception\LdapException
*/
public function move(string $newOu)
{
......@@ -500,7 +500,7 @@ abstract class Entity
* This is an offline method. Node will be renamed on calling update().
*
* @param string | Dn $newDn
* @throws \Zend\Ldap\Exception\LdapException
* @throws \Laminas\Ldap\Exception\LdapException
*/
public function rename($newId)
{
......
src/UnicaenLdap/Entity/Group.php
View file @ bea9c6d2
......@@ -44,7 +44,7 @@ class Group extends BaseGroup
*
* @param string $orderBy Champ de tri (au besoin)
* @return People[]
* @throws \Zend\Ldap\Exception\LdapException
* @throws \Laminas\Ldap\Exception\LdapException
*/
public function getMembres($orderBy = null)
{
......
src/UnicaenLdap/Entity/People.php
View file @ bea9c6d2
......@@ -8,7 +8,7 @@ use UnicaenLdap\Entity\Group as GroupEntity;
use UnicaenLdap\Entity\Structure as StructureEntity;
use UnicaenLdap\Entity\System as SystemEntity;
use UnicaenLdap\Exception;
use Zend\Ldap\Dn;
use Laminas\Ldap\Dn;
/**
* Classe de gestion des entités de la branche "people" de l'annuaire LDAP.
......@@ -118,7 +118,7 @@ class People extends BasePeople
*
* @return People|SystemEntity|string|null
* @throws Exception
* @throws \Zend\Ldap\Exception\LdapException
* @throws \Laminas\Ldap\Exception\LdapException
*/
public function getParrain()
{
......@@ -451,7 +451,7 @@ class People extends BasePeople
* @param string|Dn|StructureEntity $value
* @return bool
* @throws Exception
* @throws \Zend\Ldap\Exception\LdapException
* @throws \Laminas\Ldap\Exception\LdapException
*/
public function isInStructure($value)
{
......@@ -629,7 +629,7 @@ class People extends BasePeople
* @param string|Dn|StructureEntity|null $value
* @return bool
* @throws Exception
* @throws \Zend\Ldap\Exception\LdapException
* @throws \Laminas\Ldap\Exception\LdapException
*/
public function hasRoleInStructure(string $role, string $type, $structure = null): bool
{
......@@ -711,7 +711,7 @@ class People extends BasePeople
* @param string $value
* @return $this
* @throws \UnicaenLdap\Exception
* @throws \Zend\Ldap\Exception\LdapException
* @throws \Laminas\Ldap\Exception\LdapException
*/
public function setPassword(string $value)
{
......
src/UnicaenLdap/Entity/Root.php
View file @ bea9c6d2
......@@ -4,7 +4,7 @@ namespace UnicaenLdap\Entity;
use UnicaenLdap\Entity\Base\Root as BaseRoot;
use UnicaenLdap\Filter\Filter;
use Zend\Ldap\Exception\LdapException;
use Laminas\Ldap\Exception\LdapException;
/**
* Classe de gestion de l'entité racine de l'annuaire LDAP.
......
src/UnicaenLdap/Entity/Structure.php
View file @ bea9c6d2
......@@ -4,7 +4,7 @@ namespace UnicaenLdap\Entity;
use UnicaenLdap\Entity\Base\Structure as BaseStructure;
use UnicaenLdap\Filter\Filter;
use Zend\Ldap\Exception\LdapException;
use Laminas\Ldap\Exception\LdapException;
/**
* Classe de gestion des entités de la branche "structures" de l'annuaire LDAP.
......
src/UnicaenLdap/Filter/Filter.php
View file @ bea9c6d2
......@@ -2,14 +2,14 @@
namespace UnicaenLdap\Filter;
use Zend\Ldap\Filter as ZendFilter;
use Laminas\Ldap\Filter as LaminasFilter;
/**
* Filtre de base
*
* @author Laurent Lécluse <laurent.lecluse at unicaen.fr>
*/
class Filter extends ZendFilter
class Filter extends LaminasFilter
{
}
\ No newline at end of file
src/UnicaenLdap/Filter/People.php
View file @ bea9c6d2
......@@ -2,8 +2,8 @@
namespace UnicaenLdap\Filter;
use Zend\Ldap\Filter\AbstractFilter;
use Zend\Ldap\Filter\MaskFilter;
use Laminas\Ldap\Filter\AbstractFilter;
use Laminas\Ldap\Filter\MaskFilter;
/**
* Filtres pour les personnes.
......
src/UnicaenLdap/Filter/Structure.php
View file @ bea9c6d2
......@@ -2,7 +2,7 @@
namespace UnicaenLdap\Filter;
use Zend\Ldap\Filter;
use Laminas\Ldap\Filter;
/**
* Filtres pour les structures
......
src/UnicaenLdap/Ldap.php
View file @ bea9c6d2
......@@ -7,6 +7,6 @@ namespace UnicaenLdap;
*
* @author Laurent Lécluse <laurent.lecluse at unicaen.fr>
*/
class Ldap extends \Zend\Ldap\Ldap {
class Ldap extends \Laminas\Ldap\Ldap {
}
\ No newline at end of file
src/UnicaenLdap/LdapFactory.php
View file @ bea9c6d2
......@@ -3,8 +3,8 @@
namespace UnicaenLdap;
use Interop\Container\ContainerInterface;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
use Laminas\ServiceManager\FactoryInterface;
use Laminas\ServiceManager\ServiceLocatorInterface;
/**
*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment