Merge branch '4.2'

Author: GrahamCampbell

composer.json

@@ -27,7 +27,7 @@
     "require-dev": {
         "ext-filter": "*",
         "bamarni/composer-bin-plugin": "^1.4.1",
-        "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.4"
+        "phpunit/phpunit": "^7.5.20 || ^8.5.14 || ^9.5.1"
     },
     "autoload": {
         "psr-4": {

phpstan.src.neon.dist

@@ -1,6 +1,6 @@
 parameters:
   level: max
   ignoreErrors:
-    - '#Unable to resolve the template type#'
     - '#Anonymous function should have native return typehint ".+".#'
     - '#Only booleans are allowed in a negated boolean, int\|false given.#'
+    - '#Method Dotenv\\Util\\Regex::split\(\) should return GrahamCampbell\\ResultType\\Result\<array\<string\>, string\> but returns GrahamCampbell\\ResultType\\Result\<array\<int, bool\|string\>, string\>.#'

psalm-baseline.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.2.1@ea9cb72143b77e7520c52fa37290bd8d8bc88fd9">
-  <file src="src/Parser/EntryParser.php">
-    <MissingClosureReturnType occurrences="1">
-      <code>static function (array $data) {</code>
-    </MissingClosureReturnType>
-  </file>
+<files psalm-version="4.3.1@2feba22a005a18bf31d4c7b9bdb9252c73897476">
   <file src="src/Repository/RepositoryBuilder.php">
+    <InvalidArgument occurrences="1">
+      <code>flatMap</code>
+    </InvalidArgument>
     <InvalidStringClass occurrences="3">
       <code>$adapter::create()</code>
       <code>$reader::create()</code>

src/Parser/Parser.php

@@ -40,6 +40,7 @@ public function parse(string $content)
      */
     private static function process(array $entries)
     {
+        /** @var \GrahamCampbell\ResultType\Result<\Dotenv\Parser\Entry[],string> */
         return \array_reduce($entries, static function (Result $result, string $raw) {
             return $result->flatMap(static function (array $entries) use ($raw) {
                 return EntryParser::parse($raw)->map(static function (Entry $entry) use ($entries) {

vendor-bin/phpstan/composer.json

@@ -1,10 +1,10 @@
 {
     "require": {
-        "phpstan/phpstan": "0.12.58",
-        "phpstan/extension-installer": "1.0.5",
-        "phpstan/phpstan-deprecation-rules": "0.12.5",
-        "phpstan/phpstan-phpunit": "0.12.16",
-        "phpstan/phpstan-strict-rules": "0.12.5",
+        "phpstan/phpstan": "0.12.68",
+        "phpstan/extension-installer": "1.1.0",
+        "phpstan/phpstan-deprecation-rules": "0.12.6",
+        "phpstan/phpstan-phpunit": "0.12.17",
+        "phpstan/phpstan-strict-rules": "0.12.9",
         "thecodingmachine/phpstan-strict-rules": "0.12.1"
     },
     "config": {

vendor-bin/psalm/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "psalm/phar": "4.2.1"
+        "psalm/phar": "4.3.1"
     },
     "config": {
         "preferred-install": "dist"