Added test for #35572

Author: pmzandbergen

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/ProxyTest.php

@@ -15,6 +15,8 @@
 
 class ProxyTest extends TestCase
 {
+    private const MIXED_TYPE_PHP_VERSION = '8.0.0';
+
     /**
      * @var MockObject
      */
@@ -52,4 +54,36 @@ public function testGenerate()
         $model->expects($this->once())->method('_validateData')->willReturn(true);
         $this->assertEquals('sample_file.php', $model->generate());
     }
+
+    public function testGenerateMixedType()
+    {
+        if (version_compare(PHP_VERSION, self::MIXED_TYPE_PHP_VERSION) < 0) {
+            $this->markTestSkipped('This test requires at least PHP version ' . self::MIXED_TYPE_PHP_VERSION);
+        }
+
+        require_once __DIR__ . '/_files/SampleMixed.php';
+        $model = $this->getMockBuilder(Proxy::class)
+            ->setMethods(['_validateData'])
+            ->setConstructorArgs(
+                [
+                    \Magento\Framework\ObjectManager\Code\Generator\SampleMixed::class,
+                    null,
+                    $this->ioObjectMock,
+                    null,
+                    null,
+                    $this->createMock(FileResolver::class)
+                ]
+            )
+            ->getMock();
+        $sampleMixedProxyCode = file_get_contents(__DIR__ . '/_files/SampleMixedProxy.txt');
+
+        $this->ioObjectMock->expects($this->once())->method('generateResultFileName')
+            ->with('\\' . \Magento\Framework\ObjectManager\Code\Generator\SampleMixed_Proxy::class)
+            ->willReturn('sample_mixed_file.php');
+        $this->ioObjectMock->expects($this->once())->method('writeResultFile')
+            ->with('sample_mixed_file.php', $sampleMixedProxyCode);
+
+        $model->expects($this->once())->method('_validateData')->willReturn(true);
+        $this->assertEquals('sample_mixed_file.php', $model->generate());
+    }
 }

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleMixed.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\ObjectManager\Code\Generator;
+
+/**
+ * Class SampleMixed for Proxy and Factory generation with mixed type
+ */
+class SampleMixed
+{
+    /**
+     * @var mixed
+     */
+    protected mixed $mixed = null;
+
+    /**
+     * @param mixed $mixed
+     * @return void
+     */
+    public function setMixed(mixed $mixed = null): void
+    {
+        $this->mixed = $mixed;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getMixed(): mixed
+    {
+        return $this->mixed;
+    }
+}

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleMixedProxy.txt

@@ -0,0 +1,104 @@
+namespace Magento\Framework\ObjectManager\Code\Generator;
+
+/**
+ * Proxy class for @see \Magento\Framework\ObjectManager\Code\Generator\SampleMixed
+ */
+class SampleMixed_Proxy extends SampleMixed implements \Magento\Framework\ObjectManager\NoninterceptableInterface
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $_objectManager = null;
+
+    /**
+     * Proxied instance name
+     *
+     * @var string
+     */
+    protected $_instanceName = null;
+
+    /**
+     * Proxied instance
+     *
+     * @var \Magento\Framework\ObjectManager\Code\Generator\SampleMixed
+     */
+    protected $_subject = null;
+
+    /**
+     * Instance shareability flag
+     *
+     * @var bool
+     */
+    protected $_isShared = null;
+
+    /**
+     * Proxy constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     * @param bool $shared
+     */
+    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $instanceName = '\\Magento\\Framework\\ObjectManager\\Code\\Generator\\SampleMixed', $shared = true)
+    {
+        $this->_objectManager = $objectManager;
+        $this->_instanceName = $instanceName;
+        $this->_isShared = $shared;
+    }
+
+    /**
+     * @return array
+     */
+    public function __sleep()
+    {
+        return ['_subject', '_isShared', '_instanceName'];
+    }
+
+    /**
+     * Retrieve ObjectManager from global scope
+     */
+    public function __wakeup()
+    {
+        $this->_objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+    }
+
+    /**
+     * Clone proxied instance
+     */
+    public function __clone()
+    {
+        $this->_subject = clone $this->_getSubject();
+    }
+
+    /**
+     * Get proxied instance
+     *
+     * @return \Magento\Framework\ObjectManager\Code\Generator\SampleMixed
+     */
+    protected function _getSubject()
+    {
+        if (!$this->_subject) {
+            $this->_subject = true === $this->_isShared
+                ? $this->_objectManager->get($this->_instanceName)
+                : $this->_objectManager->create($this->_instanceName);
+        }
+        return $this->_subject;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setMixed(mixed $mixed = null) : void
+    {
+        $this->_getSubject()->setMixed($mixed);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMixed() : mixed
+    {
+        return $this->_getSubject()->getMixed();
+    }
+}