TemplateFactory: filters |normalize, |toAscii, |reverse, |url and |null are deprecated

Author: dg

src/Bridges/ApplicationLatte/TemplateFactory.php

@@ -78,11 +78,20 @@ public function createTemplate(UI\Control $control = NULL): UI\ITemplate
 			}
 		});
 
-		$latte->addFilter('url', 'rawurlencode'); // back compatiblity
-		foreach (['normalize', 'toAscii', 'webalize', 'reverse'] as $name) {
-			$latte->addFilter($name, 'Nette\Utils\Strings::' . $name);
+		$latte->addFilter('webalize', 'Nette\Utils\Strings::webalize');
+		$latte->addFilter('url', function ($s) {
+			trigger_error('Filter |url is deprecated, use |escapeUrl.', E_USER_DEPRECATED);
+			return rawurlencode($s);
+		});
+		foreach (['normalize', 'toAscii', 'reverse'] as $name) {
+			$latte->addFilter($name, function ($s) use ($name) {
+				trigger_error("Filter |$name is deprecated.", E_USER_DEPRECATED);
+				return [Nette\Utils\Strings::class, $name]($s);
+			});
 		}
-		$latte->addFilter('null', function () {});
+		$latte->addFilter('null', function () {
+			trigger_error('Filter |null is deprecated.', E_USER_DEPRECATED);
+		});
 		$latte->addFilter('modifyDate', function ($time, $delta, $unit = NULL) {
 			return $time == NULL ? NULL : Nette\Utils\DateTime::from($time)->modify($delta . $unit); // intentionally ==
 		});

tests/Bridges.Latte/TemplateFactory.filters.phpt

@@ -42,8 +42,8 @@ Assert::same('1978-05-06 00:00:00', (string) $latte->invokeFilter('modifyDate',
 Assert::same('1978-01-22 11:40:00', (string) $latte->invokeFilter('modifyDate', [254400000, -1, 'day']));
 
 
-Assert::same('%25', $latte->invokeFilter('url', ['%']));
-Assert::null($latte->invokeFilter('null', ['x']));
-Assert::same('', $latte->invokeFilter('normalize', ['  ']));
+Assert::same('%25', @$latte->invokeFilter('url', ['%'])); // @ is deprecated
+Assert::null(@$latte->invokeFilter('null', ['x'])); // @ is deprecated
+Assert::same('', @$latte->invokeFilter('normalize', ['  '])); // @ is deprecated
 Assert::same('a-b', $latte->invokeFilter('webalize', ['a b']));
-Assert::same('cba', $latte->invokeFilter('reverse', ['abc']));
+Assert::same('cba', @$latte->invokeFilter('reverse', ['abc'])); // @ is deprecated