Merge branch 'master' into dev/4.0

iMattPro · iMattPro · commit 117dedf5cc11 · 2026-03-29T12:30:42.000-07:00
diff --git a/ext.php b/ext.php
@@ -17,7 +17,7 @@
 
 class ext extends base
 {
-	public const DEFAULT_SKELETON_PHP = '7.1.3';
+	public const DEFAULT_SKELETON_PHP = '7.2';
 	public const DEFAULT_SKELETON_PHPBB_MIN = '3.3.0';
 	public const DEFAULT_SKELETON_PHPBB_MAX = '4.0.0@dev';
 
diff --git a/skeleton/composer.json.twig b/skeleton/composer.json.twig
@@ -19,7 +19,7 @@
     ],
     "require": {
         "php": "{{ REQUIREMENTS.php_version }}",
-        "composer/installers": "^1.0 || ^2.0"
+        "composer/installers": "^1.0{% if skeleton_version_compare(REQUIREMENTS.phpbb_version_max, "4.0.0", ">") %} || ^2.0{% endif %}"
     },
 {% if COMPONENT.build %}
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`class ext extends base`
`19`	`19`	`{`
`20`		`- public const DEFAULT_SKELETON_PHP = '7.1.3';`
	`20`	`+ public const DEFAULT_SKELETON_PHP = '7.2';`
`21`	`21`	`public const DEFAULT_SKELETON_PHPBB_MIN = '3.3.0';`
`22`	`22`	`public const DEFAULT_SKELETON_PHPBB_MAX = '4.0.0@dev';`
`23`	`23`