Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2022-06-15 19:08:14 +0300
committerGitHub <noreply@github.com>2022-06-15 19:08:14 +0300
commit3d2bd000a054aab9044c1a38cf29f55324bc4949 (patch)
tree45e7fb6f4f20191446dceeeb08e93dcd3d255e15
parent1554431e5d557153417763a039d6b033e300d3df (diff)
Fix PHPCS by requiring specific dependency versions (#19361)
-rw-r--r--composer.json9
-rw-r--r--composer.lock158
-rw-r--r--phpcs.xml2
3 files changed, 30 insertions, 139 deletions
diff --git a/composer.json b/composer.json
index 0ffc8bcde4..f1dd539490 100644
--- a/composer.json
+++ b/composer.json
@@ -36,6 +36,7 @@
"composer/semver": "~1.3.0",
"davaxi/sparkline": "~2.0",
"geoip2/geoip2": "^2.8",
+ "lox/xhprof": "dev-master",
"matomo/cache": "~2.0",
"matomo/decompress": "~2.0",
"matomo/device-detector": "^5.0",
@@ -59,13 +60,13 @@
"tecnickcom/tcpdf": "~6.0",
"tedivm/jshrink": "~v1.4.0",
"twig/twig": "^3.0",
- "wikimedia/less.php": "^3.0",
- "lox/xhprof": "dev-master"
+ "wikimedia/less.php": "^3.0"
},
"require-dev": {
- "mayflower/mo4-coding-standard": "~8.0",
"phpunit/phpunit": "~8.5",
- "squizlabs/php_codesniffer": "^3.5",
+ "slevomat/coding-standard": "~7.2.0",
+ "squizlabs/php_codesniffer": "~3.6",
+ "phpstan/phpdoc-parser": "~1.5.0",
"symfony/var-dumper": "~2.6.0",
"symfony/yaml": "~2.6.0"
},
diff --git a/composer.lock b/composer.lock
index 643bfe663c..f4bbe6264e 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": "9f6dbec89d3c3357d4208cdf4be7ce74",
+ "content-hash": "f7f3caa46d358cadcbf0094f477b2cea",
"packages": [
{
"name": "composer/ca-bundle",
@@ -1475,16 +1475,16 @@
},
{
"name": "phpmailer/phpmailer",
- "version": "v6.6.0",
+ "version": "v6.6.2",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
- "reference": "e43bac82edc26ca04b36143a48bde1c051cfd5b1"
+ "reference": "b52ed06864fdda81b82ec8bf564cf15d45ed4f95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e43bac82edc26ca04b36143a48bde1c051cfd5b1",
- "reference": "e43bac82edc26ca04b36143a48bde1c051cfd5b1",
+ "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/b52ed06864fdda81b82ec8bf564cf15d45ed4f95",
+ "reference": "b52ed06864fdda81b82ec8bf564cf15d45ed4f95",
"shasum": ""
},
"require": {
@@ -1496,8 +1496,8 @@
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"doctrine/annotations": "^1.2",
- "php-parallel-lint/php-console-highlighter": "^0.5.0",
- "php-parallel-lint/php-parallel-lint": "^1.3.1",
+ "php-parallel-lint/php-console-highlighter": "^1.0.0",
+ "php-parallel-lint/php-parallel-lint": "^1.3.2",
"phpcompatibility/php-compatibility": "^9.3.5",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.6.2",
@@ -1541,7 +1541,7 @@
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
"support": {
"issues": "https://github.com/PHPMailer/PHPMailer/issues",
- "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.0"
+ "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.2"
},
"funding": [
{
@@ -1549,7 +1549,7 @@
"type": "github"
}
],
- "time": "2022-02-28T15:31:21+00:00"
+ "time": "2022-06-14T09:27:21+00:00"
},
{
"name": "psr/container",
@@ -2574,118 +2574,6 @@
"time": "2022-03-03T08:28:38+00:00"
},
{
- "name": "escapestudios/symfony2-coding-standard",
- "version": "3.12.0",
- "source": {
- "type": "git",
- "url": "https://github.com/djoos/Symfony-coding-standard.git",
- "reference": "1524e573f5061555af3c363f0948c444d8522499"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/djoos/Symfony-coding-standard/zipball/1524e573f5061555af3c363f0948c444d8522499",
- "reference": "1524e573f5061555af3c363f0948c444d8522499",
- "shasum": ""
- },
- "require": {
- "squizlabs/php_codesniffer": "^3.3.1"
- },
- "conflict": {
- "squizlabs/php_codesniffer": "<3 || >=4"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.0 || ^6.0 || ^7.0"
- },
- "type": "phpcodesniffer-standard",
- "extra": {
- "branch-alias": {
- "dev-master": "3.x-dev"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "David Joos",
- "email": "iam@davidjoos.com"
- },
- {
- "name": "Community contributors",
- "homepage": "https://github.com/djoos/Symfony-coding-standard/graphs/contributors"
- }
- ],
- "description": "CodeSniffer ruleset for the Symfony 2+ coding standard",
- "homepage": "https://github.com/djoos/Symfony-coding-standard",
- "keywords": [
- "Coding Standard",
- "Symfony2",
- "phpcs",
- "symfony"
- ],
- "support": {
- "issues": "https://github.com/djoos/Symfony-coding-standard/issues",
- "source": "https://github.com/djoos/Symfony-coding-standard"
- },
- "time": "2021-01-18T12:40:14+00:00"
- },
- {
- "name": "mayflower/mo4-coding-standard",
- "version": "v8.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/mayflower/mo4-coding-standard.git",
- "reference": "9261d3c3cdb08d3c5bf09afd3f0a35452c557dff"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/mayflower/mo4-coding-standard/zipball/9261d3c3cdb08d3c5bf09afd3f0a35452c557dff",
- "reference": "9261d3c3cdb08d3c5bf09afd3f0a35452c557dff",
- "shasum": ""
- },
- "require": {
- "dealerdirect/phpcodesniffer-composer-installer": "~0.7",
- "escapestudios/symfony2-coding-standard": "^3.10.0",
- "php": "~7.2 || ~8.0",
- "slevomat/coding-standard": "^7.0.1",
- "squizlabs/php_codesniffer": "^3.6.0"
- },
- "require-dev": {
- "phan/phan": "^5.1.0",
- "phpstan/phpstan": "^0.12.58",
- "phpstan/phpstan-strict-rules": "^0.12.4",
- "phpunit/phpunit": "^7.0",
- "psalm/plugin-phpunit": "^0.16.1",
- "vimeo/psalm": "^4.5.2"
- },
- "type": "phpcodesniffer-standard",
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Xaver Loppenstedt",
- "email": "xaver@loppenstedt.de"
- }
- ],
- "description": "PHP CodeSniffer ruleset implementing the MO4 coding standards extending the Symfony coding standards.",
- "homepage": "https://github.com/mayflower/mo4-coding-standard",
- "keywords": [
- "mo4",
- "phpcs",
- "psr",
- "standards",
- "symfony"
- ],
- "support": {
- "issues": "https://github.com/mayflower/mo4-coding-standard/issues",
- "source": "https://github.com/mayflower/mo4-coding-standard"
- },
- "time": "2021-08-31T09:16:34+00:00"
- },
- {
"name": "myclabs/deep-copy",
"version": "1.11.0",
"source": {
@@ -3084,16 +2972,16 @@
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.6.0",
+ "version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "3cb62d10845338136ff4ba299ab0986bbf84ba77"
+ "reference": "981cc368a216c988e862a75e526b6076987d1b50"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3cb62d10845338136ff4ba299ab0986bbf84ba77",
- "reference": "3cb62d10845338136ff4ba299ab0986bbf84ba77",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/981cc368a216c988e862a75e526b6076987d1b50",
+ "reference": "981cc368a216c988e862a75e526b6076987d1b50",
"shasum": ""
},
"require": {
@@ -3122,9 +3010,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/1.6.0"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.5.1"
},
- "time": "2022-06-09T09:45:59+00:00"
+ "time": "2022-05-05T11:32:40+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -4312,16 +4200,16 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.6.2",
+ "version": "3.7.0",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
+ "reference": "a2cd51b45bcaef9c1f2a4bda48f2dd2fa2b95563"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
- "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/a2cd51b45bcaef9c1f2a4bda48f2dd2fa2b95563",
+ "reference": "a2cd51b45bcaef9c1f2a4bda48f2dd2fa2b95563",
"shasum": ""
},
"require": {
@@ -4364,7 +4252,7 @@
"source": "https://github.com/squizlabs/PHP_CodeSniffer",
"wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
},
- "time": "2021-12-12T21:44:58+00:00"
+ "time": "2022-06-13T06:31:38+00:00"
},
{
"name": "symfony/var-dumper",
@@ -4594,8 +4482,8 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
- "matomo/referrer-spam-list": 20,
- "lox/xhprof": 20
+ "lox/xhprof": 20,
+ "matomo/referrer-spam-list": 20
},
"prefer-stable": false,
"prefer-lowest": false,
@@ -4606,5 +4494,5 @@
"platform-overrides": {
"php": "7.2.9"
},
- "plugin-api-version": "2.3.0"
+ "plugin-api-version": "2.2.0"
}
diff --git a/phpcs.xml b/phpcs.xml
index daa162365b..9be94e86a6 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -14,6 +14,8 @@
<exclude-pattern>*/vendor/*</exclude-pattern>
<exclude-pattern>*/libs/*</exclude-pattern>
+ <config name="installed_paths" value="../../slevomat/coding-standard"/>
+
<!-- Forbid other line endings than \n -->
<rule ref="Generic.Files.LineEndings">
<properties>