Commit 2a2a7f9f authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch '6.x'

parents 49691b6b f92082c4

composer.json

+10 −4
Original line number Diff line number Diff line
@@ -8,14 +8,15 @@ 
        }

    ],

    "require": {

        "unicaen/app": "^4.0 || ^5.0",

        "unicaen/auth": "^4.0 || ^5.0",

        "ramsey/uuid": "^3.7",

        "unicaen/app": "dev-ll-php8-bs5",

        "unicaen/auth": "dev-ll-php8-bs5",

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

    },

    "require-dev": {

        "phpunit/phpunit": "^5.6"

        "phpunit/phpunit": "^8.0"

    },

    "minimum-stability": "dev",

    "prefer-stable": true,

    "autoload": {

        "psr-0": {

            "UnicaenAuthToken": "src/"
@@ -23,5 +24,10 @@ 
        "classmap": [

            "./Module.php"

        ]

    },

    "config": {

        "allow-plugins": {

            "laminas/laminas-dependency-plugin": true

        }

    }

}

config/module.config.php

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


namespace UnicaenAuthToken;



use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;

use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;

use Doctrine\ORM\Mapping\Driver\XmlDriver;

use UnicaenAuth\Entity\Db\User;

use UnicaenAuth\Guard\PrivilegeController;