From: Fabien Potencier Date: Wed, 15 Dec 2010 12:32:39 +0000 (+0100) Subject: removed the possibility to inject a lexer/parser/compiler in the environment constructor X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=211b61c919b9125a0ccc75809608461bb5112704;p=web%2Fkonrad%2Ftwig.git removed the possibility to inject a lexer/parser/compiler in the environment constructor --- diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index 4de0a99..6de6539 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -66,28 +66,13 @@ class Twig_Environment * * @param Twig_LoaderInterface $loader A Twig_LoaderInterface instance * @param array $options An array of options - * @param Twig_LexerInterface $lexer A Twig_LexerInterface instance - * @param Twig_ParserInterface $parser A Twig_ParserInterface instance - * @param Twig_CompilerInterface $compiler A Twig_CompilerInterface instance */ - public function __construct(Twig_LoaderInterface $loader = null, $options = array(), Twig_LexerInterface $lexer = null, Twig_ParserInterface $parser = null, Twig_CompilerInterface $compiler = null) + public function __construct(Twig_LoaderInterface $loader = null, $options = array()) { if (null !== $loader) { $this->setLoader($loader); } - if (null !== $lexer) { - $this->setLexer($lexer); - } - - if (null !== $parser) { - $this->setParser($parser); - } - - if (null !== $compiler) { - $this->setCompiler($compiler); - } - $options = array_merge(array( 'debug' => false, 'charset' => 'UTF-8',