Merge branch '1.x' into 2.x

* 1.x:
  Length filter non-mb_string on 7.x fix.
  fixed code for older versions of PHP
  bumped version to 1.34
  Support PHPUnit 6 for testing extensions
  added PHP 7.2 to the test matrix

.travis.yml

@@ -14,6 +14,7 @@ matrix:
           dist: trusty
         - php: 7.0
         - php: 7.1
+        - php: nightly
     allow_failures:
         - php: hhvm-stable
     fast_finish: true
@@ -24,3 +25,5 @@ before_install:
 
 install:
     - travis_retry composer install
+
+script: ./vendor/bin/simple-phpunit

CHANGELOG

@@ -51,9 +51,9 @@
  * improved the performance of the filesystem loader
  * removed features that were deprecated in 1.x
 
-* 1.33.3 (2017-XX-XX)
+* 1.34.0 (2017-XX-XX)
 
- * n/a
+ * dropped PHP 5.2 support
 
 * 1.33.2 (2017-04-20)
 

lib/Twig/Environment.php

@@ -16,7 +16,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '2.3.3';
+    const VERSION = '2.3.3-DEV';
     const VERSION_ID = 20303;
     const MAJOR_VERSION = 2;
     const MINOR_VERSION = 3;

lib/Twig/Test/IntegrationTestCase.php

@@ -9,13 +9,15 @@
  * file that was distributed with this source code.
  */
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Integration test helper.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Karma Dordrak <drak@zikula.org>
  */
-abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
+abstract class Twig_Test_IntegrationTestCase extends TestCase
 {
     /**
      * @return string
@@ -193,7 +195,8 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
 
             if (false !== $exception) {
                 list($class) = explode(':', $exception);
-                $this->assertThat(null, new PHPUnit_Framework_Constraint_Exception($class));
+                $constraintClass = class_exists('PHPUnit\Framework\Constraint\Exception') ? 'PHPUnit\Framework\Constraint\Exception' : 'PHPUnit_Framework_Constraint_Exception';
+                $this->assertThat(null, new $constraintClass($class));
             }
 
             $expected = trim($match[3], "\n ");

lib/Twig/Test/NodeTestCase.php

@@ -1,5 +1,7 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
+
 /*
  * This file is part of Twig.
  *
@@ -8,7 +10,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-abstract class Twig_Test_NodeTestCase extends PHPUnit_Framework_TestCase
+abstract class Twig_Test_NodeTestCase extends TestCase
 {
     abstract public function getTests();