Merge remote-tracking branch 'techdivision/MC-24726' into trigger-pr-1

Author: krissyhiserote

lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php

@@ -58,8 +58,8 @@ public function setInterceptionConfig(\Magento\Framework\Interception\ConfigInte
     public function getInstanceType($instanceName)
     {
         $type = parent::getInstanceType($instanceName);
-        if ($this->interceptionConfig && $this->interceptionConfig->hasPlugins($instanceName)
-            && $this->interceptableValidator->validate($instanceName)
+        if ($this->interceptionConfig && $this->interceptionConfig->hasPlugins($type)
+            && $this->interceptableValidator->validate($type)
         ) {
             return $type . '\\Interceptor';
         }

lib/internal/Magento/Framework/Interception/Test/Unit/ObjectManager/Config/DeveloperTest.php

@@ -58,4 +58,23 @@ public function testGetOriginalInstanceTypeReturnsInterceptedClass()
         $this->assertEquals('SomeClass\Interceptor', $this->model->getInstanceType('SomeClass'));
         $this->assertEquals('SomeClass', $this->model->getOriginalInstanceType('SomeClass'));
     }
+
+    /**
+     * Test correct instance type is returned when plugins are created for virtual type parents
+     *
+     * @return void
+     */
+    public function testGetInstanceTypeWithPluginOnVirtualTypeParent() : void
+    {
+        $reflectionClass = new \ReflectionClass(get_class($this->model));
+        $reflectionProperty = $reflectionClass->getProperty('_virtualTypes');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($this->model, ['SomeVirtualClass' => 'SomeClass']);
+
+        $this->interceptionConfig->expects($this->once())->method('hasPlugins')->with('SomeClass')->willReturn(true);
+        $this->model->setInterceptionConfig($this->interceptionConfig);
+
+        $instanceType = $this->model->getInstanceType('SomeVirtualClass');
+        $this->assertEquals('SomeClass\Interceptor', $instanceType);
+    }
 }