AC-2841::Resolve the conflicts in composer.lock

glo71317 · glo71317 · commit e6feb70e209b · 2022-10-20T10:23:11.000+05:30
diff --git a/composer.json b/composer.json
@@ -94,8 +94,8 @@
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
         "magento/magento2-functional-testing-framework": "^3.10",
-        "pdepend/pdepend": "~2.10.0",
-        "phpmd/phpmd": "^2.12.0",
+        "pdepend/pdepend": "^2.12",
+        "phpmd/phpmd": "^2.13",
         "phpstan/phpstan": "^1.6.8",
         "phpunit/phpunit": "~9.5.20",
         "sebastian/phpcpd": "^6.0.3",
diff --git a/composer.lock b/composer.lock
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php
@@ -18,6 +18,9 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class InterceptorTest extends TestCase
 {
     /**

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@`
`18`	`18`	`use PHPUnit\Framework\MockObject\MockObject;`
`19`	`19`	`use PHPUnit\Framework\TestCase;`
`20`	`20`
	`21`	`+/**`
	`22`	`+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`23`	`+ */`
`21`	`24`	`class InterceptorTest extends TestCase`
`22`	`25`	`{`
`23`	`26`	`/**`