From: Fabien Potencier Date: Tue, 14 May 2013 07:20:57 +0000 (+0200) Subject: removed unneeded code X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=4e6ad3b568a6b57b04ecd8f2679d0188b6b838bb;p=web%2Fkonrad%2Ftwig.git removed unneeded code --- diff --git a/lib/Twig/Filter.php b/lib/Twig/Filter.php index 1891788..5cfbb66 100644 --- a/lib/Twig/Filter.php +++ b/lib/Twig/Filter.php @@ -62,8 +62,6 @@ abstract class Twig_Filter implements Twig_FilterInterface, Twig_FilterCallableI if (isset($this->options['is_safe_callback'])) { return call_user_func($this->options['is_safe_callback'], $filterArgs); } - - return null; } public function getPreservesSafety() diff --git a/lib/Twig/NodeVisitor/SafeAnalysis.php b/lib/Twig/NodeVisitor/SafeAnalysis.php index 7dc65c0..c4bbd81 100644 --- a/lib/Twig/NodeVisitor/SafeAnalysis.php +++ b/lib/Twig/NodeVisitor/SafeAnalysis.php @@ -20,8 +20,6 @@ class Twig_NodeVisitor_SafeAnalysis implements Twig_NodeVisitorInterface } } } - - return null; } protected function setSafe(Twig_NodeInterface $node, array $safe) diff --git a/lib/Twig/SimpleFilter.php b/lib/Twig/SimpleFilter.php index a6bf60f..d35c563 100644 --- a/lib/Twig/SimpleFilter.php +++ b/lib/Twig/SimpleFilter.php @@ -80,8 +80,6 @@ class Twig_SimpleFilter if (null !== $this->options['is_safe_callback']) { return call_user_func($this->options['is_safe_callback'], $filterArgs); } - - return null; } public function getPreservesSafety() diff --git a/lib/Twig/TokenParser/Extends.php b/lib/Twig/TokenParser/Extends.php index 110bc8b..f5ecee2 100644 --- a/lib/Twig/TokenParser/Extends.php +++ b/lib/Twig/TokenParser/Extends.php @@ -38,8 +38,6 @@ class Twig_TokenParser_Extends extends Twig_TokenParser $this->parser->setParent($this->parser->getExpressionParser()->parseExpression()); $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - return null; } /** diff --git a/lib/Twig/TokenParser/Macro.php b/lib/Twig/TokenParser/Macro.php index c2a0336..82b4fa6 100644 --- a/lib/Twig/TokenParser/Macro.php +++ b/lib/Twig/TokenParser/Macro.php @@ -49,8 +49,6 @@ class Twig_TokenParser_Macro extends Twig_TokenParser $stream->expect(Twig_Token::BLOCK_END_TYPE); $this->parser->setMacro($name, new Twig_Node_Macro($name, new Twig_Node_Body(array($body)), $arguments, $lineno, $this->getTag())); - - return null; } public function decideBlockEnd(Twig_Token $token) diff --git a/lib/Twig/TokenParser/Use.php b/lib/Twig/TokenParser/Use.php index 85f084a..bc0e09e 100644 --- a/lib/Twig/TokenParser/Use.php +++ b/lib/Twig/TokenParser/Use.php @@ -68,8 +68,6 @@ class Twig_TokenParser_Use extends Twig_TokenParser $stream->expect(Twig_Token::BLOCK_END_TYPE); $this->parser->addTrait(new Twig_Node(array('template' => $template, 'targets' => new Twig_Node($targets)))); - - return null; } /** diff --git a/lib/Twig/TokenParserBroker.php b/lib/Twig/TokenParserBroker.php index 9518c7c..ec3fba6 100644 --- a/lib/Twig/TokenParserBroker.php +++ b/lib/Twig/TokenParserBroker.php @@ -111,8 +111,6 @@ class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface } $broker = prev($this->brokers); } - - return null; } public function getParsers()