Merge pull request #271 from Padam87/fix-isfresh

Fixed ServiceFilesResource pattern finder
schmittjoh · May 31, 2017 · bd261ce · bd261ce
2 parents 21a2f9b + 9f6dad1
commit bd261ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Config/ServiceFilesResource.php b/Config/ServiceFilesResource.php
@@ -27,17 +27,19 @@ class ServiceFilesResource extends InternalResource
     private $files;
     private $dirs;
     private $disableGrep;
+    private $pattern;
 
-    public function __construct(array $files, array $dirs, $disableGrep)
+    public function __construct(array $files, array $dirs, $disableGrep, $pattern = 'JMS\DiExtraBundle\Annotation')
     {
         $this->files = $files;
         $this->dirs = $dirs;
         $this->disableGrep = $disableGrep;
+        $this->pattern = $pattern;
     }
 
     public function isFresh($timestamp)
     {
-        $finder = new PatternFinder('JMS\DiExtraBundle\Annotation', '*.php', $this->disableGrep);
+        $finder = new PatternFinder($this->pattern, '*.php', $this->disableGrep);
         $files = $finder->findFiles($this->dirs);
 
         return !array_diff($files, $this->files) && !array_diff($this->files, $files);

diff --git a/DependencyInjection/Compiler/AnnotationConfigurationPass.php b/DependencyInjection/Compiler/AnnotationConfigurationPass.php
@@ -93,7 +93,7 @@ private function handlePattern(ContainerBuilder $container, $directories, $patte
     {
         $finder = new PatternFinder($pattern, '*.php', $disableGrep);
         $files = $finder->findFiles($directories);
-        $container->addResource(new ServiceFilesResource($files, $directories, $disableGrep));
+        $container->addResource(new ServiceFilesResource($files, $directories, $disableGrep, $pattern));
         foreach ($files as $file) {
             $container->addResource(new FileResource($file));
             require_once $file;