diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php index 963ae19576ac1..b9dbc3aebbda2 100644 --- a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php +++ b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php @@ -161,15 +161,9 @@ protected function execute(InputInterface $input, OutputInterface $output) 'application' => $excludedModulePaths, 'framework' => $excludedLibraryPaths ]; - $dataAttributesIncludePattern = [ - 'extension_attributes' => '/\/etc\/([a-zA-Z_]*\/extension_attributes|extension_attributes)\.xml$/' - ]; $this->configureObjectManager($output); - $operations = $this->getOperationsConfiguration( - $compiledPathsList, - $dataAttributesIncludePattern - ); + $operations = $this->getOperationsConfiguration($compiledPathsList); try { $this->cleanupFilesystem( @@ -286,12 +280,10 @@ private function configureObjectManager(OutputInterface $output) * Returns operations configuration * * @param array $compiledPathsList - * @param array $dataAttributesIncludePattern * @return array */ private function getOperationsConfiguration( - array $compiledPathsList, - array $dataAttributesIncludePattern + array $compiledPathsList ) { $excludePatterns = []; foreach ($this->excludedPathsList as $excludedPaths) { diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/ProxyGeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/ProxyGeneratorTest.php index ac0ecfc74dbf7..1a1382b87a65d 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/ProxyGeneratorTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/ProxyGeneratorTest.php @@ -33,8 +33,9 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); - $this->configurationScannerMock = $this->getMockBuilder('Magento\Setup\Module\Di\Code\Scanner\ConfigurationScanner') - ->disableOriginalConstructor() + $this->configurationScannerMock = $this->getMockBuilder( + 'Magento\Setup\Module\Di\Code\Scanner\ConfigurationScanner' + )->disableOriginalConstructor() ->getMock(); $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);