Skip to content

Commit

Permalink
MAGETWO-47639: [Github] Not all files are pre-compiled #2888
Browse files Browse the repository at this point in the history
- Fixed static test failures
  • Loading branch information
Joan He committed Jan 13, 2016
1 parent b55284e commit 6104326
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
12 changes: 2 additions & 10 deletions setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 6104326

Please sign in to comment.