diff --git a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php index a67304d7986091e03aa4201b2ad513ea533a805c..d5f4e782fc93fb6aacf5df05f01bf099eda5d599 100644 --- a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php +++ b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php @@ -286,4 +286,32 @@ class ObjectManagerFactory } return $configData; } + + /** + * Crete plugin list object + * + * @param \Magento\Framework\ObjectManagerInterface $objectManager + * @param \Magento\Framework\ObjectManager\RelationsInterface $relations + * @param \Magento\Framework\ObjectManager\DefinitionFactory $definitionFactory + * @param \Magento\Framework\ObjectManager\Config\Config $diConfig + * @param \Magento\Framework\ObjectManager\DefinitionInterface $definitions + * @return \Magento\Framework\Interception\PluginList\PluginList + */ + protected function _createPluginList( + \Magento\Framework\ObjectManagerInterface $objectManager, + \Magento\Framework\ObjectManager\RelationsInterface $relations, + \Magento\Framework\ObjectManager\DefinitionFactory $definitionFactory, + \Magento\Framework\ObjectManager\Config\Config $diConfig, + \Magento\Framework\ObjectManager\DefinitionInterface $definitions + ) { + return $objectManager->create( + \Magento\Framework\Interception\PluginList\PluginList::class, + [ + 'relations' => $relations, + 'definitions' => $definitionFactory->createPluginDefinition(), + 'omConfig' => $diConfig, + 'classDefinitions' => null + ] + ); + } } diff --git a/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php b/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php index 79d398e3da0792d38f20337cefc3ba1113b56cd4..29431b570bc6416e2f180ab86efb37be292be893 100644 --- a/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php +++ b/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php @@ -36,11 +36,6 @@ class DefinitionFactory */ protected $codeGenerator; - /** - * @var SerializerInterface - */ - private $serializer; - /** * @param DriverInterface $filesystemDriver * @param string $generationDir diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/DefinitionFactoryTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/DefinitionFactoryTest.php index 99db458c11953e32837b795bf5f2f710a4617c8c..8c587cec4351ce1156f4043af8d16e7d827895d4 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/DefinitionFactoryTest.php +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/DefinitionFactoryTest.php @@ -26,7 +26,6 @@ class DefinitionFactoryTest extends \PHPUnit_Framework_TestCase protected function setUp() { $this->filesystemDriverMock = $this->getMock(File::class); - $this->serializerMock = $this->getMock(SerializerInterface::class); $this->definitionFactory = new DefinitionFactory( $this->filesystemDriverMock, 'generation dir'