-

twigphp · Oct 7, 2023 · cdefd19 · cdefd19
1 parent 0ca0c38
commit cdefd19
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 21 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,12 +1,8 @@
-<<<<<<< HEAD
-# 3.7.2 (2023-XX-XX)
-=======
 # 4.0.0 (2020-XX-XX)
 
- * Drop support for PHP < 8
+ * Drop support for PHP < 8.2
 
-# 3.1.2 (2020-XX-XX)
->>>>>>> 93817469 (Bump to 4.0 and require PHP 8)
+# 3.7.2 (2023-XX-XX)
 
  * n/a
 

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0.0",
+        "php": ">=8.2",
         "symfony/polyfill-mbstring": "^1.3",
         "symfony/polyfill-ctype": "^1.8"
     },

diff --git a/extra/cache-extra/composer.json b/extra/cache-extra/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=8.2",
         "symfony/cache": "^5.0|^6.0|^7.0",
         "twig/twig": "^2.4|^3.0"
     },

diff --git a/extra/cssinliner-extra/composer.json b/extra/cssinliner-extra/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1.3",
+        "php": ">=8.2",
         "tijsverkoyen/css-to-inline-styles": "^2.0",
         "twig/twig": "^2.7|^3.0"
     },

diff --git a/extra/html-extra/composer.json b/extra/html-extra/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1.3",
+        "php": ">=8.2",
         "symfony/mime": "^5.4|^6.0|^7.0",
         "twig/twig": "^2.7|^3.0"
     },

diff --git a/extra/inky-extra/composer.json b/extra/inky-extra/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1.3",
+        "php": ">=8.2",
         "lorenzo/pinky": "^1.0.5",
         "twig/twig": "^2.7|^3.0"
     },

diff --git a/extra/intl-extra/composer.json b/extra/intl-extra/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1.3",
+        "php": ">=8.2",
         "twig/twig": "^2.7|^3.0",
         "symfony/intl": "^5.4|^6.0|^7.0"
     },

diff --git a/extra/markdown-extra/composer.json b/extra/markdown-extra/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1.3",
+        "php": ">=8.2",
         "twig/twig": "^2.7|^3.0"
     },
     "require-dev": {

diff --git a/extra/string-extra/composer.json b/extra/string-extra/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=8.2",
         "symfony/string": "^5.4|^6.0|^7.0",
         "symfony/translation-contracts": "^1.1|^2|^3",
         "twig/twig": "^2.7|^3.0"

diff --git a/extra/twig-extra-bundle/composer.json b/extra/twig-extra-bundle/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=8.2",
         "symfony/framework-bundle": "^5.4|^6.0|^7.0",
         "symfony/twig-bundle": "^5.4|^6.0|^7.0",
         "twig/twig": "^2.7|^3.0"

diff --git a/src/Environment.php b/src/Environment.php
@@ -40,12 +40,12 @@
  */
 class Environment
 {
-    const VERSION = '4.0.0-DEV';
-    const VERSION_ID = 40000;
-    const MAJOR_VERSION = 4;
-    const MINOR_VERSION = 0;
-    const RELEASE_VERSION = 0;
-    const EXTRA_VERSION = 'DEV';
+    public const VERSION = '4.0.0-DEV';
+    public const VERSION_ID = 40000;
+    public const MAJOR_VERSION = 4;
+    public const MINOR_VERSION = 0;
+    public const RELEASE_VERSION = 0;
+    public const EXTRA_VERSION = 'DEV';
 
     private $charset;
     private $loader;