From ef8e2fd64ff5703b9268e8667f71a88ce249e73c Mon Sep 17 00:00:00 2001
From: darkelfe14728 <jul.rosset@gmail.com>
Date: Sun, 26 Jan 2020 19:17:10 +0100
Subject: [PATCH] Update to php 7.4.2

---
 .idea/php.xml      | 7 ++++++-
 .idea/symfony2.xml | 7 +++++++
 besoin.txt         | 2 +-
 composer.json      | 2 +-
 composer.lock      | 4 ++--
 5 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 .idea/symfony2.xml

diff --git a/.idea/php.xml b/.idea/php.xml
index 1f13065..75cef72 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -113,5 +113,10 @@
       <path value="$PROJECT_DIR$/vendor/symfony/security-csrf" />
     </include_path>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.2" />
+  <component name="PhpProjectSharedConfiguration" php_language_level="7.4" />
+  <component name="PhpUnit">
+    <phpunit_settings>
+      <PhpUnitSettings configuration_file_path="$PROJECT_DIR$/phpunit.xml.dist" custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" use_configuration_file="true" />
+    </phpunit_settings>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/symfony2.xml b/.idea/symfony2.xml
new file mode 100644
index 0000000..ba828bc
--- /dev/null
+++ b/.idea/symfony2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Symfony2PluginSettings">
+    <option name="pluginEnabled" value="true" />
+    <option name="profilerCsvPath" value="" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/besoin.txt b/besoin.txt
index bab491c..582b741 100644
--- a/besoin.txt
+++ b/besoin.txt
@@ -1,4 +1,4 @@
-Gestion de comptes utilisateurs : *Nom, *prénom, photo, genre (homme / femme), langue
+Gestion de comptes utilisateurs : *login, *pass, *Nom, *prénom, photo, genre (homme / femme), langue
 Gestion de liens entre les utilsateurs ("connaissances") avec validation des deux côtés (genre demande d'amis)
 Gestion des notification : sous-table avec un "type" de notif (liste en dur) avec deux case à cocher : alerte (sur le site), mail
 
diff --git a/composer.json b/composer.json
index dc29e7a..b745ade 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "type": "project",
     "license": "proprietary",
     "require": {
-        "php": "^7.2.5",
+        "php": "^7.4.2",
         "ext-ctype": "*",
         "ext-iconv": "*",
         "sensio/framework-extra-bundle": "^5.1",
diff --git a/composer.lock b/composer.lock
index 58f9182..9350460 100644
--- a/composer.lock
+++ b/composer.lock
@@ -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": "f0aa134c748f7bb4398f0b93f0f19bb9",
+    "content-hash": "2226b8d10e11a2fa7ff8753042488e61",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -6859,7 +6859,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.2.5",
+        "php": "^7.4.2",
         "ext-ctype": "*",
         "ext-iconv": "*"
     },