From 5e49effce37768102646495c66d284cb69ce3e71 Mon Sep 17 00:00:00 2001
From: srggroup <adam.balint@srg.hu>
Date: Fri, 22 Apr 2016 10:24:59 +0200
Subject: [PATCH 1/4] Changing composer.json

---
 composer.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/composer.json b/composer.json
index 15883cb..e921181 100644
--- a/composer.json
+++ b/composer.json
@@ -12,6 +12,10 @@
         {
             "name":  "Pablo Díez",
             "email": "pablodip@gmail.com"
+        },
+        {
+            "name":  "Ádám Bálint",
+            "email": "adam.balint@srg.hu"
         }
     ],
     "require": {

From 5e2c024188d34330d0763d464f92da9f4485542f Mon Sep 17 00:00:00 2001
From: srggroup <adam.balint@srg.hu>
Date: Fri, 22 Apr 2016 10:39:49 +0200
Subject: [PATCH 2/4] Revert Twig 2 compatibility, because of fixing
 dependencies

---
 src/Mandango/Mondator/ClassExtension.php |  3 +-
 src/Mandango/Mondator/StringLoader.php   | 61 ------------------------
 2 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 src/Mandango/Mondator/StringLoader.php

diff --git a/src/Mandango/Mondator/ClassExtension.php b/src/Mandango/Mondator/ClassExtension.php
index dc9647a..37420a5 100644
--- a/src/Mandango/Mondator/ClassExtension.php
+++ b/src/Mandango/Mondator/ClassExtension.php
@@ -409,8 +409,7 @@ public function getTwig()
                 throw new \RuntimeException('Twig is required to use templates.');
             }
 
-            $loader = new StringLoader();
-            $twig = new \Twig_Environment($loader, array(
+            $twig = new \Twig_Loader_String($loader, array(
                 'autoescape'       => false,
                 'strict_variables' => true,
                 'debug'            => true,
diff --git a/src/Mandango/Mondator/StringLoader.php b/src/Mandango/Mondator/StringLoader.php
deleted file mode 100644
index 57c00ee..0000000
--- a/src/Mandango/Mondator/StringLoader.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Mandango\Mondator;
-
-	/*
-	 * This file is part of Twig.
-	 *
-	 * (c) 2009 Fabien Potencier
-	 *
-	 * For the full copyright and license information, please view the LICENSE
-	 * file that was distributed with this source code.
-	 */
-
-/**
- * Loads a template from a string.
- *
- * This loader should NEVER be used. It only exists for Twig internal purposes.
- *
- * When using this loader with a cache mechanism, you should know that a new cache
- * key is generated each time a template content "changes" (the cache key being the
- * source code of the template). If you don't want to see your cache grows out of
- * control, you need to take care of clearing the old cache file by yourself.
- *
- * @deprecated since 1.18.1 (to be removed in 2.0)
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class StringLoader implements \Twig_LoaderInterface
-{
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getSource($name)
-	{
-		return $name;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function exists($name)
-	{
-		return true;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getCacheKey($name)
-	{
-		return $name;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function isFresh($name, $time)
-	{
-		return true;
-	}
-}

From c9c61092b64b37f2774362c19438cefc02242fe0 Mon Sep 17 00:00:00 2001
From: srggroup <adam.balint@srg.hu>
Date: Fri, 22 Apr 2016 14:16:50 +0200
Subject: [PATCH 3/4] Fix for Twig 2 revert

---
 src/Mandango/Mondator/ClassExtension.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Mandango/Mondator/ClassExtension.php b/src/Mandango/Mondator/ClassExtension.php
index 37420a5..815e235 100644
--- a/src/Mandango/Mondator/ClassExtension.php
+++ b/src/Mandango/Mondator/ClassExtension.php
@@ -409,7 +409,8 @@ public function getTwig()
                 throw new \RuntimeException('Twig is required to use templates.');
             }
 
-            $twig = new \Twig_Loader_String($loader, array(
+	          $loader = new \Twig_Loader_String();
+            $twig = new \Twig_Environment($loader, array(
                 'autoescape'       => false,
                 'strict_variables' => true,
                 'debug'            => true,

From 26c06de28dab8ba29f8b8351bd1d533fcfbb14ee Mon Sep 17 00:00:00 2001
From: srggroup <adam.balint@srg.hu>
Date: Sat, 5 Nov 2016 10:12:26 +0100
Subject: [PATCH 4/4] Change PHP dependency

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e921181..7697df8 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "php":       "^5.6.0",
+        "php":       "^5.6",
         "twig/twig": "^1.2"
     },
     "autoload": {