diff --git a/composer.json b/composer.json
index b7b5873b..ab29a9bc 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": "^5.5.9 || ^7.0",
-        "phpoption/phpoption": "^1.6",
+        "phpoption/phpoption": "^1.7",
         "symfony/polyfill-ctype": "^1.9"
     },
     "require-dev": {
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 3a846fdc..a64cb81c 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -8,3 +8,4 @@ parameters:
     - '/^Parameter \#2 \$writers of class Dotenv\\Repository\\[a-zA-Z]*Repository[a-zA-Z]* constructor expects/'
     - '#Method Dotenv\\Repository\\AbstractRepository::offset[a-zA-Z\(\)\$ ]* typehint specified.#'
     - '#Method Dotenv\\Loader\\Lines::getCharPairs\(\) should return array\(array\(string, string\|null\)\) but returns array\<int, mixed\>.#'
+    - '#Unable to resolve the template type S in call to method PhpOption\\Option<mixed>::flatMap\(\)#'