From c27d45e806acd5d81432a7bdb22994483f7a4830 Mon Sep 17 00:00:00 2001
From: Huwiler Stefan <stefan@stefanhuwiler.com>
Date: Mon, 27 Nov 2017 10:36:29 +0100
Subject: [PATCH] Changed to Twig Version 2

---
 composer.json | 77 ++++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/composer.json b/composer.json
index 08b3a46..e8c06c8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,48 +1,49 @@
 {
-	"name":             "pattern-lab/patternengine-twig",
-	"description":      "Twig-based PatternEngine for Pattern Lab.",
-	"keywords":         ["twig", "pattern lab", "pattern engine"],
-	"homepage":         "http://patternlab.io",
-	"license":          "MIT",
-	"type":             "patternlab-patternengine",
-	"authors": [
-		{
-			"name":         "Dave Olsen",
-			"email":        "dmolsen@gmail.com",
-			"homepage":     "http://dmolsen.com",
-			"role":         "Lead Developer"
+	"name" : "pattern-lab/patternengine-twig",
+	"description" : "Twig-based PatternEngine for Pattern Lab.",
+	"keywords" : [
+		"twig",
+		"pattern lab",
+		"pattern engine"
+	],
+	"homepage" : "http://patternlab.io",
+	"license" : "MIT",
+	"type" : "patternlab-patternengine",
+	"authors" : [{
+			"name" : "Dave Olsen",
+			"email" : "dmolsen@gmail.com",
+			"homepage" : "http://dmolsen.com",
+			"role" : "Lead Developer"
 		}
 	],
-	"support": {
-		"issues":         "https://github.com/pattern-lab/patternengine-php-twig/issues",
-		"wiki":           "http://patternlab.io/docs/",
-		"source":         "https://github.com/pattern-lab/patternengine-php-twig/releases"
+	"support" : {
+		"issues" : "https://github.com/pattern-lab/patternengine-php-twig/issues",
+		"wiki" : "http://patternlab.io/docs/",
+		"source" : "https://github.com/pattern-lab/patternengine-php-twig/releases"
 	},
-	"autoload": {
-		"psr-0": {
-			"PatternLab\\PatternEngine\\Twig": "src/"
+	"autoload" : {
+		"psr-0" : {
+			"PatternLab\\PatternEngine\\Twig" : "src/"
 		}
 	},
-	"require": {
-		"pattern-lab/core": "^2.0.0",
-		"twig/twig":        "~1.0"
+	"require" : {
+		"pattern-lab/core" : "^2.0.0",
+		"twig/twig" : "~2.0"
 	},
-	"extra": {
-		"patternlab": {
-			"config": {
-				"lineageMatch": "{%([ ]+)?(?:include|extends|embed)( |\\()[&quot;\\&#039;]([\\/.@A-Za-z0-9-_]+)[&quot;\\&#039;]([\\s\\S+]*?)%}",
-				"lineageMatchKey": 3,
-				"patternExtension": "twig",
-				"twigDebug": false,
-				"twigAutoescape": "html",
-				"twigDefaultDateFormat": "",
-				"twigDefaultIntervalFormat": "",
-				"twigMacroExt": "macro.twig",
-				"twigFilterExt": "filter.php",
-				"twigFunctionExt": "function.php",
-				"twigTagExt": "tag.php",
-				"twigTestExt": "test.php"
+	"extra" : {
+		"patternlab" : {
+			"config" : {
+				"lineageMatch" : "{%([ ]+)?(?:include|extends|embed)( |\\()[&quot;\\&#039;]([\\/.@A-Za-z0-9-_]+)[&quot;\\&#039;]([\\s\\S+]*?)%}",
+				"lineageMatchKey" : 3,
+				"patternExtension" : "twig",
+				"twigDebug" : false,
+				"twigAutoescape" : "html",
+				"twigMacroExt" : "macro.twig",
+				"twigFilterExt" : "filter.php",
+				"twigFunctionExt" : "function.php",
+				"twigTagExt" : "tag.php",
+				"twigTestExt" : "test.php"
 			}
 		}
 	}
-}
+}
\ No newline at end of file