Merge branch '2.x' into 3.x

* 2.x: Update CHANGELOG Add compat with PHP 7.1 back
chaegumi · Jan 3, 2022 · e3eb9fc · e3eb9fc
2 parents ec23eba + f64f826
commit e3eb9fc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git 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/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
 # 3.3.5 (2022-XX-XX)
 
 * Allow null when Twig expects a string (for better 8.1 support)
+* Add support for PHP 7.1 back
 
 # 3.3.4 (2021-11-25)
 

diff --git 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
@@ -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"
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ jobs: @@
             strategy:
                 matrix:
                     php-version:
+                        - '7.1.3'
                         - '7.2.5'
                         - '7.3'
                         - '7.4'
@@ Expand Down @@