Merge pull request #31 from alsar/twig2.0

Changed deprecated type hint Twig_NodeInterface to Twig_Node
gushphp · Jun 1, 2017 · 7d72427 · 7d72427
2 parents 9db8d47 + 6884597
commit 7d72427
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Twig/InlineCssNode.php b/Twig/InlineCssNode.php
@@ -13,11 +13,11 @@
 
 use Twig_Compiler;
 
-class InlineCssNode extends \Twig_Node 
+class InlineCssNode extends \Twig_Node
 {
     private $debug;
-    
-    public function __construct(\Twig_NodeInterface $body, $css, $lineno = 0, $debug, $tag = 'inlinecss')
+
+    public function __construct(\Twig_Node $body, $css, $lineno = 0, $debug, $tag = 'inlinecss')
     {
         $this->debug = $debug;
         parent::__construct(array('body' => $body), array('css' => $css), $lineno, $tag);

diff --git a/Twig/InlineCssParser.php b/Twig/InlineCssParser.php
@@ -13,10 +13,10 @@
 
 use Symfony\Component\Config\FileLocatorInterface;
 use Symfony\Component\Templating\TemplateNameParserInterface;
-use Twig_NodeInterface;
+use Twig_Node;
 use Twig_Token;
 
-class InlineCssParser extends \Twig_TokenParser 
+class InlineCssParser extends \Twig_TokenParser
 {
     /**
      * @var TemplateNameParserInterface
@@ -57,18 +57,18 @@ public function __construct(FileLocatorInterface $locator, TemplateNameParserInt
      *
      * @param Twig_Token $token A Twig_Token instance
      *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     * @return Twig_Node A Twig_Node instance
      */
     public function parse(Twig_Token $token)
     {
         $lineNo = $token->getLine();
-        $stream = $this->parser->getStream(); 
+        $stream = $this->parser->getStream();
         $path = $stream->expect(Twig_Token::STRING_TYPE)->getValue();
         $stream->expect(Twig_Token::BLOCK_END_TYPE);
         $body = $this->parser->subparse(array($this, 'decideEnd'), true);
         $stream->expect(Twig_Token::BLOCK_END_TYPE);
 
-        return new InlineCssNode($body, $this->resolvePath($path), $lineNo, $this->debug); 
+        return new InlineCssNode($body, $this->resolvePath($path), $lineNo, $this->debug);
     }
 
     /**
@@ -80,7 +80,7 @@ public function getTag()
     {
         return 'inlinecss';
     }
-    
+
     public function decideEnd(Twig_Token $token)
     {
         return $token->test('endinlinecss');