MC-32697: [2.4] AbstractSimpleObjectBuilder.php throws exception when Interceptor instance comes.

Author: DianaRusin

dev/tests/integration/testsuite/Magento/Framework/Api/SortOrderBuilderTest.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Api;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test of building the Data Object
+ */
+class SortOrderBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SortOrderBuilder
+     */
+    private $interceptedBuilder;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->interceptedBuilder = Bootstrap::getObjectManager()->get(SortOrderBuilder::class . '\Interceptor');
+    }
+
+    /**
+     * Test Builder successfully creates object when Interceptor instance is provided.
+     *
+     * @return void
+     */
+    public function testCreate(): void
+    {
+        $this->assertEquals(SortOrder::class, get_class($this->interceptedBuilder->create()));
+    }
+}

lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Api;
 
 /**
@@ -44,6 +46,8 @@ public function create()
     }
 
     /**
+     * Overwrite data in Object.
+     *
      * @param string $key
      * @param mixed $value
      *
@@ -60,12 +64,16 @@ protected function _set($key, $value)
      *
      * @return string
      */
-    protected function _getDataObjectType()
+    protected function _getDataObjectType(): string
     {
         $currentClass = get_class($this);
-        $builderSuffix = 'Builder';
-        $dataObjectType = substr($currentClass, 0, -strlen($builderSuffix));
-        return $dataObjectType;
+        $suffix = 'Builder';
+        $interceptorSuffix = '\Interceptor';
+        if (false !== strpos($currentClass, $interceptorSuffix, -strlen($interceptorSuffix))) {
+            $suffix .= $interceptorSuffix;
+        }
+
+        return substr($currentClass, 0, -strlen($suffix));
     }
 
     /**