Merged 36418 and resolved conflicts

engcom-Charlie · engcom-Charlie · commit 94c5940bb472 · 2023-01-31T22:57:52.000+05:30
diff --git a/composer.json b/composer.json
@@ -99,6 +99,7 @@
         "pdepend/pdepend": "^2.10",
         "phpmd/phpmd": "^2.12",
         "phpstan/phpstan": "^1.7",
+        "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpunit/phpunit": "^9.5",
         "sebastian/phpcpd": "^6.0",
         "symfony/finder": "^5.4"
diff --git a/composer.lock b/composer.lock
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
@@ -37,6 +37,8 @@ parameters:
         - '#Constant TESTS_INSTALLATION_DB_CONFIG_FILE not found.#'
         - '#Constant T_[A-Z_]+ not found.#'
 
+includes:
+    - %rootDir%/../../../vendor/phpstan/phpstan-deprecation-rules/rules.neon
 
 services:
     -

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ parameters:`
`37`	`37`	`- '#Constant TESTS_INSTALLATION_DB_CONFIG_FILE not found.#'`
`38`	`38`	`- '#Constant T_[A-Z_]+ not found.#'`
`39`	`39`
	`40`	`+includes:`
	`41`	`+ - %rootDir%/../../../vendor/phpstan/phpstan-deprecation-rules/rules.neon`
`40`	`42`
`41`	`43`	`services:`
`42`	`44`	`-`