Commit 9f5a17e7 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge de la branche develop + adaptations

parent 56fdb7b7
Loading
Loading
Loading
Loading
+5 −0
Changes for CHANGELOG.md: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
Journal des modifications
=========================

2.2.2
-----
- Authentification simplifiée des rapporteurs à l'aide d'un token.
- Le rapporteur peut annuler son avis de soutenance.

2.2.1
-----
- Ajout de la possibilité de modifier une proposition de soutenance pour gestion (sans retrait de validation)
+7 −1
Changes for composer.json: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -20,10 +20,14 @@
        "ext-intl":                      "*",
        "ext-json":                      "*",
        "ext-readline":                  "*",
        "ext-soap":                      "*",
        "ext-xmlwriter":                 "*",
        "ext-xsl":                       "*",
        "ext-zip":                       "*",
        "beberlei/assert":               "^2.9",
        "guzzlehttp/guzzle":             "^6.3",
        "ramsey/uuid":                   "^3.3",
        "twig/twig":                     "^3.0",
        "unicaen/app":                   "^3.1",
        "unicaen/auth":                  "^3.2",
        "unicaen/auth-token":            "dev-master",
@@ -34,6 +38,7 @@
        "unicaen/ldap":                  "^3.0",
        "webmozart/assert":              "^1.3",
        "zendframework/zend-feed":       "^2.12",
        "zendframework/zend-soap":       "^2.8",
        "zfcampus/zf-development-mode": "^3.2"
    },
    "autoload": {
@@ -41,7 +46,8 @@
            "Application\\": "module/Application/src",
            "Retraitement\\": "module/Retraitement/src",
            "Notification\\": "module/Notification/src",
            "Import\\": "module/Import/src"
            "Import\\": "module/Import/src",
            "StepStar\\": "module/StepStar/src"
        }
    },
    "autoload-dev": {
+223 −48
Changes for composer.lock: 223 added lines, 48 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
    "content-hash": "c077ae86c21bd11654b9d1d8bcdaae19",
    "content-hash": "f0ead10f7c5c518783aad301f65ee894",
    "packages": [
        {
            "name": "beberlei/assert",
@@ -3428,6 +3428,78 @@
            ],
            "time": "2016-11-16T10:37:54+00:00"
        },
        {
            "name": "twig/twig",
            "version": "v3.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
                "reference": "21578f00e83d4a82ecfa3d50752b609f13de6790"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/twigphp/Twig/zipball/21578f00e83d4a82ecfa3d50752b609f13de6790",
                "reference": "21578f00e83d4a82ecfa3d50752b609f13de6790",
                "shasum": ""
            },
            "require": {
                "php": ">=7.2.5",
                "symfony/polyfill-ctype": "^1.8",
                "symfony/polyfill-mbstring": "^1.3"
            },
            "require-dev": {
                "psr/container": "^1.0",
                "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "3.3-dev"
                }
            },
            "autoload": {
                "psr-4": {
                    "Twig\\": "src/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "BSD-3-Clause"
            ],
            "authors": [
                {
                    "name": "Fabien Potencier",
                    "email": "fabien@symfony.com",
                    "homepage": "http://fabien.potencier.org",
                    "role": "Lead Developer"
                },
                {
                    "name": "Twig Team",
                    "role": "Contributors"
                },
                {
                    "name": "Armin Ronacher",
                    "email": "armin.ronacher@active-4.com",
                    "role": "Project Founder"
                }
            ],
            "description": "Twig, the flexible, fast, and secure template language for PHP",
            "homepage": "https://twig.symfony.com",
            "keywords": [
                "templating"
            ],
            "funding": [
                {
                    "url": "https://github.com/fabpot",
                    "type": "github"
                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
                    "type": "tidelift"
                }
            ],
            "time": "2021-05-16T12:14:13+00:00"
        },
        {
            "name": "unicaen/app",
            "version": "3.1.19",
@@ -6096,6 +6168,54 @@
            "abandoned": "laminas/laminas-serializer",
            "time": "2019-10-19T08:06:30+00:00"
        },
        {
            "name": "zendframework/zend-server",
            "version": "2.8.1",
            "source": {
                "type": "git",
                "url": "https://github.com/zendframework/zend-server.git",
                "reference": "d80c44700ebb92191dd9a3005316a6ab6637c0d1"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/d80c44700ebb92191dd9a3005316a6ab6637c0d1",
                "reference": "d80c44700ebb92191dd9a3005316a6ab6637c0d1",
                "shasum": ""
            },
            "require": {
                "php": "^5.6 || ^7.0",
                "zendframework/zend-code": "^2.5 || ^3.0",
                "zendframework/zend-stdlib": "^2.5 || ^3.0"
            },
            "require-dev": {
                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
                "zendframework/zend-coding-standard": "~1.0.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "2.8.x-dev",
                    "dev-develop": "2.9.x-dev"
                }
            },
            "autoload": {
                "psr-4": {
                    "Zend\\Server\\": "src/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "BSD-3-Clause"
            ],
            "description": "Create Reflection-based RPC servers",
            "keywords": [
                "ZendFramework",
                "server",
                "zf"
            ],
            "abandoned": "laminas/laminas-server",
            "time": "2019-10-16T18:27:05+00:00"
        },
        {
            "name": "zendframework/zend-servicemanager",
            "version": "3.4.0",
@@ -6233,6 +6353,60 @@
            "abandoned": "laminas/laminas-session",
            "time": "2019-10-28T19:40:43+00:00"
        },
        {
            "name": "zendframework/zend-soap",
            "version": "2.8.0",
            "source": {
                "type": "git",
                "url": "https://github.com/zendframework/zend-soap.git",
                "reference": "8762d79efa220d82529c43ce08d70554146be645"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/8762d79efa220d82529c43ce08d70554146be645",
                "reference": "8762d79efa220d82529c43ce08d70554146be645",
                "shasum": ""
            },
            "require": {
                "ext-soap": "*",
                "php": "^5.6 || ^7.0",
                "zendframework/zend-server": "^2.6.1",
                "zendframework/zend-stdlib": "^2.7 || ^3.0",
                "zendframework/zend-uri": "^2.5.2"
            },
            "require-dev": {
                "phpunit/phpunit": "^5.7.21 || ^6.3",
                "zendframework/zend-coding-standard": "~1.0.0",
                "zendframework/zend-config": "^2.6",
                "zendframework/zend-http": "^2.5.4"
            },
            "suggest": {
                "zendframework/zend-http": "Zend\\Http component"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "2.7.x-dev",
                    "dev-develop": "2.8.x-dev"
                }
            },
            "autoload": {
                "psr-4": {
                    "Zend\\Soap\\": "src/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "BSD-3-Clause"
            ],
            "homepage": "https://github.com/zendframework/zend-soap",
            "keywords": [
                "soap",
                "zf2"
            ],
            "abandoned": "laminas/laminas-soap",
            "time": "2019-04-30T16:45:35+00:00"
        },
        {
            "name": "zendframework/zend-stdlib",
            "version": "3.2.1",
@@ -7231,16 +7405,16 @@
        },
        {
            "name": "phpunit/phpunit",
            "version": "5.6.4",
            "version": "5.7.27",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
                "reference": "4ddb822f1de421b4cadb47570a525fd7d9359493"
                "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4ddb822f1de421b4cadb47570a525fd7d9359493",
                "reference": "4ddb822f1de421b4cadb47570a525fd7d9359493",
                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
                "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
                "shasum": ""
            },
            "require": {
@@ -7251,26 +7425,24 @@
                "ext-xml": "*",
                "myclabs/deep-copy": "~1.3",
                "php": "^5.6 || ^7.0",
                "phpspec/prophecy": "^1.3.1",
                "phpunit/php-code-coverage": "^4.0.1",
                "phpspec/prophecy": "^1.6.2",
                "phpunit/php-code-coverage": "^4.0.4",
                "phpunit/php-file-iterator": "~1.4",
                "phpunit/php-text-template": "~1.2",
                "phpunit/php-timer": "^1.0.6",
                "phpunit/phpunit-mock-objects": "^3.2",
                "sebastian/comparator": "~1.1",
                "sebastian/diff": "~1.2",
                "sebastian/environment": "^1.3 || ^2.0",
                "sebastian/exporter": "~1.2",
                "sebastian/global-state": "~1.0",
                "sebastian/object-enumerator": "~1.0",
                "sebastian/comparator": "^1.2.4",
                "sebastian/diff": "^1.4.3",
                "sebastian/environment": "^1.3.4 || ^2.0",
                "sebastian/exporter": "~2.0",
                "sebastian/global-state": "^1.1",
                "sebastian/object-enumerator": "~2.0",
                "sebastian/resource-operations": "~1.0",
                "sebastian/version": "~1.0|~2.0",
                "symfony/yaml": "~2.1|~3.0"
                "sebastian/version": "^1.0.6|^2.0.1",
                "symfony/yaml": "~2.1|~3.0|~4.0"
            },
            "conflict": {
                "phpdocumentor/reflection-docblock": "3.0.2",
                "sebastian/object-enumerator": "1.0.1",
                "sebastian/recursion-context": "1.0.3 || 1.0.4"
                "phpdocumentor/reflection-docblock": "3.0.2"
            },
            "require-dev": {
                "ext-pdo": "*"
@@ -7285,7 +7457,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "5.6.x-dev"
                    "dev-master": "5.7.x-dev"
                }
            },
            "autoload": {
@@ -7311,7 +7483,7 @@
                "testing",
                "xunit"
            ],
            "time": "2016-11-18T09:50:51+00:00"
            "time": "2018-02-01T05:50:59+00:00"
        },
        {
            "name": "phpunit/phpunit-mock-objects",
@@ -7592,21 +7764,21 @@
        },
        {
            "name": "sebastian/exporter",
            "version": "1.2.2",
            "version": "2.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/exporter.git",
                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3",
                "sebastian/recursion-context": "~1.0"
                "sebastian/recursion-context": "~2.0"
            },
            "require-dev": {
                "ext-mbstring": "*",
@@ -7615,7 +7787,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "1.3.x-dev"
                    "dev-master": "2.0.x-dev"
                }
            },
            "autoload": {
@@ -7655,7 +7827,7 @@
                "export",
                "exporter"
            ],
            "time": "2016-06-17T09:04:28+00:00"
            "time": "2016-11-19T08:54:04+00:00"
        },
        {
            "name": "sebastian/global-state",
@@ -7710,21 +7882,21 @@
        },
        {
            "name": "sebastian/object-enumerator",
            "version": "1.0.0",
            "version": "2.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
                "reference": "d4ca2fb70344987502567bc50081c03e6192fb26"
                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26",
                "reference": "d4ca2fb70344987502567bc50081c03e6192fb26",
                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
                "shasum": ""
            },
            "require": {
                "php": ">=5.6",
                "sebastian/recursion-context": "~1.0"
                "sebastian/recursion-context": "~2.0"
            },
            "require-dev": {
                "phpunit/phpunit": "~5"
@@ -7732,7 +7904,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "1.0.x-dev"
                    "dev-master": "2.0.x-dev"
                }
            },
            "autoload": {
@@ -7752,20 +7924,20 @@
            ],
            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
            "time": "2016-01-28T13:25:10+00:00"
            "time": "2017-02-18T15:18:39+00:00"
        },
        {
            "name": "sebastian/recursion-context",
            "version": "1.0.5",
            "version": "2.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/recursion-context.git",
                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
                "shasum": ""
            },
            "require": {
@@ -7777,7 +7949,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-master": "1.0.x-dev"
                    "dev-master": "2.0.x-dev"
                }
            },
            "autoload": {
@@ -7805,7 +7977,7 @@
            ],
            "description": "Provides functionality to recursively process PHP variables",
            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
            "time": "2016-10-03T07:41:43+00:00"
            "time": "2016-11-19T07:33:16+00:00"
        },
        {
            "name": "sebastian/resource-operations",
@@ -7894,27 +8066,27 @@
        },
        {
            "name": "symfony/yaml",
            "version": "v3.4.47",
            "version": "v4.4.26",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/yaml.git",
                "reference": "88289caa3c166321883f67fe5130188ebbb47094"
                "reference": "e096ef4b4c4c9a2f72c2ac660f54352cd31c60f8"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/symfony/yaml/zipball/88289caa3c166321883f67fe5130188ebbb47094",
                "reference": "88289caa3c166321883f67fe5130188ebbb47094",
                "url": "https://api.github.com/repos/symfony/yaml/zipball/e096ef4b4c4c9a2f72c2ac660f54352cd31c60f8",
                "reference": "e096ef4b4c4c9a2f72c2ac660f54352cd31c60f8",
                "shasum": ""
            },
            "require": {
                "php": "^5.5.9|>=7.0.8",
                "php": ">=7.1.3",
                "symfony/polyfill-ctype": "~1.8"
            },
            "conflict": {
                "symfony/console": "<3.4"
            },
            "require-dev": {
                "symfony/console": "~3.4|~4.0"
                "symfony/console": "^3.4|^4.0|^5.0"
            },
            "suggest": {
                "symfony/console": "For validating YAML files using the lint command"
@@ -7942,7 +8114,7 @@
                    "homepage": "https://symfony.com/contributors"
                }
            ],
            "description": "Symfony Yaml Component",
            "description": "Loads and dumps YAML files",
            "homepage": "https://symfony.com",
            "funding": [
                {
@@ -7958,7 +8130,7 @@
                    "type": "tidelift"
                }
            ],
            "time": "2020-10-24T10:57:07+00:00"
            "time": "2021-06-23T19:06:53+00:00"
        },
        {
            "name": "unicaen/test",
@@ -8122,6 +8294,9 @@
        "ext-intl": "*",
        "ext-json": "*",
        "ext-readline": "*",
        "ext-soap": "*",
        "ext-xmlwriter": "*",
        "ext-xsl": "*",
        "ext-zip": "*"
    },
    "platform-dev": [],
+1 −0
Changes for config/application.config.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ $modules = [
    'Soutenance',
    'Notification',
    'Information',
    'StepStar',
    'Application',
];

+2 −2
Changes for doc/release-notes/v2.2.1.md: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
# Version 2.2.0
# Version 2.2.1

## 1. Sur le serveur d'application

@@ -6,7 +6,7 @@
  pour installer la nouvelle version :

```bash
git fetch --tags && git checkout --force 2.2.0 && bash ./install.sh
git fetch --tags && git checkout --force 2.2.1 && bash ./install.sh
```

- Selon le moteur PHP que vous avez installé, rechargez le service, exemple :
Loading