Merge branch 'AC-1271' into cia-2.4.7-beta1-bugfixes-02062023

admanesachin · admanesachin · commit 5f90817f8883 · 2023-02-07T15:41:13.000-06:00
# Conflicts:
#	app/code/Magento/Quote/i18n/en_US.csv
diff --git a/app/code/Magento/GraphQl/Model/Backpressure/BackpressureFieldValidator.php b/app/code/Magento/GraphQl/Model/Backpressure/BackpressureFieldValidator.php
@@ -43,6 +43,7 @@ public function __construct(
     /**
      * Validate resolver args
      *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @param Field $field
      * @param array $args
      * @return void
diff --git a/app/code/Magento/Quote/i18n/en_US.csv b/app/code/Magento/Quote/i18n/en_US.csv
@@ -74,4 +74,3 @@ Carts,Carts
 "Please select a valid rate limit period in seconds: %1.","Please select a valid rate limit period in seconds: %1."
 "Identity type not found","Identity type not found"
 "Invalid order backpressure limit config","Invalid order backpressure limit config"
-

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ public function __construct(`
`43`	`43`	`/**`
`44`	`44`	`* Validate resolver args`
`45`	`45`	`*`
	`46`	`+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`46`	`47`	`* @param Field $field`
`47`	`48`	`* @param array $args`
`48`	`49`	`* @return void`