Merge pull request #291 from willdurand/jms-3.0

Allow jms/serializer 3.0
willdurand · Apr 23, 2019 · e9777dd · e9777dd
2 parents 9eba928 + e36d2e2
commit e9777dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,24 +1,24 @@
 language: php
-sudo: required
-dist: trusty
-group: edge
+sudo: false
 
 cache:
   directories:
     - $HOME/.composer/cache
 
 php:
-  - 7.2
+  - '7.2'
+  - '7.3'
 
 env:
-  - SYMFONY_VERSION=3.0.*
-  - SYMFONY_VERSION=3.2.*
-  - SYMFONY_VERSION=3.4.*
-  - SYMFONY_VERSION=4.0.*
-  - SYMFONY_VERSION=4.1.*
+  - SYMFONY_VERSION=^3.4 JMS_VERSION=^2.1
+  - SYMFONY_VERSION=^4.0 JMS_VERSION=^2.1
+
+  - SYMFONY_VERSION=^3.4 JMS_VERSION=^3.0
+  - SYMFONY_VERSION=^4.0 JMS_VERSION=^3.0
+
 
 before_install:
-  - composer self-update
+  - composer require --no-update jms/serializer "$JMS_VERSION"
   - composer require --no-update symfony/expression-language "$SYMFONY_VERSION"
   - composer require --no-update --dev symfony/yaml "$SYMFONY_VERSION"
   - composer require --no-update --dev symfony/routing "$SYMFONY_VERSION"

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "require": {
         "php": "^7.2",
         "doctrine/annotations": "~1.0",
-        "jms/serializer": "^2.1",
+        "jms/serializer": "^2.1|^3.0",
         "jms/metadata": "^2.0",
         "symfony/expression-language": "~3.0 || ~4.0"
     },