From e8e6575abf6102af53ec283f7f14b89e304fa602 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sun, 7 Jun 2015 01:31:24 +0200
Subject: [PATCH 1/3] prepared the 1.18.2 release

---
 CHANGELOG                | 2 +-
 ext/twig/php_twig.h      | 2 +-
 lib/Twig/Environment.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 034158da6..9493d5d9b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-* 1.18.2 (2015-XX-XX)
+* 1.18.2 (2015-06-06)
 
  * fixed template/line guessing in exceptions for nested templates
  * optimized the number of inodes and the size of realpath cache when using the cache
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index b645bbffd..168f9667a 100644
--- a/ext/twig/php_twig.h
+++ b/ext/twig/php_twig.h
@@ -15,7 +15,7 @@
 #ifndef PHP_TWIG_H
 #define PHP_TWIG_H
 
-#define PHP_TWIG_VERSION "1.18.2-DEV"
+#define PHP_TWIG_VERSION "1.18.2"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index baa279993..f14e5d81d 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -16,7 +16,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.18.2-DEV';
+    const VERSION = '1.18.2';
 
     protected $charset;
     protected $loader;

From e22fb8728b395b306a06785a3ae9b12f3fbc0294 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sun, 7 Jun 2015 01:35:59 +0200
Subject: [PATCH 2/3] bumped version to 1.18.3-DEV

---
 CHANGELOG                | 4 ++++
 ext/twig/php_twig.h      | 2 +-
 lib/Twig/Environment.php | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9493d5d9b..26a158864 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+* 1.18.3 (2015-XX-XX)
+
+ * n/a
+
 * 1.18.2 (2015-06-06)
 
  * fixed template/line guessing in exceptions for nested templates
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index 168f9667a..303b0afc5 100644
--- a/ext/twig/php_twig.h
+++ b/ext/twig/php_twig.h
@@ -15,7 +15,7 @@
 #ifndef PHP_TWIG_H
 #define PHP_TWIG_H
 
-#define PHP_TWIG_VERSION "1.18.2"
+#define PHP_TWIG_VERSION "1.18.3-DEV"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index f14e5d81d..cb1824d81 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -16,7 +16,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.18.2';
+    const VERSION = '1.18.3-DEV';
 
     protected $charset;
     protected $loader;

From 12bf70d9addf613260056f9840aee23b151073f7 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 24 Jun 2015 18:24:09 +0200
Subject: [PATCH 3/3] fixed CS

---
 lib/Twig/Profiler/Dumper/Html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Twig/Profiler/Dumper/Html.php b/lib/Twig/Profiler/Dumper/Html.php
index c89852064..f066da750 100644
--- a/lib/Twig/Profiler/Dumper/Html.php
+++ b/lib/Twig/Profiler/Dumper/Html.php
@@ -14,7 +14,7 @@
  */
 class Twig_Profiler_Dumper_Html extends Twig_Profiler_Dumper_Text
 {
-    static private $colors = array(
+    private static $colors = array(
         'block' => '#dfd',
         'macro' => '#ddf',
         'template' => '#ffd',