Merge branch 'hotfix/php-7.1-support'

Robert-2 · Nov 16, 2020 · 02b7f7e · 02b7f7e
2 parents 6e8b07b + a60733d
commit 02b7f7e
Show file tree

Hide file tree

Showing 5 changed files with 410 additions and 697 deletions.
diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.10.2 (2020-11-16)
+
+- Le support de PHP 7.1 malencontruesement supprimé dans la précédente version a été rétabli.
+
 ## 0.10.1 (2020-11-10)
 
 - Met à jour les dépendances côté serveur (+ corrige un bug avec Twig) (#55) (👏 @Tuxem).

diff --git a/server/composer.json b/server/composer.json
@@ -12,7 +12,10 @@
         }
     ],
     "config": {
-        "vendor-dir": "src/vendor"
+        "vendor-dir": "src/vendor",
+        "platform": {
+            "php": "7.1.17"
+        }
     },
     "require": {
         "php": ">=7.1.17",
@@ -24,7 +27,7 @@
         "respect/validation": "^1.1.31",
         "illuminate/database": "^5.8.36",
         "illuminate/pagination": "^5.8.35",
-        "robmorgan/phinx": "^0.12.4",
+        "robmorgan/phinx": "^0.11.4",
         "delfimov/translate": "^2.6.0",
         "symfony/console": "^4.4.7",
         "dompdf/dompdf": "^0.8.5",