diff --git a/composer.json b/composer.json
index 5d1873aec8e178fd3aceee5cb8c56620e1fce150..903fc508d68d5bcc5edc0c613e1cc91ab7bdf03b 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,8 @@
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^1.0",
"phpstan/phpstan": "^1.10",
- "spip/coding-standards": "^1.2"
+ "spip/coding-standards": "^1.3",
+ "phpcompatibility/php-compatibility": "dev-develop@dev"
},
"suggest": {
"ext-curl": "*",
diff --git a/composer.lock b/composer.lock
index 7d35b6004fc4e34a6bb3f13224706d6aa08dc038..4bd8ae2d7f344cfaf9e71a111eb27db4ae136353 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "ba0d05c6997ff9504c742ff5ddeaf80a",
+ "content-hash": "a6f99c694fa13a4c1f465b80d9a1e8b6",
"packages": [
{
"name": "algo26-matthias/idna-convert",
@@ -487,33 +487,45 @@
},
{
"name": "phpcompatibility/php-compatibility",
- "version": "9.3.5",
+ "version": "dev-develop",
"source": {
"type": "git",
"url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
- "reference": "9fb324479acf6f39452e0655d2429cc0d3914243"
+ "reference": "4576a17265003ec9146daf8cf6e782234259cf6c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243",
- "reference": "9fb324479acf6f39452e0655d2429cc0d3914243",
+ "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/4576a17265003ec9146daf8cf6e782234259cf6c",
+ "reference": "4576a17265003ec9146daf8cf6e782234259cf6c",
"shasum": ""
},
"require": {
- "php": ">=5.3",
- "squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
+ "php": ">=5.4",
+ "phpcsstandards/phpcsutils": "^1.0",
+ "squizlabs/php_codesniffer": "^3.7.1"
},
- "conflict": {
- "squizlabs/php_codesniffer": "2.6.2"
+ "replace": {
+ "wimg/php-compatibility": "*"
},
"require-dev": {
- "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
+ "php-parallel-lint/php-console-highlighter": "^1.0.0",
+ "php-parallel-lint/php-parallel-lint": "^1.3.2",
+ "phpcsstandards/phpcsdevcs": "^1.1.3",
+ "phpcsstandards/phpcsdevtools": "^1.2.0",
+ "phpunit/phpunit": "^4.8 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4",
+ "yoast/phpunit-polyfills": "^1.0"
},
"suggest": {
- "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
"roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
},
+ "default-branch": true,
"type": "phpcodesniffer-standard",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "9.x-dev",
+ "dev-develop": "10.x-dev"
+ }
+ },
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-3.0-or-later"
@@ -539,13 +551,88 @@
"keywords": [
"compatibility",
"phpcs",
- "standards"
+ "standards",
+ "static analysis"
],
"support": {
"issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues",
"source": "https://github.com/PHPCompatibility/PHPCompatibility"
},
- "time": "2019-12-27T09:44:58+00:00"
+ "time": "2023-03-18T19:07:01+00:00"
+ },
+ {
+ "name": "phpcsstandards/phpcsutils",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/PHPCSStandards/PHPCSUtils.git",
+ "reference": "4fd2e30c7465112ca2e3646037bfb9e6f0f4d4f3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/4fd2e30c7465112ca2e3646037bfb9e6f0f4d4f3",
+ "reference": "4fd2e30c7465112ca2e3646037bfb9e6f0f4d4f3",
+ "shasum": ""
+ },
+ "require": {
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0",
+ "php": ">=5.4",
+ "squizlabs/php_codesniffer": "^3.7.1 || 4.0.x-dev@dev"
+ },
+ "require-dev": {
+ "ext-filter": "*",
+ "php-parallel-lint/php-console-highlighter": "^1.0",
+ "php-parallel-lint/php-parallel-lint": "^1.3.2",
+ "phpcsstandards/phpcsdevcs": "^1.1.3",
+ "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.3",
+ "yoast/phpunit-polyfills": "^1.0.1"
+ },
+ "type": "phpcodesniffer-standard",
+ "extra": {
+ "branch-alias": {
+ "dev-stable": "1.x-dev",
+ "dev-develop": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "PHPCSUtils/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "LGPL-3.0-or-later"
+ ],
+ "authors": [
+ {
+ "name": "Juliette Reinders Folmer",
+ "homepage": "https://github.com/jrfnl",
+ "role": "lead"
+ },
+ {
+ "name": "Contributors",
+ "homepage": "https://github.com/PHPCSStandards/PHPCSUtils/graphs/contributors"
+ }
+ ],
+ "description": "A suite of utility functions for use with PHP_CodeSniffer",
+ "homepage": "https://phpcsutils.com/",
+ "keywords": [
+ "PHP_CodeSniffer",
+ "phpcbf",
+ "phpcodesniffer-standard",
+ "phpcs",
+ "phpcs3",
+ "standards",
+ "static analysis",
+ "tokens",
+ "utility"
+ ],
+ "support": {
+ "docs": "https://phpcsutils.com/",
+ "issues": "https://github.com/PHPCSStandards/PHPCSUtils/issues",
+ "source": "https://github.com/PHPCSStandards/PHPCSUtils"
+ },
+ "time": "2023-01-05T12:08:37+00:00"
},
{
"name": "phpstan/phpstan",
@@ -611,34 +698,34 @@
},
{
"name": "spip/coding-standards",
- "version": "1.2.1",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/JamesRezo/spip-coding-standards.git",
- "reference": "a1bf55f9dbe56019c53e39c584542df789463552"
+ "reference": "b6429d4bd34b5d8591a1299babb4a46d6ab28269"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JamesRezo/spip-coding-standards/zipball/a1bf55f9dbe56019c53e39c584542df789463552",
- "reference": "a1bf55f9dbe56019c53e39c584542df789463552",
+ "url": "https://api.github.com/repos/JamesRezo/spip-coding-standards/zipball/b6429d4bd34b5d8591a1299babb4a46d6ab28269",
+ "reference": "b6429d4bd34b5d8591a1299babb4a46d6ab28269",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"php": ">=7.0",
- "phpcompatibility/php-compatibility": "^9.3",
- "squizlabs/php_codesniffer": "^3.6"
+ "phpcompatibility/php-compatibility": "dev-develop",
+ "squizlabs/php_codesniffer": "^3.7"
},
"require-dev": {
- "phpunit/phpunit": "^9.5"
+ "phpunit/phpunit": "^9.6"
},
"suggest": {
- "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
+ "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
},
"type": "phpcodesniffer-standard",
"extra": {
"branch-alias": {
- "dev-main": "1.2.x-dev"
+ "dev-main": "1.3.x-dev"
}
},
"autoload": {
@@ -658,14 +745,15 @@
],
"description": "SPIP Coding Standards",
"keywords": [
+ "dev",
"phpcs",
"spip"
],
"support": {
"issues": "https://github.com/JamesRezo/spip-coding-standards/issues",
- "source": "https://github.com/JamesRezo/spip-coding-standards/tree/1.2.1"
+ "source": "https://github.com/JamesRezo/spip-coding-standards/tree/1.3.0"
},
- "time": "2021-08-26T06:16:00+00:00"
+ "time": "2023-03-22T21:25:59+00:00"
},
{
"name": "squizlabs/php_codesniffer",
@@ -728,7 +816,8 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
- "spip/archiviste": 20
+ "spip/archiviste": 20,
+ "phpcompatibility/php-compatibility": 20
},
"prefer-stable": false,
"prefer-lowest": false,
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 2d3d67a42d2a9af9130f70104ce4ecc237bd1978..42ebf283bbc18fc2aebf2bfa502531fd9127f377 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -4,7 +4,7 @@
<file>./prive</file>
<exclude-pattern>ecrire/lang/*</exclude-pattern>
- <rule ref="SPIP41"/>
+ <rule ref="SPIP50"/>
<config name="ignore_warnings_on_exit" value="1"/>
<arg name="cache" value="tmp/php_cs.cache"/>