Merge remote-tracking branch 'origin/MC-29891' into 2.4-develop-pr5

serhii-balko · serhii-balko · commit 12fd3d561772 · 2019-12-24T11:16:01.000+02:00
diff --git a/app/code/Magento/Sales/etc/webapi.xml b/app/code/Magento/Sales/etc/webapi.xml
@@ -253,7 +253,7 @@
             <resource ref="Magento_Sales::ship" />
         </resources>
     </route>
-    <route url="/V1/orders/" method="POST">
+    <route url="/V1/orders" method="POST">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="save"/>
         <resources>
             <resource ref="Magento_Sales::create" />
diff --git a/app/code/Magento/WebapiAsync/Model/Config.php b/app/code/Magento/WebapiAsync/Model/Config.php
@@ -179,7 +179,7 @@ private function generateTopicNameFromService($serviceInterface, $serviceMethod,
      */
     private function generateKey($typeName, $methodName, $delimiter = '\\', $lcfirst = true)
     {
-        $parts = explode($delimiter, ltrim($typeName, $delimiter));
+        $parts = explode($delimiter, trim($typeName, $delimiter));
         foreach ($parts as &$part) {
             $part = ltrim($part, ':');
             if ($lcfirst === true) {

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ private function generateTopicNameFromService($serviceInterface, $serviceMethod,`
`179`	`179`	`*/`
`180`	`180`	`private function generateKey($typeName, $methodName, $delimiter = '\\', $lcfirst = true)`
`181`	`181`	`{`
`182`		`- $parts = explode($delimiter, ltrim($typeName, $delimiter));`
	`182`	`+ $parts = explode($delimiter, trim($typeName, $delimiter));`
`183`	`183`	`foreach ($parts as &$part) {`
`184`	`184`	`$part = ltrim($part, ':');`
`185`	`185`	`if ($lcfirst === true) {`