refactored loaders (closes #38)

git-svn-id: http://svn.twig-project.org/trunk@142 93ef8e89-cb99-4229-a87c-7fa0fa45744b
This commit is contained in:
fabien
2009-11-16 15:01:52 +00:00
parent 96834d2272
commit d3ee1165fe
19 changed files with 236 additions and 258 deletions
+4 -7
View File
@@ -15,8 +15,6 @@ LimeAutoloader::register();
require_once dirname(__FILE__).'/../../lib/Twig/Autoloader.php';
Twig_Autoloader::register();
require_once dirname(__FILE__).'/../lib/Twig_Loader_Var.php';
class Foo
{
public function bar($param1 = null, $param2 = null)
@@ -52,20 +50,19 @@ foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($fixturesD
throw new InvalidArgumentException(sprintf('Test "%s" is not valid.', str_replace($fixturesDir.'/', '', $file)));
}
$prefix = rand(1, 999999999);
$message = $match[1];
$templates = array();
preg_match_all('/--TEMPLATE(?:\((.*?)\))?--(.*?)(?=\-\-TEMPLATE|$)/s', $match[2], $matches, PREG_SET_ORDER);
foreach ($matches as $match)
{
$templates[$prefix.'_'.($match[1] ? $match[1] : 'index.twig')] = $match[2];
$templates[($match[1] ? $match[1] : 'index.twig')] = $match[2];
}
$loader = new Twig_Loader_Var($templates, $prefix);
$twig = new Twig_Environment($loader, array('trim_blocks' => true));
$loader = new Twig_Loader_Array($templates);
$twig = new Twig_Environment($loader, array('trim_blocks' => true, 'cache' => false));
$twig->addExtension(new Twig_Extension_Escaper());
$template = $twig->loadTemplate($prefix.'_index.twig');
$template = $twig->loadTemplate('index.twig');
preg_match_all('/--DATA--(.*?)--EXPECT--(.*?)(?=\-\-DATA\-\-|$)/s', $test, $matches, PREG_SET_ORDER);
foreach ($matches as $match)