From 2e98f9d817323c4d9566dcf29c764bae8a8ed67a Mon Sep 17 00:00:00 2001 From: Gowri Date: Wed, 18 Aug 2021 18:42:34 +0930 Subject: [PATCH 1/4] refactor: use filter_var to process node value --- app/code/Magento/Webapi/Model/Config/Converter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Webapi/Model/Config/Converter.php b/app/code/Magento/Webapi/Model/Config/Converter.php index 837a0f84423ad..3519f24278226 100644 --- a/app/code/Magento/Webapi/Model/Config/Converter.php +++ b/app/code/Magento/Webapi/Model/Config/Converter.php @@ -138,7 +138,7 @@ protected function convertMethodParameters($parameters) } $name = $parameter->attributes->getNamedItem('name')->nodeValue; $forceNode = $parameter->attributes->getNamedItem('force'); - $force = $forceNode ? (bool)$forceNode->nodeValue : false; + $force = filter_var($forceNode->nodeValue, FILTER_VALIDATE_BOOLEAN); $value = $parameter->nodeValue; $data[$name] = [ self::KEY_FORCE => $force, From 6a3bdccf6b0f0ef3db58e139592c2f05804d5d0e Mon Sep 17 00:00:00 2001 From: Gowri Date: Wed, 18 Aug 2021 22:30:10 +0930 Subject: [PATCH 2/4] chore: add null check --- app/code/Magento/Webapi/Model/Config/Converter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Webapi/Model/Config/Converter.php b/app/code/Magento/Webapi/Model/Config/Converter.php index 3519f24278226..a75bd9ea2aa0d 100644 --- a/app/code/Magento/Webapi/Model/Config/Converter.php +++ b/app/code/Magento/Webapi/Model/Config/Converter.php @@ -138,7 +138,7 @@ protected function convertMethodParameters($parameters) } $name = $parameter->attributes->getNamedItem('name')->nodeValue; $forceNode = $parameter->attributes->getNamedItem('force'); - $force = filter_var($forceNode->nodeValue, FILTER_VALIDATE_BOOLEAN); + $force = filter_var($forceNode ? $forceNode->nodeValue : false, FILTER_VALIDATE_BOOLEAN); $value = $parameter->nodeValue; $data[$name] = [ self::KEY_FORCE => $force, From c6aaf4b17609626968a25eb74900d6ec4cb237a0 Mon Sep 17 00:00:00 2001 From: Gowri <40108018+gowrizrh@users.noreply.github.com> Date: Thu, 19 Aug 2021 23:43:00 +0930 Subject: [PATCH 3/4] chore: feedback changes Co-authored-by: Denis Kopylov --- app/code/Magento/Webapi/Model/Config/Converter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Webapi/Model/Config/Converter.php b/app/code/Magento/Webapi/Model/Config/Converter.php index a75bd9ea2aa0d..1397e4e8dc755 100644 --- a/app/code/Magento/Webapi/Model/Config/Converter.php +++ b/app/code/Magento/Webapi/Model/Config/Converter.php @@ -138,7 +138,7 @@ protected function convertMethodParameters($parameters) } $name = $parameter->attributes->getNamedItem('name')->nodeValue; $forceNode = $parameter->attributes->getNamedItem('force'); - $force = filter_var($forceNode ? $forceNode->nodeValue : false, FILTER_VALIDATE_BOOLEAN); + $force = $forceNode ? filter_var($forceNode->nodeValue, FILTER_VALIDATE_BOOLEAN) : false; $value = $parameter->nodeValue; $data[$name] = [ self::KEY_FORCE => $force, From ae6a043905771e1b2fb0386c13d1c9770b16561a Mon Sep 17 00:00:00 2001 From: Gowri Date: Tue, 28 Sep 2021 15:32:57 +0930 Subject: [PATCH 4/4] chore: add phpcs ignore for failing tests --- app/code/Magento/Webapi/Model/Config/Converter.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Webapi/Model/Config/Converter.php b/app/code/Magento/Webapi/Model/Config/Converter.php index a75bd9ea2aa0d..32669225726c8 100644 --- a/app/code/Magento/Webapi/Model/Config/Converter.php +++ b/app/code/Magento/Webapi/Model/Config/Converter.php @@ -83,6 +83,7 @@ public function convert($source) } else { $serviceClassData[self::KEY_METHODS][$soapMethod][self::KEY_ACL_RESOURCES] = array_unique( + // phpcs:ignore Magento2.Performance.ForeachArrayMerge array_merge( $serviceClassData[self::KEY_METHODS][$soapMethod][self::KEY_ACL_RESOURCES], $resourcePermissionSet