Resolve conflict

Author: phoenix128

lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php

@@ -102,21 +102,35 @@ protected function _getMethodInfo(\ReflectionMethod $method)
             $parameters[] = $this->_getMethodParameterInfo($parameter);
         }
 
-        // Void methods must not use the return statement with any value
-        $return = ((string) $method->getReturnType() === 'void') ? '' : 'return ';
+        $returnType = $method->getReturnType();
+        $returnTypeValue = $returnType
+            ? ($returnType->allowsNull() ? '?' : '') . $returnType->getName()
+            : null;
 
         $methodInfo = [
             'name' => ($method->returnsReference() ? '& ' : '') . $method->getName(),
             'parameters' => $parameters,
-            'body' => "\$pluginInfo = \$this->pluginList->getNext(\$this->subjectType, '{$method->getName()}');\n" .
-                "if (!\$pluginInfo) {\n" .
-                "    {$return}parent::{$method->getName()}({$this->_getParameterList(
-                $parameters
-            )});\n" .
-                "} else {\n" .
-                "    {$return}\$this->___callPlugins('{$method->getName()}', func_get_args(), \$pluginInfo);\n" .
-                "}",
-            'returnType' => $method->getReturnType(),
+            'body' => str_replace(
+                [
+                    '%methodName%',
+                    '%return%',
+                    '%parameters%'
+                ],
+                [
+                    $method->getName(),
+                    $returnTypeValue === 'void' ? '' : ' return',
+                    $this->_getParameterList($parameters)
+                ],
+                <<<'METHOD_BODY'
+$pluginInfo = $this->pluginList->getNext($this->subjectType, '%methodName%');
+if (!$pluginInfo) {
+   %return% parent::%methodName%(%parameters%);
+} else {
+   %return% $this->___callPlugins('%methodName%', func_get_args(), $pluginInfo);
+}
+METHOD_BODY
+            ),
+            'returnType' => $returnTypeValue,
             'docblock' => ['shortDescription' => '{@inheritdoc}'],
         ];