BlockMacros: removed deprecation warning for {includeblock}, it is de…

…precated silently
nette · Jan 19, 2017 · 58b94ad · 58b94ad
1 parent 05187e9
commit 58b94ad
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/src/Latte/Macros/BlockMacros.php b/src/Latte/Macros/BlockMacros.php
@@ -139,7 +139,7 @@ public function macroInclude(MacroNode $node, PhpWriter $writer)
 	 */
 	public function macroIncludeBlock(MacroNode $node, PhpWriter $writer)
 	{
-		trigger_error('Macro {includeblock} is deprecated, use similar macro {import}.', E_USER_DEPRECATED);
+		//trigger_error('Macro {includeblock} is deprecated, use similar macro {import}.', E_USER_DEPRECATED);
 		$node->replaced = FALSE;
 		if ($node->modifiers) {
 			throw new CompileException('Modifiers are not allowed in ' . $node->getNotation());

diff --git a/tests/Latte/BlockMacros.includeblock.phpt b/tests/Latte/BlockMacros.includeblock.phpt
@@ -27,11 +27,11 @@ $latte->setLoader(new Latte\Loaders\StringLoader([
 
 Assert::matchFile(
 	__DIR__ . '/expected/BlockMacros.includeblock.phtml',
-	@$latte->compile('main') // @ false temporary warning for {includeblock}
+	$latte->compile('main')
 );
 Assert::matchFile(
 	__DIR__ . '/expected/BlockMacros.includeblock.html',
-	@$latte->renderToString('main') // @ false temporary warning for {includeblock}
+	$latte->renderToString('main')
 );
 Assert::matchFile(
 	__DIR__ . '/expected/BlockMacros.includeblock.inc.phtml',

diff --git a/tests/Latte/BlockMacros.inheritance.child1.phpt b/tests/Latte/BlockMacros.inheritance.child1.phpt
@@ -37,11 +37,11 @@ $latte->setLoader(new Latte\Loaders\StringLoader([
 
 Assert::matchFile(
 	__DIR__ . '/expected/BlockMacros.inheritance.child1.phtml',
-	@$latte->compile('main') // @ false temporary warning for {includeblock}
+	$latte->compile('main')
 );
 Assert::matchFile(
 	__DIR__ . '/expected/BlockMacros.inheritance.child1.html',
-	@$latte->renderToString('main', ['people' => ['John', 'Mary', 'Paul']]) // @ false temporary warning for {includeblock}
+	$latte->renderToString('main', ['people' => ['John', 'Mary', 'Paul']])
 );
 Assert::matchFile(
 	__DIR__ . '/expected/BlockMacros.inheritance.child1.parent.phtml',

diff --git a/tests/Latte/contentType.compatibility.phpt b/tests/Latte/contentType.compatibility.phpt
@@ -194,10 +194,7 @@ Assert::same(' <>', $latte->renderToString('context2'));
 
 Assert::error(function () use ($latte) {
 	$latte->renderToString('context3');
-}, [
-	[E_USER_DEPRECATED, ''],
-	[E_USER_WARNING, "Including 'ical.latte' with content type ICAL into incompatible type HTML."],
-]);
+}, E_USER_WARNING, "Including 'ical.latte' with content type ICAL into incompatible type HTML.");
 
 Assert::same(' <>', $latte->renderToString('context4'));