From b251d593b35b23b7c5d1b0116e7993a73f04caf7 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 11 Nov 2020 18:21:04 +0100
Subject: [PATCH] chore: Static files maintenance.

Signed-off-by: Pol Dellaiera <pol.dellaiera@protonmail.com>
---
 .gitignore                            |  3 +--
 composer.json                         | 10 +++++-----
 grumphp.yml.dist => grumphp.yml       |  2 +-
 infection.json.dist => infection.json |  0
 phpspec.yml.dist => phpspec.yml       |  0
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename grumphp.yml.dist => grumphp.yml (86%)
 rename infection.json.dist => infection.json (100%)
 rename phpspec.yml.dist => phpspec.yml (100%)

diff --git a/.gitignore b/.gitignore
index b049cd4..05b69d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,4 @@
 /example/
 /.idea/
 /test.php
-/phpspec.yml
-/infection.json
+
diff --git a/composer.json b/composer.json
index 1704a34..c3007a3 100644
--- a/composer.json
+++ b/composer.json
@@ -15,16 +15,16 @@
         }
     ],
     "require": {
-        "php": "^7.1",
-        "symfony/polyfill-mbstring": "^1.18"
+        "php": ">= 7.1.3"
     },
     "require-dev": {
-        "drupol/php-conventions": "^1.7.2 || ^1.8.6",
+        "drupol/php-conventions": "^1.7.2 || ^1.8.6 || ^2.0.2",
         "friends-of-phpspec/phpspec-code-coverage": "^4.3",
         "infection/infection": "^0.13.6 || ^0.15.3",
-        "phpspec/phpspec": "^5.1.2 || ^6.2.1",
+        "phpspec/phpspec": "^5.1.2 || ^6.3",
         "phpstan/phpstan-strict-rules": "^0.12.2",
-        "vimeo/psalm": "^3.12"
+        "symfony/polyfill-mbstring": "^1.18",
+        "vimeo/psalm": "^3.18 || ^4"
     },
     "autoload": {
         "psr-4": {
diff --git a/grumphp.yml.dist b/grumphp.yml
similarity index 86%
rename from grumphp.yml.dist
rename to grumphp.yml
index 5cd404e..eeae070 100644
--- a/grumphp.yml.dist
+++ b/grumphp.yml
@@ -9,7 +9,7 @@ parameters:
     infection:
       threads: 10
       test_framework: phpspec
-      configuration: infection.json.dist
+      configuration: infection.json
       min_msi: 50
       min_covered_msi: 50
 
diff --git a/infection.json.dist b/infection.json
similarity index 100%
rename from infection.json.dist
rename to infection.json
diff --git a/phpspec.yml.dist b/phpspec.yml
similarity index 100%
rename from phpspec.yml.dist
rename to phpspec.yml