Commit acca96dd authored by David Surville's avatar David Surville
Browse files

Merge branch 'master' of https://git.unicaen.fr/lib/unicaen/ldap

parents 63b3c6f4 3ebcdc7f

Module.php

+4 −4
Changes for Module.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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

+11 −10
Changes for composer.json: 11 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -2,19 +2,20 @@ 
    "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"

        "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"

    },

    "require-dev": {

        "phpunit/phpunit": ">=3.7",

    "zendframework/zend-test": "^3.2"

        "laminas/laminas-test": "^3.2"

    },

    "autoload": {

        "psr-0": {

composer.lock

deleted100644 → 0
+0 −2906

File deleted.

Preview size limit exceeded, changes collapsed.

config/module.config.php

+1 −1
Changes for config/module.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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

+2 −2
Changes for src/UnicaenLdap/Entity/Base/Generic.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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.