Merge pull request #99 from MarvinKlemp/fix/ruleset_generation

Fixed performance issue concerning the ComposerLoader

Author: MarvinKlemp

src/DetectorFactory.php

@@ -100,14 +100,10 @@ public function create(Configuration $configuration, OutputInterface $output)
             'Deprecation detection'
         );
         $deprecationUsageParser = $this->getUsageParser($configuration);
-        $deprecationUsageFinder = new ParsedPhpFileFinder(
+        $deprecationUsageFinder = ParsedPhpFileFinder::usageFinder(
             $deprecationUsageParser,
             $deprecationProgressOutput
         );
-        $deprecationUsageFinder
-            ->exclude('vendor')
-            ->exclude('Tests')
-            ->exclude('Test');
 
         $this->ancestorResolver = new AncestorResolver($deprecationUsageParser);
 
@@ -117,15 +113,10 @@ public function create(Configuration $configuration, OutputInterface $output)
             'RuleSet generation'
         );
         $ruleSetDeprecationParser = $this->getDeprecationParser();
-        $ruleSetDeprecationFinder = new ParsedPhpFileFinder(
+        $ruleSetDeprecationFinder = ParsedPhpFileFinder::deprecationFinder(
             $ruleSetDeprecationParser,
             $ruleSetProgressOutput
         );
-        $ruleSetDeprecationFinder
-            ->contains('@deprecated')
-            ->exclude('vendor')
-            ->exclude('Tests')
-            ->exclude('Test');
         $deprecationDirectoryTraverser = new DirectoryTraverser($ruleSetDeprecationFinder);
 
         $violationDetector = $this->getViolationDetector($configuration);

src/Finder/ParsedPhpFileFinder.php

@@ -85,4 +85,54 @@ public function getParserErrors()
     {
         return $this->parserErrors;
     }
+
+    /**
+     * @param ParserInterface $parser
+     * @param VerboseProgressOutput $progressOutput
+     * @return ParsedPhpFileFinder
+     */
+    public static function deprecationFinder(ParserInterface $parser, VerboseProgressOutput $progressOutput)
+    {
+        $finder = new ParsedPhpFileFinder($parser, $progressOutput);
+        $finder
+            ->contains('@deprecated')
+            ->exclude('vendor')
+            ->exclude('Tests')
+            ->exclude('Test');
+
+        return $finder;
+
+    }
+
+    /**
+     * @param ParserInterface $parser
+     * @param VerboseProgressOutput $progressOutput
+     * @return ParsedPhpFileFinder
+     */
+    public static function usageFinder(ParserInterface $parser, VerboseProgressOutput $progressOutput)
+    {
+        $finder = new ParsedPhpFileFinder($parser, $progressOutput);
+        $finder
+            ->exclude('vendor')
+            ->exclude('Tests')
+            ->exclude('Test');
+
+        return $finder;
+    }
+
+    /**
+     * @return ParserInterface
+     */
+    public function getParser()
+    {
+        return $this->parser;
+    }
+
+    /**
+     * @return VerboseProgressOutput
+     */
+    public function getOutput()
+    {
+        return $this->progressOutput;
+    }
 }

src/RuleSet/DirectoryTraverser.php

@@ -48,4 +48,12 @@ public function traverse($path, RuleSet $ruleSet = null)
 
         return $ruleSet;
     }
+
+    public function reset()
+    {
+        $this->finder = ParsedPhpFileFinder::deprecationFinder(
+            $this->finder->getParser(),
+            $this->finder->getOutput()
+        );
+    }
 }

src/RuleSet/Loader/Composer/ComposerLoader.php

@@ -73,6 +73,7 @@ private function loadPackageRuleSet(Package $package)
         if ($this->cache->has($key)) {
             $ruleSet = $this->cache->getCachedRuleSet($key);
         } elseif (is_dir($path = $package->getPackagePath(self::PACKAGE_PATH))) {
+            $this->traverser->reset();
             $ruleSet = $this->traverser->traverse($path);
             $this->cache->cacheRuleSet($key, $ruleSet);
         } else {

tests/RuleSet/Loader/Composer/ComposerLoaderTest.php

@@ -85,6 +85,7 @@ public function testLoadRuleSet()
 
         $traverser = $this->prophesize('SensioLabs\DeprecationDetector\RuleSet\DirectoryTraverser');
         $traverser->traverse(vfsStream::url('root/vendor/avendor/anotherlib'))->willReturn($aVendorAnotherLibRuleSet);
+        $traverser->reset()->shouldBeCalled();
         $cache->cacheRuleSet('vendor_anotherlib_1.0.0', $aVendorAnotherLibRuleSet)->shouldBeCalled();
 
         $factory = $this->prophesize('SensioLabs\DeprecationDetector\RuleSet\Loader\Composer\ComposerFactory');