From 385965ff500e925e50731690dc42697e5638bbb3 Mon Sep 17 00:00:00 2001
From: endroid <info@endroid.nl>
Date: Fri, 1 Dec 2017 21:20:55 +0000
Subject: [PATCH 1/4] Prepare recipe for version 3.x and drop 2.x

---
 endroid/qrcode/2.3/config/routes/endroid_qr_code.yaml         | 4 ----
 .../qrcode/{2.3 => 3.0}/config/packages/endroid_qr_code.yaml  | 0
 endroid/qrcode/3.0/config/routes/endroid_qr_code.yaml         | 3 +++
 endroid/qrcode/{2.3 => 3.0}/manifest.json                     | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 endroid/qrcode/2.3/config/routes/endroid_qr_code.yaml
 rename endroid/qrcode/{2.3 => 3.0}/config/packages/endroid_qr_code.yaml (100%)
 create mode 100644 endroid/qrcode/3.0/config/routes/endroid_qr_code.yaml
 rename endroid/qrcode/{2.3 => 3.0}/manifest.json (54%)

diff --git a/endroid/qrcode/2.3/config/routes/endroid_qr_code.yaml b/endroid/qrcode/2.3/config/routes/endroid_qr_code.yaml
deleted file mode 100644
index aab59e1f..00000000
--- a/endroid/qrcode/2.3/config/routes/endroid_qr_code.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-EndroidQrCodeBundle:
-    resource: "@EndroidQrCodeBundle/Controller/"
-    type: annotation
-    prefix: /qrcode
diff --git a/endroid/qrcode/2.3/config/packages/endroid_qr_code.yaml b/endroid/qrcode/3.0/config/packages/endroid_qr_code.yaml
similarity index 100%
rename from endroid/qrcode/2.3/config/packages/endroid_qr_code.yaml
rename to endroid/qrcode/3.0/config/packages/endroid_qr_code.yaml
diff --git a/endroid/qrcode/3.0/config/routes/endroid_qr_code.yaml b/endroid/qrcode/3.0/config/routes/endroid_qr_code.yaml
new file mode 100644
index 00000000..16db4696
--- /dev/null
+++ b/endroid/qrcode/3.0/config/routes/endroid_qr_code.yaml
@@ -0,0 +1,3 @@
+EndroidQrCodeBundle:
+    resource: "@EndroidQrCodeBundle/Resources/config/routing.yml"
+    prefix: /qrcode
diff --git a/endroid/qrcode/2.3/manifest.json b/endroid/qrcode/3.0/manifest.json
similarity index 54%
rename from endroid/qrcode/2.3/manifest.json
rename to endroid/qrcode/3.0/manifest.json
index e029d88f..14bf8ae4 100644
--- a/endroid/qrcode/2.3/manifest.json
+++ b/endroid/qrcode/3.0/manifest.json
@@ -1,6 +1,6 @@
 {
     "bundles": {
-        "Endroid\\QrCode\\Bundle\\QrCodeBundle\\EndroidQrCodeBundle": ["all"]
+        "Endroid\\QrCodeBundle\\EndroidQrCodeBundle": ["all"]
     },
     "copy-from-recipe": {
         "config/": "%CONFIG_DIR%/"

From bb1cedcc1ab5fe82817d377a8e32abe92f37dca8 Mon Sep 17 00:00:00 2001
From: endroid <info@endroid.nl>
Date: Fri, 1 Dec 2017 21:23:19 +0000
Subject: [PATCH 2/4] Use bundle name

---
 .../3.0/config/packages/endroid_qr_code.yaml                      | 0
 .../3.0/config/routes/endroid_qr_code.yaml                        | 0
 endroid/{qrcode => qrcode-bundle}/3.0/manifest.json               | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename endroid/{qrcode => qrcode-bundle}/3.0/config/packages/endroid_qr_code.yaml (100%)
 rename endroid/{qrcode => qrcode-bundle}/3.0/config/routes/endroid_qr_code.yaml (100%)
 rename endroid/{qrcode => qrcode-bundle}/3.0/manifest.json (100%)

diff --git a/endroid/qrcode/3.0/config/packages/endroid_qr_code.yaml b/endroid/qrcode-bundle/3.0/config/packages/endroid_qr_code.yaml
similarity index 100%
rename from endroid/qrcode/3.0/config/packages/endroid_qr_code.yaml
rename to endroid/qrcode-bundle/3.0/config/packages/endroid_qr_code.yaml
diff --git a/endroid/qrcode/3.0/config/routes/endroid_qr_code.yaml b/endroid/qrcode-bundle/3.0/config/routes/endroid_qr_code.yaml
similarity index 100%
rename from endroid/qrcode/3.0/config/routes/endroid_qr_code.yaml
rename to endroid/qrcode-bundle/3.0/config/routes/endroid_qr_code.yaml
diff --git a/endroid/qrcode/3.0/manifest.json b/endroid/qrcode-bundle/3.0/manifest.json
similarity index 100%
rename from endroid/qrcode/3.0/manifest.json
rename to endroid/qrcode-bundle/3.0/manifest.json

From a994421a21af276b495811f539fe9ef9d938ab76 Mon Sep 17 00:00:00 2001
From: endroid <info@endroid.nl>
Date: Fri, 1 Dec 2017 23:07:23 +0000
Subject: [PATCH 3/4] Fix yaml file extension

---
 endroid/qrcode-bundle/3.0/config/routes/endroid_qr_code.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/endroid/qrcode-bundle/3.0/config/routes/endroid_qr_code.yaml b/endroid/qrcode-bundle/3.0/config/routes/endroid_qr_code.yaml
index 16db4696..70249bc7 100644
--- a/endroid/qrcode-bundle/3.0/config/routes/endroid_qr_code.yaml
+++ b/endroid/qrcode-bundle/3.0/config/routes/endroid_qr_code.yaml
@@ -1,3 +1,3 @@
 EndroidQrCodeBundle:
-    resource: "@EndroidQrCodeBundle/Resources/config/routing.yml"
+    resource: "@EndroidQrCodeBundle/Resources/config/routing.yaml"
     prefix: /qrcode

From f5ccb54ca7181f7f6f72802404639daec7f89443 Mon Sep 17 00:00:00 2001
From: endroid <info@endroid.nl>
Date: Sat, 2 Dec 2017 20:11:23 +0000
Subject: [PATCH 4/4] Fix routes name

---
 endroid/qrcode-bundle/3.0/config/routes/endroid_qr_code.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/endroid/qrcode-bundle/3.0/config/routes/endroid_qr_code.yaml b/endroid/qrcode-bundle/3.0/config/routes/endroid_qr_code.yaml
index 70249bc7..7b95651c 100644
--- a/endroid/qrcode-bundle/3.0/config/routes/endroid_qr_code.yaml
+++ b/endroid/qrcode-bundle/3.0/config/routes/endroid_qr_code.yaml
@@ -1,3 +1,3 @@
 EndroidQrCodeBundle:
-    resource: "@EndroidQrCodeBundle/Resources/config/routing.yaml"
+    resource: "@EndroidQrCodeBundle/Resources/config/routes.yaml"
     prefix: /qrcode