Merge pull request #8 from xabbuh/symfony-3.0

Symfony 3.0 compatibility
xabbuh · Dec 7, 2015 · d8cd43a · d8cd43a
2 parents aa786fa + 6785eec
commit d8cd43a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+1.2.1
+-----
+
+* compatibility with Symfony 3.0 components
+
 1.2.0
 -----
 

diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
     "require": {
         "php": ">=5.3.0",
         "guzzle/guzzle": "~3.7",
-        "symfony/http-foundation": "~2.2",
-        "symfony/serializer": "~2.2"
+        "symfony/http-foundation": "~2.2|~3.0",
+        "symfony/serializer": "~2.2|~3.0"
     },
     "autoload": {
         "psr-4": {