Merge 381acfa into 8bb55b1

code-rhapsodie · Mar 22, 2021 · 5392140 · 5392140
2 parents 8bb55b1 + 381acfa
commit 5392140
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,16 +27,17 @@ matrix:
     - php: '7.2'
     - php: '7.3'
     - php: '7.4'
+    - php: '8.0'
 
     # Enable code coverage with the previous supported PHP version
-    - php: '7.3'
+    - php: '7.4'
       env:
         - SYMFONY_VERSION=3.4.*
         - COVERALLS_ENABLED="true"
         - PHPUNIT_FLAGS="-v --coverage-text --coverage-clover var/build/clover.xml"
 
     # Enable code coverage with the latest supported PHP version
-    - php: '7.4'
+    - php: '8.0'
       env:
         - SYMFONY_VERSION=3.4.*
         - COVERALLS_ENABLED="true"
@@ -46,41 +47,46 @@ matrix:
     - php: '7.1'
       env:
         - COMPOSER_FLAGS="--prefer-lowest"
-    - php: '7.3'
-      env:
-        - COMPOSER_FLAGS="--prefer-lowest"
+    # Incompatibility between lowest symfony testing utils and phpunit
+#    - php: '8.0'
+#      env:
+#        - COMPOSER_FLAGS="--prefer-lowest"
 
     # Test each supported Symfony version with lowest supported PHP version
     - php: '7.1'
       env:
         - SYMFONY_VERSION=3.4.*
-    - php: '7.1'
-      env:
-        - SYMFONY_VERSION=4.3.*
     - php: '7.1'
       env:
         - SYMFONY_VERSION=4.4.*
     - php: '7.2'
       env:
         - COVERALLS_ENABLED="true"
         - PHPUNIT_FLAGS="-v --coverage-text --coverage-clover var/build/clover.xml"
-        - SYMFONY_VERSION=5.0.*
-
+        - SYMFONY_VERSION=5.2.*
     # Test unsupported versions of Symfony
     - php: '7.1'
       env:
         - SYMFONY_VERSION=4.1.*
     - php: '7.1'
       env:
         - SYMFONY_VERSION=4.2.*
-
-
-    # Test upcoming Symfony versions with lowest supported PHP version and dev dependencies
+    - php: '7.1'
+      env:
+        - SYMFONY_VERSION=4.3.*
+    - php: '7.2'
+      env:
+        - SYMFONY_VERSION=5.0.*
     - php: '7.2'
       env:
-        - STABILITY=dev
         - SYMFONY_VERSION=5.1.*
 
+    # Test upcoming Symfony versions with lowest supported PHP version and dev dependencies
+#    - php: '7.2'
+#      env:
+#        - STABILITY=dev
+#        - SYMFONY_VERSION=5.3.*
+
     # Test upcoming PHP versions with dev dependencies
     #- php: '7.5snapshot'
     #  env:
@@ -101,6 +107,9 @@ matrix:
     - env:
         - STABILITY=dev
         - SYMFONY_VERSION=5.1.*
+    - env:
+        - STABILITY=dev
+        - SYMFONY_VERSION=5.2.*
 
 before_install:
   - if [[ "$SYMFONY_VERSION" != "" ]]; then
@@ -114,11 +123,11 @@ before_install:
       phpenv config-rm xdebug.ini || true;
     fi
   - if [[ "$COVERALLS_ENABLED" == "true" ]]; then
-      travis_retry composer require --dev satooshi/php-coveralls:^2.0 --no-update $COMPOSER_FLAGS;
+      travis_retry composer require --dev php-coveralls/php-coveralls:^2.0 --no-update $COMPOSER_FLAGS;
     fi
 
 install:
-  - travis_retry composer update --prefer-dist --no-interaction --no-suggest --no-progress --ansi $COMPOSER_FLAGS
+  - travis_retry composer update --prefer-dist --no-interaction --no-progress --ansi $COMPOSER_FLAGS
 
 script: ./vendor/bin/phpunit $PHPUNIT_FLAGS
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Version 2.3.0
+
+* Added PHP 8 support
+* Added Doctrine DBAL 3 support
+
 # Version 2.2.0
 
 * Improve logging Dataflow job

diff --git a/composer.json b/composer.json
@@ -41,9 +41,9 @@
         }
     },
     "require": {
-        "php": "^7.1",
+        "php": "^7.1||^8.0",
         "ext-json": "*",
-        "doctrine/dbal": "^2.0",
+        "doctrine/dbal": "^2.0||^3.0",
         "doctrine/doctrine-bundle": "^1.0||^2.0",
         "psr/log": "^1.1",
         "symfony/config": "^3.4||^4.0||^5.0",