Include patterns are now evaluated as OR instead of AND (ref #2177)

Author: gsherwood

package.xml

@@ -26,6 +26,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license uri="https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt">BSD 3-Clause License</license>
  <notes>
+  - Rule include patterns in a ruleset.xml file are not evaluated as OR instead of AND
+    -- Previously, a file had to match every include pattern and no exclude patterns to be included
+    -- Now, a file must match at least one include pattern and no exclude patterns to be included
+    -- This is a bug fix as include patterns are already documented to work this way
   - New token T_BITWISE_NOT added for the bitwise not operator
     -- This token was previously tokenized as T_NONE
     -- Any sniffs specifically looking for T_NONE tokens with a tilde as the contents must now also look for T_BITWISE_NOT

src/Files/File.php

@@ -970,6 +970,7 @@ protected function addMessage($error, $message, $line, $column, $code, $data, $s
         }
 
         // Make sure we are not ignoring this file.
+        $included = null;
         foreach ($checkCodes as $checkCode) {
             $patterns = null;
 
@@ -1002,16 +1003,34 @@ protected function addMessage($error, $message, $line, $column, $code, $data, $s
 
                 $pattern = '`'.strtr($pattern, $replacements).'`i';
                 $matched = preg_match($pattern, $this->path);
-                if (($matched === 1 && $excluding === true)
-                    || ($matched === 0 && $excluding === false)
-                ) {
-                    // This file path is being excluded, or not included.
+
+                if ($matched === 0) {
+                    if ($excluding === false && $included === null) {
+                        // This file path is not being included.
+                        $included = false;
+                    }
+
+                    continue;
+                }
+
+                if ($excluding === true) {
+                    // This file path is being excluded.
                     $this->ignoredCodes[$checkCode] = true;
                     return false;
                 }
+
+                // This file path is being included.
+                $included = true;
+                break;
             }//end foreach
         }//end foreach
 
+        if ($included === false) {
+            // There were include rules set, but this file
+            // path didn't match any of them.
+            return false;
+        }
+
         $messageCount++;
         if ($fixable === true) {
             $this->fixableCount++;