From ba38b6f24b8ca9988c94cbb9aa5447b3161df937 Mon Sep 17 00:00:00 2001 From: engcom-Charlie Date: Tue, 7 Feb 2023 19:32:32 +0530 Subject: [PATCH 1/2] Modifying the path of includes --- .../testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon index df311a3aea1ff..ca1bb43dab2e1 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon +++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon @@ -38,7 +38,7 @@ parameters: - '#Constant T_[A-Z_]+ not found.#' includes: - - %rootDir%/../../../vendor/phpstan/phpstan-deprecation-rules/rules.neon + - %rootDir%/../phpstan-deprecation-rules/rules.neon services: - From 9e36666f6532690527058125c2a607a0bc29e4a7 Mon Sep 17 00:00:00 2001 From: T Prasanna Date: Fri, 27 Sep 2024 16:06:14 +0530 Subject: [PATCH 2/2] resolve merge conflict --- composer.lock | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index ed6bd367d04a3..ddd30891124e7 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": "6365ef759ff5394c26ed1a48d1119a26", + "content-hash": "4b1772723e4b915c272b96eb2ca9be86", "packages": [ { "name": "aws/aws-crt-php", @@ -12089,25 +12089,24 @@ }, { "name": "phpstan/phpstan-deprecation-rules", - "version": "1.1.4", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-deprecation-rules.git", - "reference": "089d8a8258ed0aeefdc7b68b6c3d25572ebfdbaa" + "reference": "f94d246cc143ec5a23da868f8f7e1393b50eaa82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/089d8a8258ed0aeefdc7b68b6c3d25572ebfdbaa", - "reference": "089d8a8258ed0aeefdc7b68b6c3d25572ebfdbaa", + "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/f94d246cc143ec5a23da868f8f7e1393b50eaa82", + "reference": "f94d246cc143ec5a23da868f8f7e1393b50eaa82", "shasum": "" }, "require": { "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.10.3" + "phpstan/phpstan": "^1.12" }, "require-dev": { "php-parallel-lint/php-parallel-lint": "^1.2", - "phpstan/phpstan-php-parser": "^1.1", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^9.5" }, @@ -12131,9 +12130,9 @@ "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.", "support": { "issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues", - "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/1.1.4" + "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/1.2.1" }, - "time": "2023-08-05T09:02:04+00:00" + "time": "2024-09-11T15:52:35+00:00" }, { "name": "phpunit/php-code-coverage",