Merge pull request #106 from Ocramius/feature/#99-pure-intersection-t…

…ype-support Pure intersection types support, `never` type support
laminas · Sep 22, 2021 · b9e5b98 · b9e5b98
2 parents a8254f7 + a55784d
commit b9e5b98
Show file tree

Hide file tree

Showing 8 changed files with 753 additions and 603 deletions.
diff --git a/composer.json b/composer.json
@@ -18,18 +18,21 @@
         "ext-phar": "*",
         "doctrine/annotations": "^1.10.4",
         "laminas/laminas-coding-standard": "^2.3.0",
-        "laminas/laminas-stdlib": "^3.3.0",
+        "laminas/laminas-stdlib": "^3.6.0",
         "phpunit/phpunit": "^9.5.9",
-        "psalm/plugin-phpunit": "^0.14.0",
-        "vimeo/psalm": "^4.3.1"
+        "psalm/plugin-phpunit": "^0.16.1",
+        "vimeo/psalm": "^4.10.0"
     },
     "suggest": {
         "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
         "laminas/laminas-stdlib": "Laminas\\Stdlib component",
         "laminas/laminas-zendframework-bridge": "A bridge with Zend Framework"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "platform": {
+            "php": "7.4.99"
+        }
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,11 +9,11 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage>
+        <include>
             <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
     <php>
         <!-- Enable this if you have installed Doctrine\Common on the