removed deprecated stuff in 2.1

dg · dg · commit aabdc14209ac · 2013-12-05T00:37:46.000+01:00
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

Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,8 @@ public function __construct($label = NULL, array $items = NULL)`
`49`	`49`	`* Returns selected radio value.`
`50`	`50`	`* @return mixed`
`51`	`51`	`*/`
`52`		`- public function getValue($raw = FALSE)`
	`52`	`+ public function getValue()`
`53`	`53`	`{`
`54`		`- if ($raw) {`
`55`		`- trigger_error(__METHOD__ . '(TRUE) is deprecated; use getRawValue() instead.', E_USER_DEPRECATED);`
`56`		`- return $this->getRawValue();`
`57`		`- }`
`58`	`54`	`return parent::getValue();`
`59`	`55`	`}`
`60`	`56`
Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,6 @@ class SelectBox extends ChoiceControl`
`40`	`40`	`*/`
`41`	`41`	`public function setPrompt($prompt)`
`42`	`42`	`{`
`43`		`- if ($prompt === TRUE) { // back compatibility`
`44`		`- trigger_error(__METHOD__ . '(TRUE) is deprecated; argument must be string.', E_USER_DEPRECATED);`
`45`		`- $items = $this->getItems();`
`46`		`- $prompt = reset($items);`
`47`		`- unset($this->options[key($items)], $items[key($items)]);`
`48`		`- $this->setItems($items);`
`49`		`- }`
`50`	`43`	`$this->prompt = $prompt;`
`51`	`44`	`return $this;`
`52`	`45`	`}`