Config data is now cached in a global var so the file system is not hit so often. You can also set config data temporarily for the script if you are using your own external script.

git-svn-id: http://svn.php.net/repository/pear/packages/PHP_CodeSniffer/trunk@248462 c90b9560-bf6c-de11-be94-00142212c4b1

Author: gsherwood

CodeSniffer.php

@@ -1495,21 +1495,26 @@ public static function getConfigData($key)
      * @param string|null $value The value to set. If null, the config
      *                           entry is deleted, reverting it to the
      *                           default value.
+     * @param boolean     $temp  Set this config data temporarily for this
+     *                           script run. This will not write the config
+     *                           data to the config file.
      *
      * @return boolean
      * @see getConfigData()
      * @throws PHP_CodeSniffer_Exception If the config file can not be written.
      */
-    public static function setConfigData($key, $value)
+    public static function setConfigData($key, $value, $temp=false)
     {
-        $configFile = dirname(__FILE__).'/CodeSniffer.conf';
-        if (is_file($configFile) === false) {
-            $configFile = '@data_dir@/PHP_CodeSniffer/CodeSniffer.conf';
-        }
+        if ($temp === false) {
+            $configFile = dirname(__FILE__).'/CodeSniffer.conf';
+            if (is_file($configFile) === false) {
+                $configFile = '@data_dir@/PHP_CodeSniffer/CodeSniffer.conf';
+            }
 
-        if (is_file($configFile) === true && is_writable($configFile) === false) {
-            $error = "Config file $configFile is not writable";
-            throw new PHP_CodeSniffer_Exception($error);
+            if (is_file($configFile) === true && is_writable($configFile) === false) {
+                $error = "Config file $configFile is not writable";
+                throw new PHP_CodeSniffer_Exception($error);
+            }
         }
 
         $phpCodeSnifferConfig = self::getAllConfigData();
@@ -1522,14 +1527,18 @@ public static function setConfigData($key, $value)
             $phpCodeSnifferConfig[$key] = $value;
         }
 
-        $output  = '<'.'?php'."\n".' $phpCodeSnifferConfig = ';
-        $output .= var_export($phpCodeSnifferConfig, true);
-        $output .= "\n?".'>';
+        if ($temp === false) {
+            $output  = '<'.'?php'."\n".' $phpCodeSnifferConfig = ';
+            $output .= var_export($phpCodeSnifferConfig, true);
+            $output .= "\n?".'>';
 
-        if (file_put_contents($configFile, $output) === false) {
-            return false;
+            if (file_put_contents($configFile, $output) === false) {
+                return false;
+            }
         }
 
+        $GLOBALS['PHP_CODESNIFFER_CONFIG_DATA'] = $phpCodeSnifferConfig;
+
         return true;
 
     }//end setConfigData()
@@ -1543,6 +1552,10 @@ public static function setConfigData($key, $value)
      */
     public static function getAllConfigData()
     {
+        if (isset($GLOBALS['PHP_CODESNIFFER_CONFIG_DATA']) === true) {
+            return $GLOBALS['PHP_CODESNIFFER_CONFIG_DATA'];
+        }
+
         $configFile = dirname(__FILE__).'/CodeSniffer.conf';
         if (is_file($configFile) === false) {
             $configFile = '@data_dir@/PHP_CodeSniffer/CodeSniffer.conf';
@@ -1553,7 +1566,8 @@ public static function getAllConfigData()
         }
 
         include $configFile;
-        return $phpCodeSnifferConfig;
+        $GLOBALS['PHP_CODESNIFFER_CONFIG_DATA'] = $phpCodeSnifferConfig;
+        return $GLOBALS['PHP_CODESNIFFER_CONFIG_DATA'];
 
     }//end getAllConfigData()
 

package.xml

@@ -41,6 +41,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Other tokens (like T_FUNCTION) still stop after 3 lines for performance
   - You can now esacpe commas in ignore patterns so they can be matched in file names
     -- Thanks to Carsten Wiedmann for the patch
+  - Config data is now cached in a global var so the file system is not hit so often
+    -- You can also set config data temporarily for the script if you are using your own external script
+    -- Pass TRUE as the third argument to PHP_CodeSniffer::setConfigData()
   - PEAR ClassDeclarationSniff no longer throws errors for multi-line class declarations
   - Squiz ClassDeclarationSniff now ensures there is one blank line after a class closing brace
   - Squiz ClassDeclarationSniff now throws errors for a missing end PHP tag after the end class tag