Fixed previous fix

squizlabs · Nov 6, 2012 · 7083624 · 7083624
1 parent 1e440ab
commit 7083624
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CodeSniffer/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php b/CodeSniffer/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php
@@ -82,7 +82,8 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             return;
         }
 
-        foreach ($properties as $key => $value) {
+        $allProperties = $properties + $this->properties;
+        foreach ($allProperties as $key => $value) {
             if (isset($properties[$key]) === true
                 && isset($this->properties[$key]) === false
             ) {

diff --git a/package.xml b/package.xml
@@ -33,6 +33,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Squiz SelfMemberReferenceSniff now supports namespaces
     -- Thanks to Andy Grunwald for the patch
   - Fixed bug #19691 : SubversionPropertiesSniff fails to find missing properties
+    -- Thanks to Kevin Winahradsky for the patch
  </notes>
  <contents>
   <dir name="/">