Merge remote-tracking branch 'origin/MC-33069-CE-1' into MC-33069

Author: zakdma

app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/Grouped/LinksTest.php

@@ -108,16 +108,25 @@ public function testSaveLinksDataWithProductsAttrs($linksData)
         $linksData['attr_product_ids'] = [12 => true, 16 => true];
         $linksData['position'] = [4 => 6];
         $linksData['qty'] = [9 => 3];
+        $attributes = [
+            ['id' => 1, 'code' => 'position', 'type' => 'int'],
+            ['id' => 2, 'code' => 'qty', 'type' => 'decimal'],
+        ];
         $this->processBehaviorGetter('append');
         $select = $this->createMock(Select::class);
-        $this->connection->expects($this->any())->method('select')->will($this->returnValue($select));
-        $select->expects($this->any())->method('from')->willReturnSelf();
-        $select->expects($this->any())->method('where')->willReturnSelf();
-        $this->connection->expects($this->once())->method('fetchAll')->with($select)->will($this->returnValue([]));
+        $this->connection->expects($this->exactly(2))->method('select')->will($this->returnValue($select));
+        $select->expects($this->exactly(2))->method('from')->willReturnSelf();
+        $select->expects($this->exactly(2))->method('where')->willReturnSelf();
+        $this->connection->expects($this->once())->method('fetchAll')
+            ->with($select)->will($this->returnValue($attributes));
         $this->connection->expects($this->once())->method('fetchPairs')->with($select)->will(
             $this->returnValue([])
         );
         $this->connection->expects($this->exactly(4))->method('insertOnDuplicate');
+        $this->link->expects($this->exactly(2))->method('getAttributeTypeTable')->willReturn(
+            'table_name'
+        );
+
         $this->links->saveLinksData($linksData);
     }
 

app/code/Magento/Integration/Test/Unit/Controller/Token/AccessTest.php

@@ -167,7 +167,8 @@ public function testAccessAction()
         $this->helperMock->expects($this->once())
             ->method('getRequestUrl');
         $this->helperMock->expects($this->once())
-            ->method('prepareRequest');
+            ->method('prepareRequest')
+            ->willReturn(['oauth_consumer_key' => 'oauth_key']);
         $this->frameworkOauthSvcMock->expects($this->once())
             ->method('getAccessToken')
             ->willReturn(['response']);

lib/internal/Magento/Framework/MessageQueue/Code/Generator/RemoteServiceGenerator.php

@@ -136,7 +136,7 @@ protected function _getClassMethods()
                 $parameterName = $methodParameter->getName();
                 $parameter = [
                     'name' => $parameterName,
-                    'type' => $methodParameter->getType(),
+                    'type' => $this->convertMethodType($methodParameter->getType()),
                 ];
                 if ($methodParameter->isDefaultValueAvailable()) {
                     $parameter['defaultValue'] = $methodParameter->getDefaultValue() !== null
@@ -155,7 +155,7 @@ protected function _getClassMethods()
             $annotations = [['name' => 'inheritdoc']];
             $method = [
                 'name' => $methodName,
-                'returnType' => $methodReflection->getReturnType(),
+                'returnType' => $this->convertMethodType($methodReflection->getReturnType()),
                 'parameters' => $methodParameters,
                 'body' => $methodBody,
                 'docblock' => ['tags' => $annotations],
@@ -165,6 +165,17 @@ protected function _getClassMethods()
         return $methods;
     }
 
+    /**
+     * Converts method type if needed.
+     *
+     * @param mixed $type
+     * @return string|null
+     */
+    private function convertMethodType($type)
+    {
+        return $type instanceof \ReflectionNamedType ? $type->getName() : $type;
+    }
+
     /**
      * @inheritDoc
      */