removed deprecated stuff in 2.1

nette · Dec 4, 2013 · aabdc14 · aabdc14
1 parent c50f25e
commit aabdc14
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 29 deletions.
diff --git a/src/Forms/Controls/RadioList.php b/src/Forms/Controls/RadioList.php
@@ -49,12 +49,8 @@ public function __construct($label = NULL, array $items = NULL)
 	 * Returns selected radio value.
 	 * @return mixed
 	 */
-	public function getValue($raw = FALSE)
+	public function getValue()
 	{
-		if ($raw) {
-			trigger_error(__METHOD__ . '(TRUE) is deprecated; use getRawValue() instead.', E_USER_DEPRECATED);
-			return $this->getRawValue();
-		}
 		return parent::getValue();
 	}
 

diff --git a/src/Forms/Controls/SelectBox.php b/src/Forms/Controls/SelectBox.php
@@ -40,13 +40,6 @@ class SelectBox extends ChoiceControl
 	 */
 	public function setPrompt($prompt)
 	{
-		if ($prompt === TRUE) { // back compatibility
-			trigger_error(__METHOD__ . '(TRUE) is deprecated; argument must be string.', E_USER_DEPRECATED);
-			$items = $this->getItems();
-			$prompt = reset($items);
-			unset($this->options[key($items)], $items[key($items)]);
-			$this->setItems($items);
-		}
 		$this->prompt = $prompt;
 		return $this;
 	}

diff --git a/src/Forms/Controls/TextInput.php b/src/Forms/Controls/TextInput.php
@@ -57,15 +57,6 @@ public function setType($type)
 	}
 
 
-	/** @deprecated */
-	public function setPasswordMode($mode = TRUE)
-	{
-		trigger_error(__METHOD__ . '() is deprecated; use setType("password") instead.', E_USER_DEPRECATED);
-		$this->control->type = $mode ? 'password' : 'text';
-		return $this;
-	}
-
-
 	/**
 	 * Generates control's HTML element.
 	 * @return Nette\Utils\Html

diff --git a/src/Forms/Validator.php b/src/Forms/Validator.php
@@ -221,14 +221,6 @@ public static function validateUrl(IControl $control)
 	}
 
 
-	/** @deprecated */
-	public static function validateRegexp(IControl $control, $regexp)
-	{
-		trigger_error('Validator REGEXP is deprecated; use PATTERN instead (which is matched against the entire value and is case sensitive).', E_USER_DEPRECATED);
-		return (bool) Strings::match($control->getValue(), $regexp);
-	}
-
-
 	/**
 	 * Matches control's value regular expression?
 	 * @return bool