Commit 8576e6f0 authored by David Surville's avatar David Surville
Browse files

Merge branch 'master' into release-1.1.0

parents 98cb14fc 4335972a

Module.php

+5 −5
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 


namespace UnicaenAuthentification;



use Zend\EventManager\EventInterface;

use Zend\ModuleManager\Feature\AutoloaderProviderInterface;

use Zend\ModuleManager\Feature\ConfigProviderInterface;

use Zend\ModuleManager\Feature\ServiceProviderInterface;

use Laminas\EventManager\EventInterface;

use Laminas\ModuleManager\Feature\AutoloaderProviderInterface;

use Laminas\ModuleManager\Feature\ConfigProviderInterface;

use Laminas\ModuleManager\Feature\ServiceProviderInterface;



/**

 * Point d'entrée du module d'authentification Unicaen.
@@ -30,7 +30,7 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se 
    public function getAutoloaderConfig()

    {

        return [

            'Zend\Loader\StandardAutoloader' => [

            'Laminas\Loader\StandardAutoloader' => [

                'namespaces' => [

                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,

                ],

composer.json

+6 −5
Original line number Diff line number Diff line
@@ -8,10 +8,11 @@ 
        }

    ],

    "require": {

        "unicaen/app":                                  "^3.0",

        "unicaen/bjy-authorize":                        "^3.0",

        "unicaen/app": "^4.0.3",

        "unicaen/bjy-authorize": "^4.0",

        "jasig/phpcas": "^1.3",

        "ramsey/uuid":                                  "^3.7"

        "ramsey/uuid": "^3.7",

        "laminas/laminas-dependency-plugin": "^2.1"

    },

    "require-dev": {

        "phpunit/phpunit": "^5.6"

composer.lock

deleted100644 → 0
+0 −6269

File deleted.

Preview size limit exceeded, changes collapsed.

config/module.config.php

+3 −3
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ use UnicaenPrivilege\Guard\PrivilegeControllerFactory; 
use UnicaenPrivilege\Guard\PrivilegeRoute;

use UnicaenPrivilege\Guard\PrivilegeRouteFactory;

use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProviderFactory;

use Zend\Authentication\AuthenticationService;

use Zend\ServiceManager\Proxy\LazyServiceFactory;

use Laminas\Authentication\AuthenticationService;

use Laminas\ServiceManager\Proxy\LazyServiceFactory;



$settings = [

    /**
@@ -570,7 +570,7 @@ return [ 
            'unicaen-auth_module_options' => ModuleOptions::class,

            'zfcuser_login_form' => LoginForm::class,

            AuthenticationService::class => 'zfcuser_auth_service',

            'Zend\Authentication\AuthenticationService' => 'zfcuser_auth_service',

            'Laminas\Authentication\AuthenticationService' => 'zfcuser_auth_service',

            'unicaen-auth_user_service' => User::class, // pour la compatibilité

            'authUserContext' => UserContext::class, // pour la compatibilité

            'AuthUserContext' => UserContext::class, // pour la compatibilité

src/UnicaenAuthentification/Authentication/Adapter/AbstractAdapter.php

+5 −5
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 
namespace UnicaenAuthentification\Authentication\Adapter;



use UnicaenAuthentification\Authentication\SessionIdentity;

use Zend\Authentication\Storage\StorageInterface;

use Zend\EventManager\EventInterface;

use Zend\EventManager\EventManagerInterface;

use Zend\EventManager\ListenerAggregateInterface;

use Zend\EventManager\ListenerAggregateTrait;

use Laminas\Authentication\Storage\StorageInterface;

use Laminas\EventManager\EventInterface;

use Laminas\EventManager\EventManagerInterface;

use Laminas\EventManager\ListenerAggregateInterface;

use Laminas\EventManager\ListenerAggregateTrait;

use ZfcUser\Authentication\Adapter\ChainableAdapter;



abstract class AbstractAdapter implements ChainableAdapter, ListenerAggregateInterface