Skip to content

Commit f9c400d

Browse files
committed
removed deprecated stuff, classes Filter & RecursiveFilter
1 parent 97976ec commit f9c400d

File tree

6 files changed

+0
-123
lines changed

6 files changed

+0
-123
lines changed

src/Iterators/Filter.php

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/Iterators/RecursiveFilter.php

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/Utils/Callback.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ public static function toReflection($callable)
141141
{
142142
if ($callable instanceof \Closure) {
143143
$callable = self::unwrap($callable);
144-
} elseif ($callable instanceof Nette\Callback) {
145-
trigger_error('Nette\Callback is deprecated.', E_USER_DEPRECATED);
146-
$callable = $callable->getNative();
147144
}
148145

149146
$class = class_exists(Nette\Reflection\Method::class) ? Nette\Reflection\Method::class : 'ReflectionMethod';

src/Utils/Html.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -362,16 +362,6 @@ public function getText()
362362
}
363363

364364

365-
/**
366-
* @deprecated
367-
*/
368-
public function add($child)
369-
{
370-
trigger_error(__METHOD__ . '() is deprecated, use addHtml() or addText() instead.', E_USER_DEPRECATED);
371-
return $this->addHtml($child);
372-
}
373-
374-
375365
/**
376366
* Adds new element's child.
377367
* @param Html|string Html node or raw HTML string
@@ -602,14 +592,6 @@ public function attributes()
602592

603593
$s = '';
604594
$attrs = $this->attrs;
605-
if (isset($attrs['data']) && is_array($attrs['data'])) { // deprecated
606-
trigger_error('Expanded attribute "data" is deprecated.', E_USER_DEPRECATED);
607-
foreach ($attrs['data'] as $key => $value) {
608-
$attrs['data-' . $key] = $value;
609-
}
610-
unset($attrs['data']);
611-
}
612-
613595
foreach ($attrs as $key => $value) {
614596
if ($value === NULL || $value === FALSE) {
615597
continue;

src/Utils/Strings.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -415,17 +415,6 @@ public static function reverse($s)
415415
}
416416

417417

418-
/**
419-
* Use Nette\Utils\Random::generate
420-
* @deprecated
421-
*/
422-
public static function random($length = 10, $charlist = '0-9a-z')
423-
{
424-
trigger_error(__METHOD__ . '() is deprecated, use Nette\Utils\Random::generate()', E_USER_DEPRECATED);
425-
return Random::generate($length, $charlist);
426-
}
427-
428-
429418
/**
430419
* Returns part of $haystack before $nth occurence of $needle.
431420
* @param string
@@ -569,14 +558,9 @@ public static function matchAll($subject, $pattern, $flags = 0, $offset = 0)
569558
public static function replace($subject, $pattern, $replacement = NULL, $limit = -1)
570559
{
571560
if (is_object($replacement) || is_array($replacement)) {
572-
if ($replacement instanceof Nette\Callback) {
573-
trigger_error('Nette\Callback is deprecated, use PHP callback.', E_USER_DEPRECATED);
574-
$replacement = $replacement->getNative();
575-
}
576561
if (!is_callable($replacement, FALSE, $textual)) {
577562
throw new Nette\InvalidStateException("Callback '$textual' is not callable.");
578563
}
579-
580564
return self::pcre('preg_replace_callback', [$pattern, $replacement, $subject, $limit]);
581565

582566
} elseif ($replacement === NULL && is_array($pattern)) {

tests/Utils/Html.data.phpt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,6 @@ use Tester\Assert;
1111
require __DIR__ . '/../bootstrap.php';
1212

1313

14-
test(function () { // deprecated
15-
$el = Html::el('div');
16-
$el->data['a'] = 'one';
17-
$el->data['b'] = NULL;
18-
$el->data['c'] = FALSE;
19-
$el->data['d'] = '';
20-
$el->data['e'] = 'two';
21-
$el->{'data-x'} = 'x';
22-
$el->data['mxss'] = '``two';
23-
24-
Assert::same('<div data-x="x" data-a="one" data-d="" data-e="two" data-mxss="``two "></div>', @(string) $el);
25-
});
26-
27-
2814
test(function () { // direct
2915
$el = Html::el('div');
3016
$el->{'data-x'} = 'x';

0 commit comments

Comments
 (0)