geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-11 18:06:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated spaceless deprecation to point to apply tag, as the filter tag is now deprecated too

Browse Source
This commit is contained in:
Steve Nebes
2019-11-27 10:50:02 -06:00
committed by Fabien Potencier
parent aecce3d92e
commit a343589583
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phpunit.xml.dist
+1
View File
@@ -19,6 +19,7 @@
<php>
<ini name="error_reporting" value="-1" />
<ini name="xdebug.overload_var_dump" value="0" />
<server name="SYMFONY_PHPUNIT_VERSION" value="7.5" />
</php>
<listeners>
src/TokenParser/SpacelessTokenParser.php
+2 -2
View File
@@ -24,7 +24,7 @@ use Twig\Token;
* {% endspaceless %}
* {# output will be <div><strong>foo</strong></div> #}
*
* @deprecated since Twig 2.7, to be removed in 3.0 (use the spaceless filter instead)
* @deprecated since Twig 2.7, to be removed in 3.0 (use the "spaceless" filter with the "apply" tag instead)
*/
final class SpacelessTokenParser extends AbstractTokenParser
{
@@ -33,7 +33,7 @@ final class SpacelessTokenParser extends AbstractTokenParser
$stream = $this->parser->getStream();
$lineno = $token->getLine();
@trigger_error(sprintf('The spaceless tag in "%s" at line %d is deprecated since Twig 2.7, use the spaceless filter instead.', $stream->getSourceContext()->getName(), $lineno), E_USER_DEPRECATED);
@trigger_error(sprintf('The spaceless tag in "%s" at line %d is deprecated since Twig 2.7, use the "spaceless" filter with the "apply" tag instead.', $stream->getSourceContext()->getName(), $lineno), E_USER_DEPRECATED);
$stream->expect(/* Token::BLOCK_END_TYPE */ 3);
$body = $this->parser->subparse([$this, 'decideSpacelessEnd'], true);
tests/Fixtures/tags/block/capturing_block.test
+1 -1
View File
@@ -1,7 +1,7 @@
--TEST--
capturing "block" tag
--DEPRECATION--
The spaceless tag in "index.twig" at line 4 is deprecated since Twig 2.7, use the spaceless filter instead.
The spaceless tag in "index.twig" at line 4 is deprecated since Twig 2.7, use the "spaceless" filter with the "apply" tag instead.
--TEMPLATE--
{% set foo %}{% block foo %}FOO{% endblock %}{% endset %}
{{ foo }}
tests/Fixtures/tags/spaceless/root_level_in_child.legacy.test
+1 -1
View File
@@ -1,7 +1,7 @@
--TEST--
"spaceless" tag in the root level of a child template
--DEPRECATION--
The spaceless tag in "index.twig" at line 3 is deprecated since Twig 2.7, use the spaceless filter instead.
The spaceless tag in "index.twig" at line 3 is deprecated since Twig 2.7, use the "spaceless" filter with the "apply" tag instead.
Using the spaceless tag at the root level of a child template in "index.twig" at line 3 is deprecated since Twig 2.5.0 and will become a syntax error in 3.0.
Nesting a block definition under a non-capturing node in "index.twig" at line 4 is deprecated since Twig 2.5.0 and will become a syntax error in 3.0.
--TEMPLATE--
tests/Fixtures/tags/spaceless/simple.test
+1 -1
View File
@@ -1,7 +1,7 @@
--TEST--
"spaceless" tag removes whites between HTML tags
--DEPRECATION--
The spaceless tag in "index.twig" at line 2 is deprecated since Twig 2.7, use the spaceless filter instead.
The spaceless tag in "index.twig" at line 2 is deprecated since Twig 2.7, use the "spaceless" filter with the "apply" tag instead.
--TEMPLATE--
{% spaceless %}