Commit d08a1f5a authored by Laurent Lécluse's avatar Laurent Lécluse
Browse files

Merge depuis Master

parents 7e1c4fc7 14396d3e
......@@ -23,7 +23,7 @@ author: Laurent Lécluse - DSI - Unicaen
`data/Mises à jour/07.0.sql`
#OSE 6.3.2 (en développement)
#OSE 6.3.2
## Corrections de bugs
......
......@@ -10,7 +10,7 @@
"require" : {
"php" : "^7.0",
"unicaen/app" : "1.3.11",
"unicaen/auth" : "1.2.9",
"unicaen/auth" : "1.2.11",
"zendframework/zend-code" : "^2.4",
"zendframework/zend-text" : "^2.4",
"bjyoungblood/bjy-authorize": "dev-master",
......@@ -18,9 +18,6 @@
"zendframework/zend-file" : "^2.4",
"unicaen/code" : "1.1.6",
"unicaen/import" : "1.1.6",
"unicaen/tbl" : "1.0.3",
"doctrine/annotations" : "1.4.0",
"doctrine/common" : "2.7.3"
"unicaen/tbl" : "1.0.3"
}
}
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "b9b695dde9dd96f5aea58310122585e4",
"content-hash": "c90c54e542aaf13d31999f1a5963343b",
"packages": [
{
"name": "bjyoungblood/bjy-authorize",
......@@ -147,37 +147,33 @@
},
{
"name": "doctrine/cache",
"version": "v1.7.1",
"version": "v1.6.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a"
"reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a",
"reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a",
"url": "https://api.github.com/repos/doctrine/cache/zipball/eb152c5100571c7a45470ff2a35095ab3f3b900b",
"reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b",
"shasum": ""
},
"require": {
"php": "~7.1"
"php": "~5.5|~7.0"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
},
"require-dev": {
"alcaeus/mongo-php-adapter": "^1.1",
"mongodb/mongodb": "^1.1",
"phpunit/phpunit": "^5.7",
"predis/predis": "~1.0"
},
"suggest": {
"alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
"phpunit/phpunit": "~4.8|~5.0",
"predis/predis": "~1.0",
"satooshi/php-coveralls": "~0.6"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.7.x-dev"
"dev-master": "1.6.x-dev"
}
},
"autoload": {
......@@ -217,24 +213,24 @@
"cache",
"caching"
],
"time": "2017-08-25T07:02:50+00:00"
"time": "2017-07-22T12:49:21+00:00"
},
{
"name": "doctrine/collections",
"version": "v1.5.0",
"version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/collections.git",
"reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
"reference": "1a4fb7e902202c33cce8c55989b945612943c2ba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
"reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
"url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba",
"reference": "1a4fb7e902202c33cce8c55989b945612943c2ba",
"shasum": ""
},
"require": {
"php": "^7.1"
"php": "^5.6 || ^7.0"
},
"require-dev": {
"doctrine/coding-standard": "~0.1@dev",
......@@ -284,7 +280,7 @@
"collections",
"iterator"
],
"time": "2017-07-22T10:37:32+00:00"
"time": "2017-01-03T10:49:41+00:00"
},
{
"name": "doctrine/common",
......@@ -361,26 +357,24 @@
},
{
"name": "doctrine/dbal",
"version": "v2.6.3",
"version": "v2.5.13",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "e3eed9b1facbb0ced3a0995244843a189e7d1b13"
"reference": "729340d8d1eec8f01bff708e12e449a3415af873"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/e3eed9b1facbb0ced3a0995244843a189e7d1b13",
"reference": "e3eed9b1facbb0ced3a0995244843a189e7d1b13",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/729340d8d1eec8f01bff708e12e449a3415af873",
"reference": "729340d8d1eec8f01bff708e12e449a3415af873",
"shasum": ""
},
"require": {
"doctrine/common": "^2.7.1",
"ext-pdo": "*",
"php": "^7.1"
"doctrine/common": ">=2.4,<2.8-dev",
"php": ">=5.3.2"
},
"require-dev": {
"phpunit/phpunit": "^5.4.6",
"phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
"phpunit/phpunit": "4.*",
"symfony/console": "2.*||^3.0"
},
"suggest": {
......@@ -392,7 +386,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6.x-dev"
"dev-master": "2.5.x-dev"
}
},
"autoload": {
......@@ -430,7 +424,7 @@
"persistence",
"queryobject"
],
"time": "2017-11-19T13:38:54+00:00"
"time": "2017-07-22T20:44:48+00:00"
},
{
"name": "doctrine/doctrine-module",
......@@ -590,20 +584,20 @@
},
{
"name": "doctrine/inflector",
"version": "v1.3.0",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "5527a48b7313d15261292c149e55e26eae771b0a"
"reference": "e11d84c6e018beedd929cff5220969a3c6d1d462"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
"reference": "5527a48b7313d15261292c149e55e26eae771b0a",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462",
"reference": "e11d84c6e018beedd929cff5220969a3c6d1d462",
"shasum": ""
},
"require": {
"php": "^7.1"
"php": "^7.0"
},
"require-dev": {
"phpunit/phpunit": "^6.2"
......@@ -611,7 +605,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3.x-dev"
"dev-master": "1.2.x-dev"
}
},
"autoload": {
......@@ -653,36 +647,36 @@
"singularize",
"string"
],
"time": "2018-01-09T20:05:19+00:00"
"time": "2017-07-22T12:18:28+00:00"
},
{
"name": "doctrine/instantiator",
"version": "1.1.0",
"version": "1.0.5",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
"reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
"reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
"shasum": ""
},
"require": {
"php": "^7.1"
"php": ">=5.3,<8.0-DEV"
},
"require-dev": {
"athletic/athletic": "~0.1.8",
"ext-pdo": "*",
"ext-phar": "*",
"phpunit/phpunit": "^6.2.3",
"squizlabs/php_codesniffer": "^3.0.2"
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~2.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2.x-dev"
"dev-master": "1.0.x-dev"
}
},
"autoload": {
......@@ -707,7 +701,7 @@
"constructor",
"instantiate"
],
"time": "2017-07-22T11:58:36+00:00"
"time": "2015-06-14T21:17:01+00:00"
},
{
"name": "doctrine/lexer",
......@@ -1506,11 +1500,11 @@
},
{
"name": "unicaen/auth",
"version": "1.2.9",
"version": "1.2.11",
"source": {
"type": "git",
"url": "https://git.unicaen.fr/lib/unicaen/auth.git",
"reference": "345436e28c3543f5adb8a3133cb4f84da8df5683"
"reference": "009c34b26406a459480fca2945b5e0c2aba6cd27"
},
"require": {
"bjyoungblood/bjy-authorize": ">=1.4",
......@@ -1532,7 +1526,7 @@
]
},
"description": "Module d'authentification pour les applications Unicaen",
"time": "2018-05-28T13:19:03+00:00"
"time": "2018-05-30T14:25:48+00:00"
},
{
"name": "unicaen/code",
......
......@@ -5,7 +5,7 @@ if (file_exists($versionFile)){
}else{
$version = 'inconnue';
}
$dateVersion = '20/04/2018';
$dateVersion = '31/05/2018';
return [
'unicaen-app' => [
......
This diff is collapsed.
Supports Markdown
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