Skip to content

Commit 7b7189f

Browse files
committed
removed stuff deprecated in 2.1
1 parent 06c51d9 commit 7b7189f

File tree

3 files changed

+2
-27
lines changed

3 files changed

+2
-27
lines changed

src/Forms/Controls/MultiSelectBox.php

-8
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,4 @@ public function getControl()
6666
)->addAttributes(parent::getControl()->attrs)->multiple(TRUE);
6767
}
6868

69-
70-
/** @deprecated */
71-
function getSelectedItem()
72-
{
73-
trigger_error(__METHOD__ . '(TRUE) is deprecated; use getSelectedItems() instead.', E_USER_DEPRECATED);
74-
return $this->getSelectedItems();
75-
}
76-
7769
}

src/Forms/Controls/RadioList.php

+2-11
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,8 @@ public function getItemLabelPrototype()
9393
* Generates control's HTML element.
9494
* @return Nette\Utils\Html
9595
*/
96-
public function getControl($key = NULL)
96+
public function getControl()
9797
{
98-
if ($key !== NULL) {
99-
trigger_error(sprintf('Partial %s() is deprecated; use getControlPart() instead.', __METHOD__), E_USER_DEPRECATED);
100-
return $this->getControlPart($key);
101-
}
102-
10398
$input = parent::getControl();
10499
$items = $this->getItems();
105100
$ids = array();
@@ -130,12 +125,8 @@ public function getControl($key = NULL)
130125
* @param string
131126
* @return Nette\Utils\Html
132127
*/
133-
public function getLabel($caption = NULL, $key = NULL)
128+
public function getLabel($caption = NULL)
134129
{
135-
if ($key !== NULL) {
136-
trigger_error(sprintf('Partial %s() is deprecated; use getLabelPart() instead.', __METHOD__), E_USER_DEPRECATED);
137-
return $this->getLabelPart($key);
138-
}
139130
return parent::getLabel($caption)->for(NULL);
140131
}
141132

src/Forms/Form.php

-8
Original file line numberDiff line numberDiff line change
@@ -536,14 +536,6 @@ public function getOwnErrors()
536536
}
537537

538538

539-
/** @deprecated */
540-
public function getAllErrors()
541-
{
542-
trigger_error(__METHOD__ . '() is deprecated; use getErrors() instead.', E_USER_DEPRECATED);
543-
return $this->getErrors();
544-
}
545-
546-
547539
/********************* rendering ****************d*g**/
548540

549541

0 commit comments

Comments
 (0)