From 58367916fb162221f4bd15468a84ca81c3c8f22c Mon Sep 17 00:00:00 2001
From: Maxim Sizov <sizov2011@gmail.com>
Date: Sat, 21 Apr 2018 16:58:20 +0300
Subject: [PATCH 1/6] Added support for Symfony4

---
 Resources/config/feed.xml | 2 +-
 composer.json             | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Resources/config/feed.xml b/Resources/config/feed.xml
index c19052b..17c6c2b 100644
--- a/Resources/config/feed.xml
+++ b/Resources/config/feed.xml
@@ -12,7 +12,7 @@
     </parameters>
 
     <services>
-        <service id="eko_feed.feed.manager" class="%eko_feed.feed.manager.class%">
+        <service id="eko_feed.feed.manager" class="%eko_feed.feed.manager.class%" public="true">
             <argument type="service" id="router" />
             <argument>%eko_feed.config%</argument>
             <argument />
diff --git a/composer.json b/composer.json
index 4febeca..e0ca0f8 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": "^5.4|^7.0",
-        "symfony/framework-bundle": "^2.5|^3.0",
+        "symfony/framework-bundle": "^2.5|^3.0|^4.0",
         "zendframework/zend-feed": ">=2.0",
         "zendframework/zend-servicemanager": ">=2.0",
         "zendframework/zend-http": ">=2.0"
@@ -27,10 +27,5 @@
     },
     "autoload": {
         "psr-4": { "Eko\\FeedBundle\\": "" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.1.x-dev"
-        }
     }
 }

From 7b65fdfba96c53e0206c3967768763753887f246 Mon Sep 17 00:00:00 2001
From: Muspi <benoit.millon@gmail.com>
Date: Wed, 25 Apr 2018 17:03:55 +0200
Subject: [PATCH 2/6] Update feed.xml

Set feeds services as public
---
 Resources/config/feed.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/config/feed.xml b/Resources/config/feed.xml
index 17c6c2b..91a6fe5 100644
--- a/Resources/config/feed.xml
+++ b/Resources/config/feed.xml
@@ -18,7 +18,7 @@
             <argument />
         </service>
 
-        <service id="eko_feed.feed.dump" class="%eko_feed.feed.dump.class%">
+        <service id="eko_feed.feed.dump" class="%eko_feed.feed.dump.class%" public="true">
             <argument type="service" id="eko_feed.feed.manager" />
             <argument type="service" id="doctrine.orm.entity_manager" />
             <argument type="service" id="filesystem" />
@@ -27,9 +27,9 @@
             </call>
         </service>
 
-        <service id="eko_feed.feed.reader" class="%eko_feed.feed.reader.class%" />
+        <service id="eko_feed.feed.reader" class="%eko_feed.feed.reader.class%" public="true" />
 
-        <service id="eko_feed.feed" class="%eko_feed.feed.class%">
+        <service id="eko_feed.feed" class="%eko_feed.feed.class% public="true"">
             <argument />
             <call method="setRouter">
                 <argument type="service" id="router" />

From c44e91dc7716a3f8bc6f529012a18287602b2b8b Mon Sep 17 00:00:00 2001
From: Muspi <benoit.millon@gmail.com>
Date: Wed, 25 Apr 2018 17:07:02 +0200
Subject: [PATCH 3/6] Update feed.xml

---
 Resources/config/feed.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/config/feed.xml b/Resources/config/feed.xml
index 91a6fe5..ef2aff6 100644
--- a/Resources/config/feed.xml
+++ b/Resources/config/feed.xml
@@ -29,7 +29,7 @@
 
         <service id="eko_feed.feed.reader" class="%eko_feed.feed.reader.class%" public="true" />
 
-        <service id="eko_feed.feed" class="%eko_feed.feed.class% public="true"">
+        <service id="eko_feed.feed" class="%eko_feed.feed.class% public="true">
             <argument />
             <call method="setRouter">
                 <argument type="service" id="router" />

From 1cf86903a780346a42085ff0c556ab70540385d5 Mon Sep 17 00:00:00 2001
From: Muspi <benoit.millon@gmail.com>
Date: Wed, 25 Apr 2018 17:10:27 +0200
Subject: [PATCH 4/6] Update Composer

---
 composer.json | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index e0ca0f8..cb8af3b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,16 +1,10 @@
 {
-    "name": "eko/feedbundle",
+    "name": "Muspi/feedbundle",
     "type": "library",
-    "description": "A Symfony bundle to build RSS feeds from entities",
+    "description": "A Symfony bundle to build RSS feeds from entities, clone from eko/feedbundle",
     "keywords": ["feed", "bundle", "rss", "atom"],
     "homepage": "http://github.com/eko/FeedBundle",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Vincent Composieux",
-            "email": "vincent.composieux@gmail.com"
-        }
-    ],
+    "license": "MIT",   
     "require": {
         "php": "^5.4|^7.0",
         "symfony/framework-bundle": "^2.5|^3.0|^4.0",

From dc3c009635a8f4c43327e7343e9af96d43ce69aa Mon Sep 17 00:00:00 2001
From: Muspi <benoit.millon@gmail.com>
Date: Wed, 25 Apr 2018 17:11:14 +0200
Subject: [PATCH 5/6] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index cb8af3b..628822c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "Muspi/feedbundle",
+    "name": "muspi/feedbundle",
     "type": "library",
     "description": "A Symfony bundle to build RSS feeds from entities, clone from eko/feedbundle",
     "keywords": ["feed", "bundle", "rss", "atom"],

From 468fe69f4c7d720aa9737e6a6d172f9644584f2c Mon Sep 17 00:00:00 2001
From: Muspi <benoit.millon@gmail.com>
Date: Wed, 25 Apr 2018 17:18:14 +0200
Subject: [PATCH 6/6] Fix error on config service feed

---
 Resources/config/feed.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/config/feed.xml b/Resources/config/feed.xml
index ef2aff6..8f73f2a 100644
--- a/Resources/config/feed.xml
+++ b/Resources/config/feed.xml
@@ -29,7 +29,7 @@
 
         <service id="eko_feed.feed.reader" class="%eko_feed.feed.reader.class%" public="true" />
 
-        <service id="eko_feed.feed" class="%eko_feed.feed.class% public="true">
+        <service id="eko_feed.feed" class="%eko_feed.feed.class%" public="true">
             <argument />
             <call method="setRouter">
                 <argument type="service" id="router" />