From 075a1b20033909b1c70ac869470506005e4cc4d8 Mon Sep 17 00:00:00 2001 From: Pieter Hoste Date: Fri, 18 Dec 2020 08:01:43 +0100 Subject: [PATCH 1/2] Allow higher versions of phpstan to be installed. --- composer.json | 2 +- composer.lock | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 6aa9355cec7b1..3eb4ba0a5425d 100644 --- a/composer.json +++ b/composer.json @@ -95,7 +95,7 @@ "pdepend/pdepend": "~2.7.1", "phpcompatibility/php-compatibility": "^9.3", "phpmd/phpmd": "^2.8.0", - "phpstan/phpstan": ">=0.12.3 <=0.12.23", + "phpstan/phpstan": "^0.12.3", "phpunit/phpunit": "^9", "sebastian/phpcpd": "~5.0.0", "squizlabs/php_codesniffer": "~3.5.4" diff --git a/composer.lock b/composer.lock index b0b15f4e13f6c..f74ab6bdd1aa8 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": "ac6fc13ba98a815bce589d300d28012c", + "content-hash": "cccbf579ef5db68ca2dffd9aa409770d", "packages": [ { "name": "aws/aws-sdk-php", @@ -7548,6 +7548,20 @@ "parser", "php" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], "time": "2020-05-25T17:44:05+00:00" }, { @@ -9500,20 +9514,20 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.23", + "version": "0.12.69", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75" + "reference": "8f436ea35241da33487fd0d38b4bc3e6dfe30ea8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/71e529efced79e055fa8318b692e7f7d03ea4e75", - "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8f436ea35241da33487fd0d38b4bc3e6dfe30ea8", + "reference": "8f436ea35241da33487fd0d38b4bc3e6dfe30ea8", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -9538,7 +9552,21 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", - "time": "2020-05-05T12:55:44+00:00" + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpstan", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2021-01-24T14:55:37+00:00" }, { "name": "phpunit/php-code-coverage", From e355503a20af5c9a1e2aba3551fbbcea75034d12 Mon Sep 17 00:00:00 2001 From: Sergii Ivashchenko Date: Wed, 27 Jan 2021 15:31:52 +0000 Subject: [PATCH 2/2] magento/magento2#31176: Updated composer.lock --- composer.lock | 50 +++++++------------------------------------------- 1 file changed, 7 insertions(+), 43 deletions(-) diff --git a/composer.lock b/composer.lock index 8e30d813ded43..251e0a7bcbb07 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": "7eecadfa81f5a39ced573e6a4e7dad2a", + "content-hash": "b1bb5890f51a5fe54aa9b4e67980f750", "packages": [ { "name": "aws/aws-sdk-php", @@ -1459,12 +1459,6 @@ "BSD-3-Clause" ], "description": "Replace zendframework and zfcampus packages with their Laminas Project equivalents.", - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], "time": "2020-05-20T13:45:39+00:00" }, { @@ -7558,20 +7552,6 @@ "parser", "php" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], "time": "2020-05-25T17:44:05+00:00" }, { @@ -9524,20 +9504,20 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.23", + "version": "0.12.69", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75" + "reference": "8f436ea35241da33487fd0d38b4bc3e6dfe30ea8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/71e529efced79e055fa8318b692e7f7d03ea4e75", - "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8f436ea35241da33487fd0d38b4bc3e6dfe30ea8", + "reference": "8f436ea35241da33487fd0d38b4bc3e6dfe30ea8", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -9576,7 +9556,7 @@ "type": "tidelift" } ], - "time": "2020-05-05T12:55:44+00:00" + "time": "2021-01-24T14:55:37+00:00" }, { "name": "phpunit/php-code-coverage", @@ -9865,12 +9845,6 @@ "keywords": [ "timer" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-04-20T06:00:37+00:00" }, { @@ -10015,16 +9989,6 @@ "testing", "xunit" ], - "funding": [ - { - "url": "https://phpunit.de/donate.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-05-22T13:54:05+00:00" }, {