Commit 024799dd authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'develop'

parents 124850bb 96783864
Pipeline #5260 failed with stage
in 9 seconds
...@@ -8,8 +8,9 @@ ...@@ -8,8 +8,9 @@
} }
], ],
"require": { "require": {
"unicaen/app": "dev-zf-3.x", "php": "7.3.*",
"unicaen/bjy-authorize": "dev-zf-3.x", "unicaen/app": "^3.0",
"unicaen/bjy-authorize": "^3.0",
"jasig/phpcas": "^1.3", "jasig/phpcas": "^1.3",
"ramsey/uuid": "^3.7" "ramsey/uuid": "^3.7"
}, },
......
...@@ -4,8 +4,63 @@ ...@@ -4,8 +4,63 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "645905181831845b2ea4799ccdd6e7d1", "content-hash": "419e4d383e70900005a35868de3b2dc3",
"packages": [ "packages": [
{
"name": "beberlei/assert",
"version": "v2.9.9",
"source": {
"type": "git",
"url": "https://github.com/beberlei/assert.git",
"reference": "124317de301b7c91d5fce34c98bba2c6925bec95"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/beberlei/assert/zipball/124317de301b7c91d5fce34c98bba2c6925bec95",
"reference": "124317de301b7c91d5fce34c98bba2c6925bec95",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"php": ">=5.3"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.1.1",
"phpunit/phpunit": "^4.8.35|^5.7"
},
"type": "library",
"autoload": {
"psr-4": {
"Assert\\": "lib/Assert"
},
"files": [
"lib/Assert/functions.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-2-Clause"
],
"authors": [
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de",
"role": "Lead Developer"
},
{
"name": "Richard Quadling",
"email": "rquadling@gmail.com",
"role": "Collaborator"
}
],
"description": "Thin assertion library for input validation in business models.",
"keywords": [
"assert",
"assertion",
"validation"
],
"time": "2019-05-28T15:27:37+00:00"
},
{ {
"name": "container-interop/container-interop", "name": "container-interop/container-interop",
"version": "1.2.0", "version": "1.2.0",
...@@ -39,16 +94,16 @@ ...@@ -39,16 +94,16 @@
}, },
{ {
"name": "doctrine/annotations", "name": "doctrine/annotations",
"version": "v1.6.0", "version": "v1.7.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/annotations.git", "url": "https://github.com/doctrine/annotations.git",
"reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" "reference": "fa4c4e861e809d6a1103bd620cce63ed91aedfeb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", "url": "https://api.github.com/repos/doctrine/annotations/zipball/fa4c4e861e809d6a1103bd620cce63ed91aedfeb",
"reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", "reference": "fa4c4e861e809d6a1103bd620cce63ed91aedfeb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -57,12 +112,12 @@ ...@@ -57,12 +112,12 @@
}, },
"require-dev": { "require-dev": {
"doctrine/cache": "1.*", "doctrine/cache": "1.*",
"phpunit/phpunit": "^6.4" "phpunit/phpunit": "^7.5@dev"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.6.x-dev" "dev-master": "1.7.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -75,6 +130,10 @@ ...@@ -75,6 +130,10 @@
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{ {
"name": "Roman Borschel", "name": "Roman Borschel",
"email": "roman@code-factory.org" "email": "roman@code-factory.org"
...@@ -83,10 +142,6 @@ ...@@ -83,10 +142,6 @@
"name": "Benjamin Eberlei", "name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de" "email": "kontakt@beberlei.de"
}, },
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{ {
"name": "Jonathan Wage", "name": "Jonathan Wage",
"email": "jonwage@gmail.com" "email": "jonwage@gmail.com"
...@@ -103,7 +158,7 @@ ...@@ -103,7 +158,7 @@
"docblock", "docblock",
"parser" "parser"
], ],
"time": "2017-12-06T07:11:42+00:00" "time": "2019-08-08T18:11:40+00:00"
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
...@@ -182,34 +237,36 @@ ...@@ -182,34 +237,36 @@
}, },
{ {
"name": "doctrine/collections", "name": "doctrine/collections",
"version": "v1.5.0", "version": "v1.6.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/collections.git", "url": "https://github.com/doctrine/collections.git",
"reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf" "reference": "c5e0bc17b1620e97c968ac409acbff28b8b850be"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf", "url": "https://api.github.com/repos/doctrine/collections/zipball/c5e0bc17b1620e97c968ac409acbff28b8b850be",
"reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf", "reference": "c5e0bc17b1620e97c968ac409acbff28b8b850be",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1" "php": "^7.1.3"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "~0.1@dev", "doctrine/coding-standard": "^6.0",
"phpunit/phpunit": "^5.7" "phpstan/phpstan-shim": "^0.9.2",
"phpunit/phpunit": "^7.0",
"vimeo/psalm": "^3.2.2"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.3.x-dev" "dev-master": "1.6.x-dev"
} }
}, },
"autoload": { "autoload": {
"psr-0": { "psr-4": {
"Doctrine\\Common\\Collections\\": "lib/" "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
...@@ -238,27 +295,28 @@ ...@@ -238,27 +295,28 @@
"email": "schmittjoh@gmail.com" "email": "schmittjoh@gmail.com"
} }
], ],
"description": "Collections Abstraction library", "description": "PHP Doctrine Collections library that adds additional functionality on top of PHP arrays.",
"homepage": "http://www.doctrine-project.org", "homepage": "https://www.doctrine-project.org/projects/collections.html",
"keywords": [ "keywords": [
"array", "array",
"collections", "collections",
"iterator" "iterators",
"php"
], ],
"time": "2017-07-22T10:37:32+00:00" "time": "2019-06-09T13:48:14+00:00"
}, },
{ {
"name": "doctrine/common", "name": "doctrine/common",
"version": "v2.10.0", "version": "v2.11.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/common.git", "url": "https://github.com/doctrine/common.git",
"reference": "30e33f60f64deec87df728c02b107f82cdafad9d" "reference": "b8ca1dcf6b0dc8a2af7a09baac8d0c48345df4ff"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/common/zipball/30e33f60f64deec87df728c02b107f82cdafad9d", "url": "https://api.github.com/repos/doctrine/common/zipball/b8ca1dcf6b0dc8a2af7a09baac8d0c48345df4ff",
"reference": "30e33f60f64deec87df728c02b107f82cdafad9d", "reference": "b8ca1dcf6b0dc8a2af7a09baac8d0c48345df4ff",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -274,14 +332,16 @@ ...@@ -274,14 +332,16 @@
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^1.0", "doctrine/coding-standard": "^1.0",
"phpunit/phpunit": "^6.3", "phpstan/phpstan": "^0.11",
"phpstan/phpstan-phpunit": "^0.11",
"phpunit/phpunit": "^7.0",
"squizlabs/php_codesniffer": "^3.0", "squizlabs/php_codesniffer": "^3.0",
"symfony/phpunit-bridge": "^4.0.5" "symfony/phpunit-bridge": "^4.0.5"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.10.x-dev" "dev-master": "2.11.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -294,6 +354,10 @@ ...@@ -294,6 +354,10 @@
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{ {
"name": "Roman Borschel", "name": "Roman Borschel",
"email": "roman@code-factory.org" "email": "roman@code-factory.org"
...@@ -302,10 +366,6 @@ ...@@ -302,10 +366,6 @@
"name": "Benjamin Eberlei", "name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de" "email": "kontakt@beberlei.de"
}, },
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{ {
"name": "Jonathan Wage", "name": "Jonathan Wage",
"email": "jonwage@gmail.com" "email": "jonwage@gmail.com"
...@@ -326,7 +386,7 @@ ...@@ -326,7 +386,7 @@
"doctrine", "doctrine",
"php" "php"
], ],
"time": "2018-11-21T01:24:55+00:00" "time": "2019-09-10T10:10:14+00:00"
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
...@@ -412,47 +472,49 @@ ...@@ -412,47 +472,49 @@
}, },
{ {
"name": "doctrine/doctrine-module", "name": "doctrine/doctrine-module",
"version": "1.2.0", "version": "2.1.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/DoctrineModule.git", "url": "https://github.com/doctrine/DoctrineModule.git",
"reference": "9407d04d0b08e7071dab05c9d068cefda9dc5a6f" "reference": "b1d4ac0bee00847188ba574f7998025c3caa771e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/DoctrineModule/zipball/9407d04d0b08e7071dab05c9d068cefda9dc5a6f", "url": "https://api.github.com/repos/doctrine/DoctrineModule/zipball/b1d4ac0bee00847188ba574f7998025c3caa771e",
"reference": "9407d04d0b08e7071dab05c9d068cefda9dc5a6f", "reference": "b1d4ac0bee00847188ba574f7998025c3caa771e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/cache": "^1.6", "doctrine/cache": "^1.7",
"doctrine/common": "^2.6.1", "doctrine/common": "^2.8",
"php": "^5.6 || ^7.0", "php": "^7.1",
"symfony/console": "^2.3 || ^3.0", "symfony/console": "^3.3 || ^4.0",
"zendframework/zend-authentication": "^2.5.3", "zendframework/zend-authentication": "^2.5.3",
"zendframework/zend-cache": "^2.7.1", "zendframework/zend-cache": "^2.7.1",
"zendframework/zend-form": "^2.9", "zendframework/zend-form": "^2.11",
"zendframework/zend-hydrator": "^1.1 || ^2.2.1", "zendframework/zend-hydrator": "^2.3",
"zendframework/zend-mvc": "^2.7.10 || ^3.0.1", "zendframework/zend-mvc": "^3.1",
"zendframework/zend-paginator": "^2.7", "zendframework/zend-paginator": "^2.8",
"zendframework/zend-servicemanager": "^2.7.6 || ^3.1", "zendframework/zend-servicemanager": "^3.3",
"zendframework/zend-stdlib": "^2.7.7 || ^3.0.1", "zendframework/zend-stdlib": "^3.1",
"zendframework/zend-validator": "^2.8.1" "zendframework/zend-validator": "^2.10"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.8", "phpunit/phpunit": "^7.5.2",
"squizlabs/php_codesniffer": "^2.6.2", "predis/predis": "^1.1",
"zendframework/zend-i18n": "^2.7.3", "squizlabs/php_codesniffer": "^2.7",
"zendframework/zend-i18n": "^2.7",
"zendframework/zend-log": "^2.9", "zendframework/zend-log": "^2.9",
"zendframework/zend-modulemanager": "^2.7.2", "zendframework/zend-modulemanager": "^2.8",
"zendframework/zend-mvc-console": "^1.1.11",
"zendframework/zend-serializer": "^2.8", "zendframework/zend-serializer": "^2.8",
"zendframework/zend-session": "^2.7.3", "zendframework/zend-session": "^2.8",
"zendframework/zend-test": "^2.6.1 || ^3.0.1", "zendframework/zend-test": "^3.1.1",
"zendframework/zend-version": "^2.5.1" "zendframework/zend-version": "^2.5.1"
}, },
"suggest": { "suggest": {
"doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments", "doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments",
"zendframework/zend-mvc-console": "^1.1.10 if you are using ZF3" "zendframework/zend-mvc-console": "^1.1.11 if you want to use the ZF3 console libraries"
}, },
"bin": [ "bin": [
"bin/doctrine-module" "bin/doctrine-module"
...@@ -460,7 +522,14 @@ ...@@ -460,7 +522,14 @@
"type": "library", "type": "library",
"extra": { "extra": {
"zf": { "zf": {
"config-provider": "DoctrineModule\\ConfigProvider",
"module": "DoctrineModule" "module": "DoctrineModule"
},
"branch-alias": {
"dev-1.2-dev": "1.2-dev",
"dev-2.0-dev": "2.0-dev",
"dev-master": "1.2-dev",
"dev-develop": "2.0-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -500,43 +569,44 @@ ...@@ -500,43 +569,44 @@
"module", "module",
"zf" "zf"
], ],
"time": "2016-10-03T19:40:55+00:00" "time": "2019-02-17T20:11:57+00:00"
}, },
{ {
"name": "doctrine/doctrine-orm-module", "name": "doctrine/doctrine-orm-module",
"version": "1.1.8", "version": "2.1.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/DoctrineORMModule.git", "url": "https://github.com/doctrine/DoctrineORMModule.git",
"reference": "d0ff7aaa1c4eabf4bab2a6ae73317c34330467c3" "reference": "652d8aa636333b6b3f39a2f079c1565b5a9f5a6e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/DoctrineORMModule/zipball/d0ff7aaa1c4eabf4bab2a6ae73317c34330467c3", "url": "https://api.github.com/repos/doctrine/DoctrineORMModule/zipball/652d8aa636333b6b3f39a2f079c1565b5a9f5a6e",
"reference": "d0ff7aaa1c4eabf4bab2a6ae73317c34330467c3", "reference": "652d8aa636333b6b3f39a2f079c1565b5a9f5a6e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/dbal": "^2.6.0", "doctrine/dbal": "^2.6.0",
"doctrine/doctrine-module": "^1.2", "doctrine/doctrine-module": "^2.1.3",
"doctrine/orm": "^2.6.0", "doctrine/orm": "^2.6.3",
"php": "^7.1", "php": "^7.1",
"symfony/console": "^2.3 || ^3.0 || ^4.0", "symfony/console": "^3.3 || ^4.0",
"zendframework/zend-hydrator": "^1.1 || ^2.2.1", "zendframework/zend-hydrator": "^2.3",
"zendframework/zend-mvc": "^2.7.10 || ^3.0.1", "zendframework/zend-mvc": "^3.1",
"zendframework/zend-servicemanager": "^2.7.6 || ^3.1", "zendframework/zend-servicemanager": "^3.3",
"zendframework/zend-stdlib": "^2.7.7 || ^3.0.1" "zendframework/zend-stdlib": "^3.2.1"
}, },
"require-dev": { "require-dev": {
"doctrine/data-fixtures": "^1.2.1", "doctrine/data-fixtures": "^1.2.1",
"doctrine/migrations": "^1.4.1", "doctrine/migrations": "^1.5 || ^2.0",
"phpunit/phpunit": "^6.5", "phpunit/phpunit": "^7.0.3",
"squizlabs/php_codesniffer": "^2.7", "squizlabs/php_codesniffer": "^2.7",
"zendframework/zend-console": "^2.6", "zendframework/zend-console": "^2.6",
"zendframework/zend-developer-tools": "^1.1", "zendframework/zend-developer-tools": "^1.1",
"zendframework/zend-i18n": "^2.7.3", "zendframework/zend-i18n": "^2.7.3",
"zendframework/zend-log": "^2.9", "zendframework/zend-log": "^2.9",
"zendframework/zend-modulemanager": "^2.7.2", "zendframework/zend-modulemanager": "^2.7.2",
"zendframework/zend-mvc-console": "^1.2",
"zendframework/zend-serializer": "^2.8" "zendframework/zend-serializer": "^2.8"
}, },
"suggest": { "suggest": {
...@@ -547,10 +617,14 @@ ...@@ -547,10 +617,14 @@
"type": "library", "type": "library",
"extra": { "extra": {
"zf": { "zf": {
"config-provider": "DoctrineORMModule\\ConfigProvider",
"module": "DoctrineORMModule" "module": "DoctrineORMModule"
} }
}, },
"autoload": { "autoload": {
"files": [
"src/autoload.php"
],
"psr-0": { "psr-0": {
"DoctrineORMModule\\": "src/" "DoctrineORMModule\\": "src/"
} }
...@@ -588,7 +662,7 @@ ...@@ -588,7 +662,7 @@
"orm", "orm",
"zf" "zf"
], ],
"time": "2018-04-15T22:58:02+00:00" "time": "2019-07-10T21:59:42+00:00"
}, },
{ {
"name": "doctrine/event-manager", "name": "doctrine/event-manager",
...@@ -733,27 +807,29 @@ ...@@ -733,27 +807,29 @@
}, },
{ {
"name": "doctrine/instantiator", "name": "doctrine/instantiator",
"version": "1.1.0", "version": "1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/instantiator.git", "url": "https://github.com/doctrine/instantiator.git",
"reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" "reference": "a2c590166b2133a4633738648b6b064edae0814a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
"reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "reference": "a2c590166b2133a4633738648b6b064edae0814a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1" "php": "^7.1"
}, },
"require-dev": { "require-dev": {
"athletic/athletic": "~0.1.8", "doctrine/coding-standard": "^6.0",
"ext-pdo": "*", "ext-pdo": "*",
"ext-phar": "*", "ext-phar": "*",
"phpunit/phpunit": "^6.2.3", "phpbench/phpbench": "^0.13",
"squizlabs/php_codesniffer": "^3.0.2" "phpstan/phpstan-phpunit": "^0.11",
"phpstan/phpstan-shim": "^0.11",
"phpunit/phpunit": "^7.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
...@@ -778,39 +854,44 @@ ...@@ -778,39 +854,44 @@
} }
], ],
"description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
"homepage": "https://github.com/doctrine/instantiator", "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
"keywords": [ "keywords": [
"constructor", "constructor",
"instantiate" "instantiate"
], ],
"time": "2017-07-22T11:58:36+00:00" "time": "2019-03-17T17:37:11+00:00"
}, },
{ {