Merge branch 'patch-1' of https://github.com/Mikulas/PHP_CodeSniffer

squizlabs · Apr 30, 2014 · a9fa8c1 · a9fa8c1
2 parents ee165e7 + da2b1fa
commit a9fa8c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php b/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -69,6 +69,7 @@ protected function processVariable(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                             '_COOKIE',
                             '_FILES',
                             'GLOBALS',
+                            'http_response_header'
                            );
 
         // If it's a php reserved var, then its ok.

diff --git a/CodeSniffer/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php b/CodeSniffer/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php
@@ -69,6 +69,7 @@ protected function processVariable(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                             '_COOKIE',
                             '_FILES',
                             'GLOBALS',
+                            'http_response_header'
                            );
 
         // If it's a php reserved var, then its ok.