Merge pull request doctrine#240 from greg0ire/master

Manually merge 1.7 into master

.travis.yml

@@ -9,7 +9,7 @@ cache:
 php:
   - 7.2
   - 7.3
-  - 7.4snapshot
+  - 7.4
 
 before_install:
   - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
@@ -22,7 +22,17 @@ install:
 script: ./vendor/bin/phpunit
 
 jobs:
+  allow_failures:
+    - php: nightly
+
   include:
+    -   stage: Test
+        php: nightly
+        before_install:
+            - composer config platform.php 7.4.99
+        install:
+            - travis_retry composer update --prefer-dist
+
     - stage: Test
       env: COVERAGE
       before_script:
@@ -32,8 +42,7 @@ jobs:
         - ./vendor/bin/phpunit --coverage-clover clover.xml  --coverage-xml=build/coverage/coverage-xml --log-junit=build/coverage/phpunit.junit.xml
         - ./vendor/bin/infection --coverage=build/coverage --threads=4 --min-msi=82 --min-covered-msi=84
       after_script:
-        - travis_retry wget https://scrutinizer-ci.com/ocular.phar
-        - travis_retry php ocular.phar code-coverage:upload --format=php-clover clover.xml
+        - bash <(curl -s https://codecov.io/bash)
 
     - stage: Code Quality
       env: CODING_STANDARDS

README.md

@@ -1,8 +1,7 @@
 # Doctrine Collections
 
 [![Build Status](https://travis-ci.org/doctrine/collections.svg?branch=master)](https://travis-ci.org/doctrine/collections)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/doctrine/collections/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/doctrine/collections/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/doctrine/collections/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/doctrine/collections/?branch=master)
+[![Code Coverage](https://codecov.io/gh/doctrine/collections/branch/cache/graph/badge.svg)](https://codecov.io/gh/doctrine/collections/branch/master)
 
 Collections Abstraction library
 

composer.json

@@ -18,15 +18,15 @@
         {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
     ],
     "require": {
-        "php": "^7.2"
+        "php": "^7.2 || ^8.0"
     },
     "require-dev": {
         "doctrine/coding-standard": "^6.0",
         "infection/infection": "^0.14.2",
         "phpstan/phpstan": "^0.11",
         "phpstan/phpstan-phpunit": "^0.11",
         "phpunit/phpunit": "^8.0",
-        "vimeo/psalm": "^3.2.2",
+        "vimeo/psalm": "^3.8.1",
         "ext-json": "*"
     },
     "config": {