From 30e81ef1d1ca2b3f5beb449d5eb017f8429c1cc9 Mon Sep 17 00:00:00 2001
From: endroid <info@endroid.nl>
Date: Wed, 3 Jan 2018 20:56:22 +0000
Subject: [PATCH 1/3] Add endroid/twitter-bundle

---
 .../2.0/config/packages/endroid_twitter.yaml       |  5 +++++
 endroid/twitter-bundle/2.0/manifest.json           | 14 ++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 endroid/twitter-bundle/2.0/config/packages/endroid_twitter.yaml
 create mode 100644 endroid/twitter-bundle/2.0/manifest.json

diff --git a/endroid/twitter-bundle/2.0/config/packages/endroid_twitter.yaml b/endroid/twitter-bundle/2.0/config/packages/endroid_twitter.yaml
new file mode 100644
index 00000000..44c8133d
--- /dev/null
+++ b/endroid/twitter-bundle/2.0/config/packages/endroid_twitter.yaml
@@ -0,0 +1,5 @@
+endroid_twitter:
+    consumer_key: '%env(TWITTER_CONSUMER_KEY)%'
+    consumer_secret: '%env(TWITTER_CONSUMER_SECRET)%'
+    access_token: '%env(TWITTER_ACCESS_TOKEN)%'
+    access_token_secret: '%env(TWITTER_ACCESS_TOKEN_SECRET)%'
diff --git a/endroid/twitter-bundle/2.0/manifest.json b/endroid/twitter-bundle/2.0/manifest.json
new file mode 100644
index 00000000..1ac3f622
--- /dev/null
+++ b/endroid/twitter-bundle/2.0/manifest.json
@@ -0,0 +1,14 @@
+{
+    "bundles": {
+        "Endroid\\TwitterBundle\\EndroidTwitterBundle": ["all"]
+    },
+    "copy-from-recipe": {
+        "config/": "%CONFIG_DIR%/"
+    },
+    "env": {
+        "TWITTER_CONSUMER_KEY": "",
+        "TWITTER_CONSUMER_SECRET": "",
+        "TWITTER_ACCESS_TOKEN": "",
+        "TWITTER_ACCESS_TOKEN_SECRET": ""
+    }
+}

From e85a478cda3b71f1db45cf97a26e69d6e88f4e38 Mon Sep 17 00:00:00 2001
From: endroid <info@endroid.nl>
Date: Sat, 6 Jan 2018 11:44:33 +0000
Subject: [PATCH 2/3] Move recipe to endroid/twitter

---
 .../2.0/config/packages/endroid_twitter.yaml              | 5 -----
 endroid/twitter/2.0/config/packages/endroid_twitter.yaml  | 8 ++++++++
 endroid/{twitter-bundle => twitter}/2.0/manifest.json     | 3 ---
 3 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 endroid/twitter-bundle/2.0/config/packages/endroid_twitter.yaml
 create mode 100644 endroid/twitter/2.0/config/packages/endroid_twitter.yaml
 rename endroid/{twitter-bundle => twitter}/2.0/manifest.json (73%)

diff --git a/endroid/twitter-bundle/2.0/config/packages/endroid_twitter.yaml b/endroid/twitter-bundle/2.0/config/packages/endroid_twitter.yaml
deleted file mode 100644
index 44c8133d..00000000
--- a/endroid/twitter-bundle/2.0/config/packages/endroid_twitter.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-endroid_twitter:
-    consumer_key: '%env(TWITTER_CONSUMER_KEY)%'
-    consumer_secret: '%env(TWITTER_CONSUMER_SECRET)%'
-    access_token: '%env(TWITTER_ACCESS_TOKEN)%'
-    access_token_secret: '%env(TWITTER_ACCESS_TOKEN_SECRET)%'
diff --git a/endroid/twitter/2.0/config/packages/endroid_twitter.yaml b/endroid/twitter/2.0/config/packages/endroid_twitter.yaml
new file mode 100644
index 00000000..8afad104
--- /dev/null
+++ b/endroid/twitter/2.0/config/packages/endroid_twitter.yaml
@@ -0,0 +1,8 @@
+services:
+    Endroid\Twitter\Client:
+        public: true
+        arguments:
+            - '%env(TWITTER_CONSUMER_KEY)%'
+            - '%env(TWITTER_CONSUMER_SECRET)%'
+            - '%env(TWITTER_ACCESS_TOKEN)%'
+            - '%env(TWITTER_ACCESS_TOKEN_SECRET)%'
diff --git a/endroid/twitter-bundle/2.0/manifest.json b/endroid/twitter/2.0/manifest.json
similarity index 73%
rename from endroid/twitter-bundle/2.0/manifest.json
rename to endroid/twitter/2.0/manifest.json
index 1ac3f622..2ec0f1e0 100644
--- a/endroid/twitter-bundle/2.0/manifest.json
+++ b/endroid/twitter/2.0/manifest.json
@@ -1,7 +1,4 @@
 {
-    "bundles": {
-        "Endroid\\TwitterBundle\\EndroidTwitterBundle": ["all"]
-    },
     "copy-from-recipe": {
         "config/": "%CONFIG_DIR%/"
     },

From 6c520a97ee317326d433b657acba501f99706e9b Mon Sep 17 00:00:00 2001
From: endroid <info@endroid.nl>
Date: Sat, 6 Jan 2018 13:49:25 +0000
Subject: [PATCH 3/3] Make service private

---
 endroid/twitter/2.0/config/packages/endroid_twitter.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/endroid/twitter/2.0/config/packages/endroid_twitter.yaml b/endroid/twitter/2.0/config/packages/endroid_twitter.yaml
index 8afad104..a7969e19 100644
--- a/endroid/twitter/2.0/config/packages/endroid_twitter.yaml
+++ b/endroid/twitter/2.0/config/packages/endroid_twitter.yaml
@@ -1,6 +1,5 @@
 services:
     Endroid\Twitter\Client:
-        public: true
         arguments:
             - '%env(TWITTER_CONSUMER_KEY)%'
             - '%env(TWITTER_CONSUMER_SECRET)%'