Merge pull request #111 from magento-mpi/public-pulls

[Github] Merge public Github commits

Author: vpelipenko

dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php

@@ -10,13 +10,27 @@
 
 class ClassesScanner
 {
+    /**
+     * @var array
+     */
+    protected $excludePatterns = [];
+
+    /**
+     * Adds exclude patterns
+     *
+     * @param array $excludePatterns
+     * @return void
+     */
+    public function addExcludePatterns(array $excludePatterns)
+    {
+        $this->excludePatterns = array_merge($this->excludePatterns, $excludePatterns);
+    }
+
     /**
      * Retrieves list of classes for given path
      *
      * @param string $path
-     *
      * @return array
-     *
      * @throws FilesystemException
      */
     public function getList($path)
@@ -37,6 +51,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) {

dev/tools/Magento/Tools/Di/Code/Scanner/DirectoryScanner.php

@@ -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)
@@ -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;

dev/tools/Magento/Tools/Di/compiler.php

@@ -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';
 
@@ -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 = [];
 
@@ -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
     );

nginx.conf.sample

@@ -13,7 +13,7 @@
 #    listen 80;
 #    server_name mage.dev;
 #    set $MAGE_ROOT /var/www/magento2;
-#    set $MAGE_MODE develop;
+#    set $MAGE_MODE developer;
 #    include /vagrant/magento2/nginx.conf.sample;
 # }