add support for 1.6

trsteel88 · Nov 27, 2014 · 2144471 · 2144471
1 parent 416cf4a
commit 2144471
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ env:
     - SYMFONY_VERSION="2.3.*"
     - SYMFONY_VERSION="2.4.*"
     - SYMFONY_VERSION="2.5.*"
+    - SYMFONY_VERSION="2.6.*"
 
 before_script:
     - composer require --no-update symfony/framework-bundle:${SYMFONY_VERSION}

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@
 ### Step 1: Add TrsteelCkeditorBundle to your composer.json
 
 ```bash
-php composer.phar require Trsteel/ckeditor-bundle ~1.5
+php composer.phar require Trsteel/ckeditor-bundle ~1.6
 ```
 
 ### Step 2: Enable the bundle

diff --git a/composer.json b/composer.json
@@ -12,13 +12,13 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "symfony/framework-bundle": "2.*,<2.6",
-        "symfony/form": ">=2.1,<2.6-dev",
-        "twig/twig": ">=1.1,<2.0-dev",
+        "symfony/framework-bundle": "2.*,<2.7",
+        "symfony/form": ">=2.1,<2.7",
+        "twig/twig": ">=1.1,<2.0",
         "ezyang/htmlpurifier": "~4.0"
     },
     "require-dev": {
-        "symfony/twig-bundle": "2.*,<2.6",
+        "symfony/twig-bundle": "2.*,<2.7",
         "symfony/yaml": "~2.0"
     },
     "autoload": {
@@ -27,7 +27,7 @@
     "target-dir": "Trsteel/CkeditorBundle",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.5.x-dev"
+            "dev-master": "1.6.x-dev"
         }
     }
 }