From 27479d65245c416e4808b1f9162921748b1fb699 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 6 Apr 2020 19:23:50 +0200
Subject: [PATCH 1/3] Fix CI on PHP5

---
 .travis.yml      | 2 +-
 phpunit.xml.dist | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb9ea8ddb..62a98a14e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,11 @@ cache:
         - vendor
         - $HOME/.composer/cache/files
 
-
 env:
     global:
         - TWIG_EXT=no
         - SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1
+        - SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
 
 before_install:
     - phpenv config-rm xdebug.ini || return 0
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index fd5c95c98..391f244a7 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -19,7 +19,6 @@
   <php>
     <ini name="error_reporting" value="-1" />
     <ini name="xdebug.overload_var_dump" value="0" />
-    <server name="SYMFONY_PHPUNIT_VERSION" value="7.5" />
   </php>
 
   <listeners>

From 76e8f1312ec7176cae25f679291ee9d827ec906d Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 24 Apr 2020 08:24:03 +0200
Subject: [PATCH 2/3] Fix typo

---
 src/Extension/CoreExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
index 25371730b..708d897ab 100644
--- a/src/Extension/CoreExtension.php
+++ b/src/Extension/CoreExtension.php
@@ -1214,7 +1214,7 @@ function _twig_escape_js_callback($matches)
 
     /*
      * A few characters have short escape sequences in JSON and JavaScript.
-     * Escape sequences supported only by JavaScript, not JSON, are ommitted.
+     * Escape sequences supported only by JavaScript, not JSON, are omitted.
      * \" is also supported but omitted, because the resulting string is not HTML safe.
      */
     static $shortMap = [

From abe625a1a18cbdce68a178111c402bafc18a061c Mon Sep 17 00:00:00 2001
From: Yohann Durand <yohanndurand76@gmail.com>
Date: Tue, 14 Apr 2020 19:29:06 +0200
Subject: [PATCH 3/3] Update api.rst

---
 doc/api.rst | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/doc/api.rst b/doc/api.rst
index 40ccd6992..1fac0f755 100644
--- a/doc/api.rst
+++ b/doc/api.rst
@@ -153,10 +153,7 @@ Compilation Cache
 ~~~~~~~~~~~~~~~~~
 
 All template loaders can cache the compiled templates on the filesystem for
-future reuse. It speeds up Twig a lot as templates are only compiled once; and
-the performance boost is even larger if you use a PHP accelerator such as
-OPCache. See the ``cache`` and ``auto_reload`` options of ``\Twig\Environment``
-above for more information.
+future reuse. It speeds up Twig a lot as templates are only compiled once.
 
 Built-in Loaders
 ~~~~~~~~~~~~~~~~