Skip to content
Snippets Groups Projects
Commit 2a2a7f9f authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch '6.x'

parents 49691b6b f92082c4
No related branches found
No related tags found
No related merge requests found
Pipeline #18505 passed
...@@ -8,14 +8,15 @@ ...@@ -8,14 +8,15 @@
} }
], ],
"require": { "require": {
"unicaen/app": "^4.0 || ^5.0", "unicaen/app": "dev-ll-php8-bs5",
"unicaen/auth": "^4.0 || ^5.0", "unicaen/auth": "dev-ll-php8-bs5",
"ramsey/uuid": "^3.7",
"laminas/laminas-dependency-plugin": "^2.1" "laminas/laminas-dependency-plugin": "^2.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.6" "phpunit/phpunit": "^8.0"
}, },
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"UnicaenAuthToken": "src/" "UnicaenAuthToken": "src/"
...@@ -23,5 +24,10 @@ ...@@ -23,5 +24,10 @@
"classmap": [ "classmap": [
"./Module.php" "./Module.php"
] ]
},
"config": {
"allow-plugins": {
"laminas/laminas-dependency-plugin": true
}
} }
} }
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace UnicaenAuthToken; namespace UnicaenAuthToken;
use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain; use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
use Doctrine\ORM\Mapping\Driver\XmlDriver; use Doctrine\ORM\Mapping\Driver\XmlDriver;
use UnicaenAuth\Entity\Db\User; use UnicaenAuth\Entity\Db\User;
use UnicaenAuth\Guard\PrivilegeController; use UnicaenAuth\Guard\PrivilegeController;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment