removed stuff strongly deprecated in 2.3

dg · dg · commit 6d192c273507 · 2015-06-15T20:30:31.000+02:00
diff --git a/src/Bridges/FormsLatte/FormMacros.php b/src/Bridges/FormsLatte/FormMacros.php
@@ -36,7 +36,7 @@ public static function install(Latte\Compiler $compiler)
 		$me->addMacro('form', [$me, 'macroForm'], 'echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd($_form)');
 		$me->addMacro('formContainer', [$me, 'macroFormContainer'], '$formContainer = $_form = array_pop($_formStack)');
 		$me->addMacro('label', [$me, 'macroLabel'], [$me, 'macroLabelEnd']);
-		$me->addMacro('input', [$me, 'macroInput'], NULL, [$me, 'macroInputAttr']);
+		$me->addMacro('input', [$me, 'macroInput']);
 		$me->addMacro('name', [$me, 'macroName'], [$me, 'macroNameEnd'], [$me, 'macroNameAttr']);
 		$me->addMacro('inputError', [$me, 'macroInputError']);
 	}
@@ -134,15 +134,6 @@ public function macroInput(MacroNode $node, PhpWriter $writer)
 	}
 
 
-	/**
-	 * deprecated n:input
-	 */
-	public function macroInputAttr(MacroNode $node, PhpWriter $writer)
-	{
-		throw new CompileException('Use n:name instead of n:input.');
-	}
-
-
 	/**
 	 * <form n:name>, <input n:name>, <select n:name>, <textarea n:name>, <label n:name> and <button n:name>
 	 */
diff --git a/src/Forms/Controls/BaseControl.php b/src/Forms/Controls/BaseControl.php
@@ -513,14 +513,6 @@ public function cleanErrors()
 	}
 
 
-	/** @deprecated */
-	protected static function exportRules($rules)
-	{
-		trigger_error(__METHOD__ . '() is deprecated; use Nette\Forms\Helpers::exportRules() instead.', E_USER_DEPRECATED);
-		return Nette\Forms\Helpers::exportRules($rules);
-	}
-
-
 	/********************* user data ****************d*g**/
 
 
diff --git a/tests/Forms.Latte/FormMacros.error.phpt b/tests/Forms.Latte/FormMacros.error.phpt
@@ -38,10 +38,6 @@ Assert::exception(function() use ($latte) {
 }, 'Latte\CompileException', 'Missing name in {formContainer}.');
 
 
-Assert::exception(function() use ($latte) {
-	$latte->compile('<input n:input>');
-}, 'Latte\CompileException', 'Use n:name instead of n:input.');
-
 Assert::exception(function() use ($latte) {
 	$latte->compile('<html>{label /}');
 }, 'Latte\CompileException', 'Missing name in {label}.');
