Merge remote-tracking branch 'local/ACP2E-2244' into PR_06_SEP_2023

Author: o-dubovyk

lib/internal/Magento/Framework/MessageQueue/MessageValidator.php

@@ -6,6 +6,7 @@
 namespace Magento\Framework\MessageQueue;
 
 use InvalidArgumentException;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
 use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
@@ -20,6 +21,15 @@ class MessageValidator
      */
     private $communicationConfig;
 
+    /**
+     * @param CommunicationConfig|null $communicationConfig
+     */
+    public function __construct(CommunicationConfig $communicationConfig = null)
+    {
+        $this->communicationConfig = $communicationConfig
+            ?? ObjectManager::getInstance()->get(CommunicationConfig::class);
+    }
+
     /**
      * Identify message data schema by topic.
      *
@@ -30,7 +40,7 @@ class MessageValidator
      */
     protected function getTopicSchema($topic, $requestType)
     {
-        $topicConfig = $this->getCommunicationConfig()->getTopic($topic);
+        $topicConfig = $this->communicationConfig->getTopic($topic);
         if ($topicConfig === null) {
             throw new LocalizedException(new Phrase('Specified topic "%topic" is not declared.', ['topic' => $topic]));
         }
@@ -117,12 +127,14 @@ protected function validatePrimitiveType($message, $messageType, $topic)
     {
         $compareType = $messageType;
         $realType = $this->getRealType($message);
-        if ($realType == 'array' && count($message) == 0) {
-            return;
-        } elseif ($realType == 'array' && isset($message[0])) {
-            $realType = $this->getRealType($message[0]);
+        if ($realType == 'array') {
             $compareType = preg_replace('/\[\]/', '', $messageType);
+            foreach ($message as $subMessage) {
+                $this->validatePrimitiveType($subMessage, $compareType, $topic);
+            }
+            return;
         }
+
         if ($realType !== $compareType) {
             throw new InvalidArgumentException(
                 new Phrase(
@@ -151,12 +163,14 @@ protected function validateClassType($message, $messageType, $topic)
         $origMessage = $message;
         $compareType = $messageType;
         $realType = $this->getRealType($message);
-        if ($realType == 'array' && count($message) == 0) {
-            return;
-        } elseif ($realType == 'array' && isset($message[0])) {
-            $message = $message[0];
+        if ($realType == 'array') {
             $compareType = preg_replace('/\[\]/', '', $messageType);
+            foreach ($message as $subMessage) {
+                $this->validateClassType($subMessage, $compareType, $topic);
+            }
+            return;
         }
+
         if (!($message instanceof $compareType)) {
             throw new InvalidArgumentException(
                 new Phrase(
@@ -185,21 +199,4 @@ private function getRealType($message)
         $type = $type == 'double' ? 'float' : $type;
         return $type == "integer" ? "int" : $type;
     }
-
-    /**
-     * Get communication config.
-     *
-     * @return CommunicationConfig
-     *
-     * @deprecated 103.0.0
-     */
-    private function getCommunicationConfig()
-    {
-        if ($this->communicationConfig === null) {
-            $this->communicationConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                CommunicationConfig::class
-            );
-        }
-        return $this->communicationConfig;
-    }
 }

lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php

@@ -10,7 +10,6 @@
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
 use Magento\Framework\MessageQueue\MessageValidator;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -28,17 +27,10 @@ class MessageValidatorTest extends TestCase
 
     protected function setUp(): void
     {
-        $objectManager = new ObjectManager($this);
-
-        $this->model = $objectManager->getObject(MessageValidator::class);
         $this->communicationConfigMock = $this->getMockBuilder(CommunicationConfig::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $objectManager->setBackwardCompatibleProperty(
-            $this->model,
-            'communicationConfig',
-            $this->communicationConfigMock
-        );
+        $this->model = new MessageValidator($this->communicationConfigMock);
     }
 
     public function testValidateInvalidTopic()
@@ -191,6 +183,14 @@ public function getQueueConfigRequestType()
                 ['string1', 'string2'],
                 null
             ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'string[]'
+                ],
+                [10 => 'string1', 20 => 'string2'],
+                null
+            ],
             [
                 [
                     CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
@@ -207,6 +207,14 @@ public function getQueueConfigRequestType()
                 'single string',
                 'Data in topic "topic" must be of type "string[]". "string" given.'
             ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'string[]'
+                ],
+                ['string1', 2],
+                'Data in topic "topic" must be of type "string". "int" given.'
+            ],
             [
                 [
                     CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
@@ -231,6 +239,14 @@ public function getQueueConfigRequestType()
                 [$customerMock, $customerMockTwo],
                 null
             ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'Magento\Customer\Api\Data\CustomerInterface[]'
+                ],
+                [10 => $customerMock, 20 => $customerMockTwo],
+                null
+            ],
             [
                 [
                     CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
@@ -261,7 +277,15 @@ public function getQueueConfigRequestType()
                     CommunicationConfig::TOPIC_REQUEST => 'Magento\Customer\Api\Data\CustomerInterface[]'
                 ],
                 [1=>23, 3=>545],
-                'Data in topic "topic" must be of type "Magento\Customer\Api\Data\CustomerInterface[]". '
+                'Data in topic "topic" must be of type "Magento\Customer\Api\Data\CustomerInterface".'
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'Magento\Customer\Api\Data\CustomerInterface[]'
+                ],
+                [$customerMock, 545],
+                'Data in topic "topic" must be of type "Magento\Customer\Api\Data\CustomerInterface".'
             ],
         ];
     }