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

DianaRusin · DianaRusin · commit f905e5f60207 · 2020-03-31T13:24:08.000+03:00
diff --git a/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php b/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php
@@ -67,14 +67,13 @@ protected function _set($key, $value)
      */
     protected function _getDataObjectType()
     {
-        $currentClass = get_class($this);
-        $suffix = 'Builder';
-        $interceptorSuffix = '\Interceptor';
-        if (false !== strpos($currentClass, $interceptorSuffix, -strlen($interceptorSuffix))) {
-            $suffix .= $interceptorSuffix;
+        $dataObjectType = '';
+        $pattern = '/(?<data_object>.*?)Builder(\\Interceptor)?/';
+        if (preg_match($pattern, get_class($this), $match)) {
+            $dataObjectType = $match['data_object'];
         }
 
-        return substr($currentClass, 0, -strlen($suffix));
+        return $dataObjectType;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -67,14 +67,13 @@ protected function _set($key, $value)`
`67`	`67`	`*/`
`68`	`68`	`protected function _getDataObjectType()`
`69`	`69`	`{`
`70`		`- $currentClass = get_class($this);`
`71`		`- $suffix = 'Builder';`
`72`		`- $interceptorSuffix = '\Interceptor';`
`73`		`- if (false !== strpos($currentClass, $interceptorSuffix, -strlen($interceptorSuffix))) {`
`74`		`- $suffix .= $interceptorSuffix;`
	`70`	`+ $dataObjectType = '';`
	`71`	`+ $pattern = '/(?<data_object>.*?)Builder(\\Interceptor)?/';`
	`72`	`+ if (preg_match($pattern, get_class($this), $match)) {`
	`73`	`+ $dataObjectType = $match['data_object'];`
`75`	`74`	`}`
`76`	`75`
`77`		`- return substr($currentClass, 0, -strlen($suffix));`
	`76`	`+ return $dataObjectType;`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`/**`