Optimized sfCompileConfigHandler and added unit tests

Author: jeromemacias

lib/config/sfCompileConfigHandler.class.php

@@ -48,56 +48,32 @@ public function execute($configFiles)
         throw new sfParseException(sprintf('Configuration file "%s" specifies nonexistent or unreadable file "%s".', $configFiles[0], $file));
       }
 
-      $contents = file_get_contents($file);
+      if (sfConfig::get('sf_debug'))
+      {
+        $contents = file_get_contents($file);
 
-      // strip comments (not in debug mode)
-      if (!sfConfig::get('sf_debug'))
+        // replace windows and mac format with unix format
+        $contents = str_replace("\r", PHP_EOL, $contents);
+      }
+      else
       {
-        $contents = sfToolkit::stripComments($contents);
+        // strip whitespaces and comments
+        $contents = php_strip_whitespace($file);
       }
 
-      // insert configuration files
-/*      $contents = preg_replace_callback(array('#(require|include)(_once)?\((sfContext::getInstance\(\)\->getConfigCache\(\)|\$configCache)->checkConfig\(\'config/([^\']+)\'\)\);#m',
-                                          '#()()(sfContext::getInstance\(\)\->getConfigCache\(\)|\$configCache)->import\(\'config/([^\']+)\'(, false)?\);#m'),
-                                        array($this, 'insertConfigFileCallback'), $contents);
-*/
       // strip php tags
-      $contents = sfToolkit::pregtr($contents, array('/^\s*<\?(php)?/m' => '',
-                                                     '/^\s*\?>/m'       => ''));
-
-      // replace windows and mac format with unix format
-      $contents = str_replace("\r", "\n", $contents);
-
-      // replace multiple new lines with a single newline
-      $contents = preg_replace(array('/\s+$/Sm', '/\n+/S'), "\n", $contents);
+      $contents = sfToolkit::pregtr($contents, array('/^\s*<\?(php)?/m' => '', '/^\s*\?>/m' => ''));
 
       // append file data
-      $data .= "\n".$contents;
+      $data .= PHP_EOL.$contents;
     }
 
     // compile data
-    $retval = sprintf("<?php\n".
-                      "// auto-generated by sfCompileConfigHandler\n".
-                      "// date: %s\n%s\n",
+    return sprintf('<?php'.PHP_EOL.
+                      '// auto-generated by sfCompileConfigHandler'.PHP_EOL.
+                      '// date: %s'.PHP_EOL.
+                      '%s'.PHP_EOL,
                       date('Y/m/d H:i:s'), $data);
-
-    return $retval;
-  }
-
-  /**
-   * Callback for configuration file insertion in the cache.
-   *
-   */
-  protected function insertConfigFileCallback($matches)
-  {
-    $configFile = 'config/'.$matches[4];
-
-    $configCache = sfContext::getInstance()->getConfigCache();
-    $configCache->checkConfig($configFile);
-
-    $config = "// '$configFile' config file\n".file_get_contents($configCache->getCacheName($configFile));
-
-    return $config;
   }
 
   /**

test/unit/config/fixtures/sfCompileConfigHandler/simple.yml

@@ -0,0 +1 @@
+- %SF_SYMFONY_LIB_DIR%/util/sfInflector.class.php

test/unit/config/sfCompileConfigHandlerTest.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+
+$t = new lime_test(2);
+
+$handler = new sfCompileConfigHandler();
+$handler->initialize();
+
+$dir = dirname(__FILE__).DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfCompileConfigHandler'.DIRECTORY_SEPARATOR;
+
+$t->diag('execute');
+
+sfConfig::set('sf_debug', true);
+$data = $handler->execute(array($dir.'simple.yml'));
+$t->ok(false !== strpos($data, 'class sfInflector'.PHP_EOL.'{'.PHP_EOL.'  /**'), '->execute() return complete classe codes');
+
+sfConfig::set('sf_debug', false);
+$data = $handler->execute(array($dir.'simple.yml'));
+$t->ok(false !== strpos($data, 'class sfInflector { public'), '->execute() return minified classe codes');