Merge pull request #210 from core23/patch/doctrine

Added doctrine <2.6 to conflicts
stephpy · Feb 7, 2018 · e408d9d · e408d9d
2 parents 874e124 + be013f9
commit e408d9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,8 @@
 language: php
 
 php:
-    - 5.4
-    - 5.5
     - 7.1
+    - 7.2
 
 install: composer install -n
 

diff --git a/composer.json b/composer.json
@@ -10,14 +10,14 @@
         "homepage": "https://github.com/stephpy/timeline-bundle/contributors"
     }],
     "require": {
-        "php": ">=5.3.2",
-        "stephpy/timeline": "*",
+        "php": "^7.1",
+        "stephpy/timeline": "^1.0",
         "symfony/framework-bundle": "~2.0|~3.0|~4.0",
         "symfony/options-resolver": "~2.0|~3.0|~4.0"
     },
     "require-dev": {
         "atoum/atoum": "1.*|3.*",
-        "doctrine/orm": "2.*",
+        "doctrine/orm": "^2.6",
         "symfony/console": "~2.0|~3.0|~4.0",
         "symfony/twig-bundle": "~2.0|~3.0|~4.0",
         "symfony/expression-language": "~2.0|~3.0|~4.0"
@@ -28,6 +28,9 @@
         "doctrine/orm": "Use doctrine ORM driver",
         "doctrine/mongodb-odm-bundle": "Use doctrine ODM driver"
     },
+    "conflict": {
+        "doctrine/orm": "<2.6"
+    },
     "autoload": {
         "psr-4": { "Spy\\TimelineBundle\\": "" }
     },