From 59a51d870205e4525b9baca8eb905991f5bbe103 Mon Sep 17 00:00:00 2001
From: tim neutkens <tim@weprovide.com>
Date: Tue, 24 May 2016 23:07:30 +0200
Subject: [PATCH 1/3] Added magento2 support

---
 src/apps.json | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 910832ad0..6710ed1d5 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -4094,17 +4094,21 @@
 		},
 		"Magento": {
 			"cats": [
-				6
+			  6
+			],
+			"env": [
+			  "^(?:Mage|VarienForm)$"
 			],
-			"env": "^(?:Mage|VarienForm)$",
 			"headers": {
-				"Set-Cookie": "frontend=\\;confidence:50"
+			  "Set-Cookie": "frontend=\\;confidence:50"
 			},
+			"html": "<script [^>]*type=\"[^\"]+text/x-magento-init\\;version:\\2",
 			"icon": "Magento.png",
 			"implies": "PHP",
 			"script": [
-				"js/mage",
-				"skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community"
+			  "js/mage",
+			  "skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community",
+			  "static/_requirejs\\;confidence:50\\;version:\\2"
 			],
 			"website": "www.magentocommerce.com"
 		},

From 19444ce2ed90bdf1d6b44c2ef7cffd2035a8779e Mon Sep 17 00:00:00 2001
From: tim neutkens <tim@weprovide.com>
Date: Sat, 11 Jun 2016 12:26:46 +0200
Subject: [PATCH 2/3] Magento2 support fixes

---
 src/apps.json | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 6710ed1d5..10866bf43 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -4102,13 +4102,17 @@
 			"headers": {
 			  "Set-Cookie": "frontend=\\;confidence:50"
 			},
-			"html": "<script [^>]*type=\"[^\"]+text/x-magento-init\\;version:\\2",
+			"html": [
+				"<script [^>]+data-requiremodule=\"mage/\\;version:\\2",
+				"<script [^>]+data-requiremodule=\"Magento_\\;version:\\2"
+			],
 			"icon": "Magento.png",
 			"implies": "PHP",
 			"script": [
-			  "js/mage",
-			  "skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community",
-			  "static/_requirejs\\;confidence:50\\;version:\\2"
+			  	"js/mage",
+			  	"skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community",
+				"static/_requirejs\\;confidence:50\\;version:\\2",
+				"static/frontend\\;confidence:20\\;version:\\2"
 			],
 			"website": "www.magentocommerce.com"
 		},

From bb51ac47faa8eb3661ac004136ff65841a648e1d Mon Sep 17 00:00:00 2001
From: tim neutkens <tim@weprovide.com>
Date: Sat, 11 Jun 2016 12:50:39 +0200
Subject: [PATCH 3/3] Right version string for Magento 2 detection

---
 src/apps.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 10866bf43..0c5c394af 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -4103,16 +4103,16 @@
 			  "Set-Cookie": "frontend=\\;confidence:50"
 			},
 			"html": [
-				"<script [^>]+data-requiremodule=\"mage/\\;version:\\2",
-				"<script [^>]+data-requiremodule=\"Magento_\\;version:\\2"
+				"<script [^>]+data-requiremodule=\"mage/\\;version:2",
+				"<script [^>]+data-requiremodule=\"Magento_\\;version:2"
 			],
 			"icon": "Magento.png",
 			"implies": "PHP",
 			"script": [
 			  	"js/mage",
 			  	"skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community",
-				"static/_requirejs\\;confidence:50\\;version:\\2",
-				"static/frontend\\;confidence:20\\;version:\\2"
+				"static/_requirejs\\;confidence:50\\;version:2",
+				"static/frontend\\;confidence:20\\;version:2"
 			],
 			"website": "www.magentocommerce.com"
 		},