Merge pull request #14 from barduck007/1.1

Fix deprecated usages for SF 2.6 and upgrade compatibility for SF 3.0
fkrauthan · Jan 29, 2016 · 06ae300 · 06ae300
2 parents 7d112a8 + 4b5920a
commit 06ae300
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -13,7 +13,8 @@
     </parameters>
 
     <services>
-        <service id="fkr_simple_pie.rss" class="SimplePie" factory-class="%fkr_simple_pie.factory%" factory-method="create">
+        <service id="fkr_simple_pie.rss" class="SimplePie">
+            <factory class="%fkr_simple_pie.factory%" method="create" />
 			<argument>%fkr_simple_pie.cache_enabled%</argument>
 			<argument>%fkr_simple_pie.cache_dir%</argument>
 			<argument>%fkr_simple_pie.cache_duration%</argument>

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
 	],
 	"require": {
 		"php": ">=5.3.2",
-		"symfony/framework-bundle": "~2.0",
+		"symfony/framework-bundle": "~2.6|~3.0",
 		"simplepie/simplepie": "~1.3"
 	},
 	"autoload": {