Merge pull request #139 from alexdebril/issue/134

upgrade feed-io to fix #134
alexdebril · Jun 8, 2017 · e264cf2 · e264cf2
2 parents 45885b0 + 72011c6
commit e264cf2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 518 deletions.
diff --git a/composer.json b/composer.json
@@ -12,23 +12,19 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.6",
         "debril/feed-io": "~2.5"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.5",
         "doctrine/common": "~2.3",
         "doctrine/doctrine-bundle": "~1.2",
         "symfony/framework-bundle": "~2.6|~3.0 <3.3",
-	    "symfony/config": "3.2",
+        "symfony/config": "~2.6|~3.0 <3.3",
         "symfony/validator": "~2.6|~3.0 <3.3",
         "symfony/finder": "~2.6|~3.0 <3.3",
-        "symfony/form": "~2.6|~3.0 <3.3",
         "symfony/browser-kit": "~2.6|~3.0 <3.3"
     },
-    "suggest": {
-        "guzzlehttp/guzzle": "We can use Guzzle >= 6.0 to fetch feed - set 'driver' to 'guzzle' then"
-    },
     "autoload": {
         "psr-0": {
             "Debril\\RssAtomBundle": ""
@@ -40,10 +36,5 @@
         "preferred-install": {
             "*": "dist"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0.x-dev"
-        }
     }
 }