From 7389f48a1f3283acd0e1e762c9ac310710cd4de4 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Mon, 3 Jan 2022 11:15:05 +0100
Subject: [PATCH 1/2] Add compat with PHP 7.1 back

---
 .github/workflows/ci.yml              | 1 +
 composer.json                         | 5 +++--
 extra/twig-extra-bundle/composer.json | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e2e6e0cb1..df60b6a3d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,6 +20,7 @@ jobs:
         strategy:
             matrix:
                 php-version:
+                    - '7.1.3'
                     - '7.2.5'
                     - '7.3'
                     - '7.4'
diff --git a/composer.json b/composer.json
index 8f347d54d..377d9ea41 100644
--- a/composer.json
+++ b/composer.json
@@ -24,9 +24,10 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=7.1.3",
         "symfony/polyfill-mbstring": "^1.3",
-        "symfony/polyfill-ctype": "^1.8"
+        "symfony/polyfill-ctype": "^1.8",
+        "symfony/polyfill-php72": "^1.8"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0",
diff --git a/extra/twig-extra-bundle/composer.json b/extra/twig-extra-bundle/composer.json
index 4b41ef7a2..29c068abb 100644
--- a/extra/twig-extra-bundle/composer.json
+++ b/extra/twig-extra-bundle/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^7.1.3|^8.0",
+        "php": ">=7.2.5",
         "symfony/framework-bundle": "^4.4|^5.0|^6.0",
         "symfony/twig-bundle": "^4.4|^5.0|^6.0",
         "twig/twig": "^2.7|^3.0"

From f64f82675123033b45319afce4c474490d807ac8 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Mon, 3 Jan 2022 11:39:54 +0100
Subject: [PATCH 2/2] Update CHANGELOG

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 5ebd566f7..09c116f35 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 # 2.14.9 (2022-XX-XX)
 
 * Allow null when Twig expects a string (for better 8.1 support)
+* Add support for PHP 7.1 back
 
 # 2.14.8 (2021-11-25)