From da1674517244703165e213642dc22f8c163a6c66 Mon Sep 17 00:00:00 2001
From: endroid <info@endroid.nl>
Date: Wed, 3 Jan 2018 20:54:53 +0000
Subject: [PATCH 1/2] Add endroid/pusher-bundle

---
 .../2.0/config/packages/endroid_pusher.yaml         |  4 ++++
 endroid/pusher-bundle/2.0/manifest.json             | 13 +++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 endroid/pusher-bundle/2.0/config/packages/endroid_pusher.yaml
 create mode 100644 endroid/pusher-bundle/2.0/manifest.json

diff --git a/endroid/pusher-bundle/2.0/config/packages/endroid_pusher.yaml b/endroid/pusher-bundle/2.0/config/packages/endroid_pusher.yaml
new file mode 100644
index 00000000..a7ca7614
--- /dev/null
+++ b/endroid/pusher-bundle/2.0/config/packages/endroid_pusher.yaml
@@ -0,0 +1,4 @@
+endroid_pusher:
+    app_id: '%env(PUSHER_APP_ID)%'
+    key: '%env(PUSHER_KEY)%'
+    secret: '%env(PUSHER_SECRET)%'
diff --git a/endroid/pusher-bundle/2.0/manifest.json b/endroid/pusher-bundle/2.0/manifest.json
new file mode 100644
index 00000000..04408ab0
--- /dev/null
+++ b/endroid/pusher-bundle/2.0/manifest.json
@@ -0,0 +1,13 @@
+{
+    "bundles": {
+        "Endroid\\PusherBundle\\EndroidPusherBundle": ["all"]
+    },
+    "copy-from-recipe": {
+        "config/": "%CONFIG_DIR%/"
+    },
+    "env": {
+        "PUSHER_APP_ID": "",
+        "PUSHER_KEY": "",
+        "PUSHER_SECRET": ""
+    }
+}

From f9590b887c09d5fa9a3eaca3e0bf927ab8bcd8ab Mon Sep 17 00:00:00 2001
From: endroid <info@endroid.nl>
Date: Sat, 6 Jan 2018 12:11:20 +0000
Subject: [PATCH 2/2] Add pusher/pusher-php-server

---
 .../pusher-bundle/2.0/config/packages/endroid_pusher.yaml  | 4 ----
 .../3.0/config/packages/pusher_php_server.yaml             | 7 +++++++
 .../2.0 => pusher/pusher-php-server/3.0}/manifest.json     | 3 ---
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 endroid/pusher-bundle/2.0/config/packages/endroid_pusher.yaml
 create mode 100644 pusher/pusher-php-server/3.0/config/packages/pusher_php_server.yaml
 rename {endroid/pusher-bundle/2.0 => pusher/pusher-php-server/3.0}/manifest.json (66%)

diff --git a/endroid/pusher-bundle/2.0/config/packages/endroid_pusher.yaml b/endroid/pusher-bundle/2.0/config/packages/endroid_pusher.yaml
deleted file mode 100644
index a7ca7614..00000000
--- a/endroid/pusher-bundle/2.0/config/packages/endroid_pusher.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-endroid_pusher:
-    app_id: '%env(PUSHER_APP_ID)%'
-    key: '%env(PUSHER_KEY)%'
-    secret: '%env(PUSHER_SECRET)%'
diff --git a/pusher/pusher-php-server/3.0/config/packages/pusher_php_server.yaml b/pusher/pusher-php-server/3.0/config/packages/pusher_php_server.yaml
new file mode 100644
index 00000000..999a9cfb
--- /dev/null
+++ b/pusher/pusher-php-server/3.0/config/packages/pusher_php_server.yaml
@@ -0,0 +1,7 @@
+services:
+    Pusher\Pusher:
+        public: true
+        arguments:
+            - '%env(PUSHER_KEY)%'
+            - '%env(PUSHER_SECRET)%'
+            - '%env(PUSHER_APP_ID)%'
diff --git a/endroid/pusher-bundle/2.0/manifest.json b/pusher/pusher-php-server/3.0/manifest.json
similarity index 66%
rename from endroid/pusher-bundle/2.0/manifest.json
rename to pusher/pusher-php-server/3.0/manifest.json
index 04408ab0..a61688ba 100644
--- a/endroid/pusher-bundle/2.0/manifest.json
+++ b/pusher/pusher-php-server/3.0/manifest.json
@@ -1,7 +1,4 @@
 {
-    "bundles": {
-        "Endroid\\PusherBundle\\EndroidPusherBundle": ["all"]
-    },
     "copy-from-recipe": {
         "config/": "%CONFIG_DIR%/"
     },