Fixed bug squizlabs#2348 : Cache not invalidated when changing a rule…

…set included by another
Billz95 · Jan 21, 2019 · e8eb10d · e8eb10d
1 parent cbe9b4e
commit e8eb10d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/package.xml b/package.xml
@@ -75,6 +75,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Zend.Files.ClosingTag no longer adds a semi-colon during fixing of a file that only contains a comment
     -- Thanks to Juliette Reinders Folmer for the patch
   - Fixed bug #2337 : Generic.WhiteSpace.ScopeIndent incorrect error when multi-line function call starts on same line as open tag
+  - Fixed bug #2348 : Cache not invalidated when changing a ruleset included by another
  </notes>
  <contents>
   <dir name="/">

diff --git a/src/Ruleset.php b/src/Ruleset.php
@@ -161,8 +161,7 @@ public function __construct(Config $config)
                     $this->name .= ', ';
                 }
 
-                $this->name   .= $standardName;
-                $this->paths[] = $standard;
+                $this->name .= $standardName;
 
                 // Allow autoloading of custom files inside this standard.
                 if (isset($ruleset['namespace']) === true) {
@@ -334,6 +333,7 @@ public function processRuleset($rulesetPath, $depth=0)
         $includedSniffs = [];
         $excludedSniffs = [];
 
+        $this->paths[]       = $rulesetPath;
         $rulesetDir          = dirname($rulesetPath);
         $this->rulesetDirs[] = $rulesetDir;