Merge pull request #29 from kbond/doctrine-bundle-2

Allow doctrine-bundle 2.0
zenstruck · Nov 20, 2019 · f8bf378 · f8bf378
2 parents 52379e2 + cd3532f
commit f8bf378
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,15 +7,14 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 matrix:
   include:
-    - php: 5.6
-      env: SYMFONY_VERSION=2.8.*
-    - php: 5.6
-      env: SYMFONY_VERSION=3.4.*
     - php: 5.6
       env: COMPOSER_FLAGS="--prefer-lowest"
+    - php: 7.1
+      env: DEPENDENCIES="symfony/lts:^3"
 
 cache:
   directories:
@@ -25,7 +24,7 @@ before_install:
   - echo "memory_limit=4G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
   - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
-  - if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/symfony:${SYMFONY_VERSION}; fi;
+  - if [ "$DEPENDENCIES" != "" ]; then composer require --no-update $DEPENDENCIES; fi;
 
 install: composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
 

diff --git a/composer.json b/composer.json
@@ -13,21 +13,22 @@
     ],
     "require": {
         "php": "^5.6|^7.0",
-        "symfony/framework-bundle": "^2.8|~3.0|~4.0",
-        "symfony/doctrine-bridge": "~2.8|~3.0|~4.0",
-        "symfony/dependency-injection": "~2.8|~3.0|~4.0",
-        "doctrine/doctrine-bundle": "~1.3",
-        "doctrine/orm": "~2.4"
+        "symfony/framework-bundle": "^2.8|^3.0|^4.0",
+        "symfony/doctrine-bridge": "^2.8|^3.0|^4.0",
+        "symfony/dependency-injection": "^2.8|^3.0|^4.0",
+        "doctrine/doctrine-bundle": "^1.3|^2.0",
+        "doctrine/orm": "^2.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.7",
+        "phpunit/phpunit": "^5.7.11",
         "matthiasnoback/symfony-dependency-injection-test": "^1.2",
-        "symfony/finder": "~2.8|~3.0|~4.0",
-        "symfony/browser-kit": "~2.8|~3.0|~4.0",
-        "symfony/css-selector": "~2.8|~3.0|~4.0",
-        "symfony/form": "^2.8.8|~3.0|~4.0",
-        "symfony/validator": "~2.8|~3.0|~4.0",
-        "symfony/console": "~2.8|~3.0|~4.0"
+        "symfony/finder": "^2.8|^3.0|^4.0",
+        "symfony/browser-kit": "^2.8|^3.0|^4.0",
+        "symfony/css-selector": "^2.8|^3.0|^4.0",
+        "symfony/form": "^2.8|^3.0|^4.0",
+        "symfony/validator": "^2.8|^3.0|^4.0",
+        "symfony/translation": "^2.8|^3.0|^4.0",
+        "symfony/console": "^2.8|^3.0|^4.0"
     },
     "autoload": {
         "psr-4": { "Zenstruck\\RedirectBundle\\": "src/" }