Skip to content
Snippets Groups Projects
Commit 08b83c46 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files
MAJ Composer
parent 12ee54ae
Branches
Tags
No related merge requests found
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Possibilité de bloquer l'usage de certains rôles si l'on se trouve hors du réseau de l'établissement * Possibilité de bloquer l'usage de certains rôles si l'on se trouve hors du réseau de l'établissement
## Correction de bugs
* Rétablissement du fonctionnement du formulaire d'édition des états de sortie
## Notes de mise à jour ## Notes de mise à jour
Le paramètre global.inEtablissement devra être renseigné pour que vous puissiez créer votre propre règle permettant de savoir Le paramètre global.inEtablissement devra être renseigné pour que vous puissiez créer votre propre règle permettant de savoir
......
...@@ -1111,16 +1111,16 @@ ...@@ -1111,16 +1111,16 @@
}, },
{ {
"name": "doctrine/reflection", "name": "doctrine/reflection",
"version": "v1.0.0", "version": "v1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/reflection.git", "url": "https://github.com/doctrine/reflection.git",
"reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6" "reference": "bc420ead87fdfe08c03ecc3549db603a45b06d4c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/reflection/zipball/02538d3f95e88eb397a5f86274deb2c6175c2ab6", "url": "https://api.github.com/repos/doctrine/reflection/zipball/bc420ead87fdfe08c03ecc3549db603a45b06d4c",
"reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6", "reference": "bc420ead87fdfe08c03ecc3549db603a45b06d4c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1128,13 +1128,15 @@ ...@@ -1128,13 +1128,15 @@
"ext-tokenizer": "*", "ext-tokenizer": "*",
"php": "^7.1" "php": "^7.1"
}, },
"conflict": {
"doctrine/common": "<2.9"
},
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^4.0", "doctrine/coding-standard": "^5.0",
"doctrine/common": "^2.8", "doctrine/common": "^2.10",
"phpstan/phpstan": "^0.9.2", "phpstan/phpstan": "^0.11.0",
"phpstan/phpstan-phpunit": "^0.9.4", "phpstan/phpstan-phpunit": "^0.11.0",
"phpunit/phpunit": "^7.0", "phpunit/phpunit": "^7.0"
"squizlabs/php_codesniffer": "^3.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
...@@ -1152,6 +1154,10 @@ ...@@ -1152,6 +1154,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"
...@@ -1160,10 +1166,6 @@ ...@@ -1160,10 +1166,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"
...@@ -1177,12 +1179,13 @@ ...@@ -1177,12 +1179,13 @@
"email": "ocramius@gmail.com" "email": "ocramius@gmail.com"
} }
], ],
"description": "Doctrine Reflection component", "description": "The Doctrine Reflection project is a simple library used by the various Doctrine projects which adds some additional functionality on top of the reflection functionality that comes with PHP. It allows you to get the reflection information about classes, methods and properties statically.",
"homepage": "https://www.doctrine-project.org/projects/reflection.html", "homepage": "https://www.doctrine-project.org/projects/reflection.html",
"keywords": [ "keywords": [
"reflection" "reflection",
"static"
], ],
"time": "2018-06-14T14:45:07+00:00" "time": "2020-01-08T19:53:19+00:00"
}, },
{ {
"name": "easybook/geshi", "name": "easybook/geshi",
......
...@@ -76,7 +76,7 @@ class EtatSortieForm extends AbstractForm ...@@ -76,7 +76,7 @@ class EtatSortieForm extends AbstractForm
]); ]);
$this->add([ $this->add([
'type' => 'TextArea', 'type' => 'Textarea',
'name' => 'csv-traitement', 'name' => 'csv-traitement',
'options' => [ 'options' => [
'label' => "Traitement des données", 'label' => "Traitement des données",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment