Skip to content

Make it possible to exclude classes (directories) for compilation #986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 27, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,21 @@

class ClassesScanner
{
/**
* @var array
*/
protected $excludePatterns = [];

/**
* adds exclude patterns
*
* @param array $excludePatterns
*/
public function addExcludePatterns(array $excludePatterns)
{
$this->excludePatterns = array_merge($this->excludePatterns, $excludePatterns);
}

/**
* Retrieves list of classes for given path
*
Expand Down Expand Up @@ -37,6 +52,11 @@ public function getList($path)
if ($fileItem->getExtension() !== 'php') {
continue;
}
foreach ($this->excludePatterns as $excludePattern) {
if (preg_match($excludePattern, $fileItem->getRealPath())) {
continue 2;
}
}
$fileScanner = new FileScanner($fileItem->getRealPath());
$classNames = $fileScanner->getClassNames();
foreach ($classNames as $className) {
Expand Down
12 changes: 10 additions & 2 deletions dev/tools/Magento/Tools/Di/Code/Scanner/DirectoryScanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ class DirectoryScanner
*
* @param string $dir
* @param array $patterns
* @param string[] $excludePatterns
* @return array
*/
public function scan($dir, array $patterns = [])
public function scan($dir, array $patterns = [], array $excludePatterns = [])
{
$recursiveIterator = new \RecursiveIteratorIterator(
new \RecursiveDirectoryIterator($dir, \FilesystemIterator::FOLLOW_SYMLINKS)
Expand All @@ -26,8 +27,15 @@ public function scan($dir, array $patterns = [])
continue;
}

$filePath = str_replace('\\', '/', $file->getRealPath());
if (!empty($excludePatterns)) {
foreach ($excludePatterns as $excludePattern) {
if (preg_match($excludePattern, $filePath)) {
continue 2;
}
}
}
foreach ($patterns as $type => $pattern) {
$filePath = str_replace('\\', '/', $file->getRealPath());
if (preg_match($pattern, $filePath)) {
$output[$type][] = $filePath;
break;
Expand Down
9 changes: 7 additions & 2 deletions dev/tools/Magento/Tools/Di/compiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,15 @@
'extra-classes-file=s' => 'path to file with extra proxies and factories to generate',
'generation=s' => 'absolute path to generated classes, <magento_root>/var/generation by default',
'di=s' => 'absolute path to DI definitions directory, <magento_root>/var/di by default',
'exclude-pattern=s' => 'allows to exclude Paths from compilation (default is #[\\\\/]m1[\\\\/]#i)',
]
);
$opt->parse();

$generationDir = $opt->getOption('generation') ? $opt->getOption('generation') : $rootDir . '/var/generation';
$diDir = $opt->getOption('di') ? $opt->getOption('di') : $rootDir . '/var/di';
$fileExcludePatterns = $opt->getOption('exclude-pattern') ?
[$opt->getOption('exclude-pattern')] : ['#[\\\\/]M1[\\\\/]#i'];
$relationsFile = $diDir . '/relations.ser';
$pluginDefFile = $diDir . '/plugins.ser';

Expand All @@ -60,7 +63,7 @@
$filePatterns = ['php' => '/.*\.php$/', 'di' => '/\/etc\/([a-zA-Z_]*\/di|di)\.xml$/'];
$codeScanDir = realpath($rootDir . '/app');
$directoryScanner = new Scanner\DirectoryScanner();
$files = $directoryScanner->scan($codeScanDir, $filePatterns);
$files = $directoryScanner->scan($codeScanDir, $filePatterns, $fileExcludePatterns);
$files['additional'] = [$opt->getOption('extra-classes-file')];
$entities = [];

Expand Down Expand Up @@ -144,11 +147,13 @@
$validator = new \Magento\Framework\Code\Validator();
$validator->add(new \Magento\Framework\Code\Validator\ConstructorIntegrity());
$validator->add(new \Magento\Framework\Code\Validator\ContextAggregation());
$classesScanner = new \Magento\Tools\Di\Code\Reader\ClassesScanner();
$classesScanner->addExcludePatterns($fileExcludePatterns);

$directoryInstancesNamesList = new \Magento\Tools\Di\Code\Reader\InstancesNamesList\Directory(
$log,
new \Magento\Framework\Code\Reader\ClassReader(),
new \Magento\Tools\Di\Code\Reader\ClassesScanner(),
$classesScanner,
$validator,
$generationDir
);
Expand Down