From daa657073e55b0a78cce8fdd22682fddecc6385f Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 27 Sep 2017 11:06:46 -0700
Subject: [PATCH 1/3] prepared the 1.35.0 release

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

diff --git a/CHANGELOG b/CHANGELOG
index 7f0890119..f738c841c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-* 1.35.0 (2017-XX-XX)
+* 1.35.0 (2017-09-27)
 
  * added Twig_Profiler_Profile::reset()
  * fixed use TokenParser to return an empty Node
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index 1d32ee5e6..7fc1601e8 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.35.0-DEV"
+#define PHP_TWIG_VERSION "1.35.0"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index 92a29b9b9..5de2f27fd 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -16,12 +16,12 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.35.0-DEV';
+    const VERSION = '1.35.0';
     const VERSION_ID = 13500;
     const MAJOR_VERSION = 1;
     const MINOR_VERSION = 35;
     const RELEASE_VERSION = 0;
-    const EXTRA_VERSION = 'DEV';
+    const EXTRA_VERSION = '';
 
     protected $charset;
     protected $loader;

From e7944a1f67499a230463f463d7cecc3336b87ea1 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 27 Sep 2017 11:07:18 -0700
Subject: [PATCH 2/3] bumped version to 1.35.1-DEV

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

diff --git a/CHANGELOG b/CHANGELOG
index f738c841c..96f0a17ad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+* 1.35.1 (2017-XX-XX)
+
+ * n/a
+
 * 1.35.0 (2017-09-27)
 
  * added Twig_Profiler_Profile::reset()
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index 7fc1601e8..bdf4fffea 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.35.0"
+#define PHP_TWIG_VERSION "1.35.1-DEV"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index 5de2f27fd..433a73aee 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -16,12 +16,12 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.35.0';
-    const VERSION_ID = 13500;
+    const VERSION = '1.35.1-DEV';
+    const VERSION_ID = 13501;
     const MAJOR_VERSION = 1;
     const MINOR_VERSION = 35;
-    const RELEASE_VERSION = 0;
-    const EXTRA_VERSION = '';
+    const RELEASE_VERSION = 1;
+    const EXTRA_VERSION = 'DEV';
 
     protected $charset;
     protected $loader;

From 3a45bd48cfbff9050aef8bc744a2db86154ec5d1 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <cs@firmafon.dk>
Date: Tue, 7 Nov 2017 22:27:49 +0100
Subject: [PATCH 3/3] Fix PHP 5.3 build

---
 .travis.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 147eb7df3..2301c8e0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ cache:
         - $HOME/.composer/cache/files
 
 php:
-    - 5.3
     - 5.4
     - 5.5
     - 5.6
@@ -40,6 +39,13 @@ script: |
 
 matrix:
     fast_finish: true
+    include:
+        - php: 5.3
+          dist: precise
+          env: TWIG_EXT=yes
+        - php: 5.3
+          dist: precise
+          env: TWIG_EXT=no
     exclude:
         - php: 7.0
           env: TWIG_EXT=yes