Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[TwigBundle] removed usage of HelperTokenParser for the js/css tags
- Loading branch information
Showing
9 changed files
with
374 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
<?php | ||
|
||
namespace Symfony\Bundle\TwigBundle\Node; | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) 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. | ||
*/ | ||
|
||
/** | ||
* Represents a javascript node. | ||
* | ||
* @author Fabien Potencier <fabien.potencier@symfony-project.com> | ||
*/ | ||
class JavascriptNode extends \Twig_Node | ||
{ | ||
public function __construct(\Twig_Node_Expression $expr, \Twig_Node_Expression $attributes, $lineno, $tag = null) | ||
{ | ||
parent::__construct(array('expr' => $expr, 'attributes' => $attributes), array(), $lineno, $tag); | ||
} | ||
|
||
/** | ||
* Compiles the node to PHP. | ||
* | ||
* @param \Twig_Compiler A Twig_Compiler instance | ||
*/ | ||
public function compile(\Twig_Compiler $compiler) | ||
{ | ||
$compiler | ||
->addDebugInfo($this) | ||
->write("echo \$this->env->getExtension('templating')->getContainer()->get('templating.helper.javascripts')->add(") | ||
->subcompile($this->getNode('expr')) | ||
->raw(', ') | ||
->subcompile($this->getNode('attributes')) | ||
->raw(");\n") | ||
; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
<?php | ||
|
||
namespace Symfony\Bundle\TwigBundle\Node; | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) 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. | ||
*/ | ||
|
||
/** | ||
* Represents a javascripts node. | ||
* | ||
* @author Fabien Potencier <fabien.potencier@symfony-project.com> | ||
*/ | ||
class JavascriptsNode extends \Twig_Node | ||
{ | ||
public function __construct($lineno, $tag = null) | ||
{ | ||
parent::__construct(array(), array(), $lineno, $tag); | ||
} | ||
|
||
/** | ||
* Compiles the node to PHP. | ||
* | ||
* @param \Twig_Compiler A Twig_Compiler instance | ||
*/ | ||
public function compile(\Twig_Compiler $compiler) | ||
{ | ||
$compiler | ||
->addDebugInfo($this) | ||
->write("echo \$this->env->getExtension('templating')->getContainer()->get('templating.helper.javascripts')->render();\n") | ||
; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
<?php | ||
|
||
namespace Symfony\Bundle\TwigBundle\Node; | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) 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. | ||
*/ | ||
|
||
/** | ||
* Represents a stylesheet node. | ||
* | ||
* @author Fabien Potencier <fabien.potencier@symfony-project.com> | ||
*/ | ||
class StylesheetNode extends \Twig_Node | ||
{ | ||
public function __construct(\Twig_Node_Expression $expr, \Twig_Node_Expression $attributes, $lineno, $tag = null) | ||
{ | ||
parent::__construct(array('expr' => $expr, 'attributes' => $attributes), array(), $lineno, $tag); | ||
} | ||
|
||
/** | ||
* Compiles the node to PHP. | ||
* | ||
* @param \Twig_Compiler A Twig_Compiler instance | ||
*/ | ||
public function compile(\Twig_Compiler $compiler) | ||
{ | ||
$compiler | ||
->addDebugInfo($this) | ||
->write("echo \$this->env->getExtension('templating')->getContainer()->get('templating.helper.stylesheets')->add(") | ||
->subcompile($this->getNode('expr')) | ||
->raw(', ') | ||
->subcompile($this->getNode('attributes')) | ||
->raw(");\n") | ||
; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
<?php | ||
|
||
namespace Symfony\Bundle\TwigBundle\Node; | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) 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. | ||
*/ | ||
|
||
/** | ||
* Represents a stylesheets node. | ||
* | ||
* @author Fabien Potencier <fabien.potencier@symfony-project.com> | ||
*/ | ||
class StylesheetsNode extends \Twig_Node | ||
{ | ||
public function __construct($lineno, $tag = null) | ||
{ | ||
parent::__construct(array(), array(), $lineno, $tag); | ||
} | ||
|
||
/** | ||
* Compiles the node to PHP. | ||
* | ||
* @param \Twig_Compiler A Twig_Compiler instance | ||
*/ | ||
public function compile(\Twig_Compiler $compiler) | ||
{ | ||
$compiler | ||
->addDebugInfo($this) | ||
->write("echo \$this->env->getExtension('templating')->getContainer()->get('templating.helper.stylesheets')->render();\n") | ||
; | ||
} | ||
} |
57 changes: 57 additions & 0 deletions
57
src/Symfony/Bundle/TwigBundle/TokenParser/JavascriptTokenParser.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
<?php | ||
|
||
namespace Symfony\Bundle\TwigBundle\TokenParser; | ||
|
||
use Symfony\Bundle\TwigBundle\Node\JavascriptNode; | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) 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. | ||
*/ | ||
|
||
/** | ||
* | ||
* | ||
* @author Fabien Potencier <fabien.potencier@symfony-project.com> | ||
*/ | ||
class JavascriptTokenParser extends \Twig_TokenParser | ||
{ | ||
/** | ||
* Parses a token and returns a node. | ||
* | ||
* @param \Twig_Token $token A \Twig_Token instance | ||
* | ||
* @return \Twig_NodeInterface A \Twig_NodeInterface instance | ||
*/ | ||
public function parse(\Twig_Token $token) | ||
{ | ||
$expr = $this->parser->getExpressionParser()->parseExpression(); | ||
|
||
// attributes | ||
if ($this->parser->getStream()->test(\Twig_Token::NAME_TYPE, 'with')) { | ||
$this->parser->getStream()->next(); | ||
|
||
$attributes = $this->parser->getExpressionParser()->parseExpression(); | ||
} else { | ||
$attributes = new \Twig_Node_Expression_Array(array(), $token->getLine()); | ||
} | ||
|
||
$this->parser->getStream()->expect(\Twig_Token::BLOCK_END_TYPE); | ||
|
||
return new JavascriptNode($expr, $attributes, $token->getLine(), $this->getTag()); | ||
} | ||
|
||
/** | ||
* Gets the tag name associated with this token parser. | ||
* | ||
* @param string The tag name | ||
*/ | ||
public function getTag() | ||
{ | ||
return 'javascript'; | ||
} | ||
} |
46 changes: 46 additions & 0 deletions
46
src/Symfony/Bundle/TwigBundle/TokenParser/JavascriptsTokenParser.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
<?php | ||
|
||
namespace Symfony\Bundle\TwigBundle\TokenParser; | ||
|
||
use Symfony\Bundle\TwigBundle\Node\JavascriptsNode; | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) 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. | ||
*/ | ||
|
||
/** | ||
* | ||
* | ||
* @author Fabien Potencier <fabien.potencier@symfony-project.com> | ||
*/ | ||
class JavascriptsTokenParser extends \Twig_TokenParser | ||
{ | ||
/** | ||
* Parses a token and returns a node. | ||
* | ||
* @param \Twig_Token $token A \Twig_Token instance | ||
* | ||
* @return \Twig_NodeInterface A \Twig_NodeInterface instance | ||
*/ | ||
public function parse(\Twig_Token $token) | ||
{ | ||
$this->parser->getStream()->expect(\Twig_Token::BLOCK_END_TYPE); | ||
|
||
return new JavascriptsNode($token->getLine(), $this->getTag()); | ||
} | ||
|
||
/** | ||
* Gets the tag name associated with this token parser. | ||
* | ||
* @param string The tag name | ||
*/ | ||
public function getTag() | ||
{ | ||
return 'javascripts'; | ||
} | ||
} |
57 changes: 57 additions & 0 deletions
57
src/Symfony/Bundle/TwigBundle/TokenParser/StylesheetTokenParser.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
<?php | ||
|
||
namespace Symfony\Bundle\TwigBundle\TokenParser; | ||
|
||
use Symfony\Bundle\TwigBundle\Node\StylesheetNode; | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) 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. | ||
*/ | ||
|
||
/** | ||
* | ||
* | ||
* @author Fabien Potencier <fabien.potencier@symfony-project.com> | ||
*/ | ||
class StylesheetTokenParser extends \Twig_TokenParser | ||
{ | ||
/** | ||
* Parses a token and returns a node. | ||
* | ||
* @param \Twig_Token $token A \Twig_Token instance | ||
* | ||
* @return \Twig_NodeInterface A \Twig_NodeInterface instance | ||
*/ | ||
public function parse(\Twig_Token $token) | ||
{ | ||
$expr = $this->parser->getExpressionParser()->parseExpression(); | ||
|
||
// attributes | ||
if ($this->parser->getStream()->test(\Twig_Token::NAME_TYPE, 'with')) { | ||
$this->parser->getStream()->next(); | ||
|
||
$attributes = $this->parser->getExpressionParser()->parseExpression(); | ||
} else { | ||
$attributes = new \Twig_Node_Expression_Array(array(), $token->getLine()); | ||
} | ||
|
||
$this->parser->getStream()->expect(\Twig_Token::BLOCK_END_TYPE); | ||
|
||
return new StylesheetNode($expr, $attributes, $token->getLine(), $this->getTag()); | ||
} | ||
|
||
/** | ||
* Gets the tag name associated with this token parser. | ||
* | ||
* @param string The tag name | ||
*/ | ||
public function getTag() | ||
{ | ||
return 'stylesheet'; | ||
} | ||
} |
Oops, something went wrong.