diff --git a/CHANGELOG.md b/CHANGELOG.md
index 085439f64fdf50a0d44ebc3fe52f1b3c14c4e35d..d88ef2c92988baa0dcad315f70ac2fb8d81c1939 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@
### Changed
-- Nécessite PHP 8.0 minimum
+- Nécessite PHP 8.1 minimum
### Removed
diff --git a/composer.json b/composer.json
index 9ef606e3a16461bc4374096ae9f6f8549ee02127..ff13039c34d9851c7a67010a70d2d5e7b8f80310 100644
--- a/composer.json
+++ b/composer.json
@@ -1,17 +1,15 @@
{
"license": "GPL-3.0-only",
"require": {
- "php": "^8.0",
- "ext-json": "*",
+ "php": "^8.1",
"ext-sodium": "*",
"ext-xml": "*",
"ext-zip": "*",
- "algo26-matthias/idna-convert": "^3.1",
+ "algo26-matthias/idna-convert": "^4.0",
"spip/archiviste": "^2.3@dev",
"spip/composer-installer": "^0.5.0",
"spip/security": "^1.5",
"symfony/polyfill-mbstring": "^1.27",
- "symfony/polyfill-php81": "^1.27",
"symfony/polyfill-php82": "^1.27"
},
"require-dev": {
@@ -65,12 +63,12 @@
"spip/composer-installer": true
},
"platform": {
- "php": "8.0.28"
+ "php": "8.1.17"
}
},
"extra": {
"branch-alias": {
- "dev-master": "4.3.x-dev"
+ "dev-master": "5.0.x-dev"
},
"spip": {
"extensions": [
diff --git a/composer.lock b/composer.lock
index 1e9719cb8cb919430e8cd3eb371ff6e40e08618d..2c12e418167620732c71a743e885cb6e1b99fb86 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,29 +4,29 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "fe59a5f2be1aa5fcf1096fbab437aeeb",
+ "content-hash": "5b19cba75d218fa7bab7c82f065d33d8",
"packages": [
{
"name": "algo26-matthias/idna-convert",
- "version": "v3.1.0",
+ "version": "v4.0.0",
"source": {
"type": "git",
"url": "https://github.com/algo26-matthias/idna-convert.git",
- "reference": "340a4dc65f6b0d9884853a3d32895d82f0c1502a"
+ "reference": "a739f3f3a0c61913954ee8da145a9862a39b183f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/algo26-matthias/idna-convert/zipball/340a4dc65f6b0d9884853a3d32895d82f0c1502a",
- "reference": "340a4dc65f6b0d9884853a3d32895d82f0c1502a",
+ "url": "https://api.github.com/repos/algo26-matthias/idna-convert/zipball/a739f3f3a0c61913954ee8da145a9862a39b183f",
+ "reference": "a739f3f3a0c61913954ee8da145a9862a39b183f",
"shasum": ""
},
"require": {
"ext-pcre": "*",
"jakeasmith/http_build_url": "^1",
- "php": ">=7.2.0"
+ "php": ">=8.1"
},
"require-dev": {
- "phpunit/phpunit": "8.0"
+ "phpunit/phpunit": "^9 || ^10"
},
"suggest": {
"ext-iconv": "Install ext/iconv for using input / output other than UTF-8 or ISO-8859-1",
@@ -58,9 +58,9 @@
],
"support": {
"issues": "https://github.com/algo26-matthias/idna-convert/issues",
- "source": "https://github.com/algo26-matthias/idna-convert/tree/v3.1.0"
+ "source": "https://github.com/algo26-matthias/idna-convert/tree/v4.0.0"
},
- "time": "2023-02-17T10:08:02+00:00"
+ "time": "2023-02-26T10:28:17+00:00"
},
{
"name": "jakeasmith/http_build_url",
@@ -326,85 +326,6 @@
],
"time": "2022-11-03T14:55:06+00:00"
},
- {
- "name": "symfony/polyfill-php81",
- "version": "v1.27.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php81.git",
- "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a",
- "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Php81\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2022-11-03T14:55:06+00:00"
- },
{
"name": "symfony/polyfill-php82",
"version": "v1.27.0",
@@ -812,15 +733,14 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": "^8.0",
- "ext-json": "*",
+ "php": "^8.1",
"ext-sodium": "*",
"ext-xml": "*",
"ext-zip": "*"
},
"platform-dev": [],
"platform-overrides": {
- "php": "8.0.28"
+ "php": "8.1.17"
},
"plugin-api-version": "2.3.0"
}
diff --git a/ecrire/inc_version.php b/ecrire/inc_version.php
index 000a2aad6a6f6fa07479bb73004ad10cbd455663..43435f267e5fefdde82351d4d183db0f8dedee4a 100644
--- a/ecrire/inc_version.php
+++ b/ecrire/inc_version.php
@@ -32,7 +32,7 @@ define('_ECRIRE_INC_VERSION', '1');
error_reporting(E_ALL ^ E_NOTICE);
/** version PHP minimum exigee (cf. inc/utils) */
-define('_PHP_MIN', '8.0.0');
+define('_PHP_MIN', '8.1.0');
define('_PHP_MAX', '8.2.99');
if (!defined('_DIR_RESTREINT_ABS')) {
@@ -441,13 +441,13 @@ $liste_des_authentifications = [
// pour specifier les versions de SPIP necessaires
// il faut s'en tenir a un nombre de decimales fixe
// ex : 2.0.0, 2.0.0-dev, 2.0.0-beta, 2.0.0-beta2
-$spip_version_branche = '4.3.0-dev';
-define('_SPIP_VERSION_ID', 40300);
+$spip_version_branche = '5.0.0-dev';
+define('_SPIP_VERSION_ID', 50000);
define('_SPIP_EXTRA_VERSION', '-dev');
// cette version dev accepte tous les plugins compatible avec la version ci-dessous
// a supprimer en phase beta/rc/release
-# define('_DEV_VERSION_SPIP_COMPAT', '4.1.99');
+# define('_DEV_VERSION_SPIP_COMPAT', '4.2.99');
// version des signatures de fonctions PHP
// (= date de leur derniere modif cassant la compatibilite et/ou necessitant un recalcul des squelettes)
$spip_version_code = 2022_10_03;
diff --git a/ecrire/paquet.xml b/ecrire/paquet.xml
index bde0c2674450d77971e6ea17e149a87ba0d4102e..e1b4928ee167626ab99b76f69d0cfd87d6fd8613 100644
--- a/ecrire/paquet.xml
+++ b/ecrire/paquet.xml
@@ -1,7 +1,7 @@
<paquet
prefix="spip"
categorie="outil"
- version="4.3.0-dev"
+ version="5.0.0-dev"
etat="dev"
compatibilite="];["
schema="2021021800"