Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused/deprecated Replacer classes

Browse source 
Change-Id: Ifec6c624810b2354f2fab2c1fd4a27267b625c4b
This commit is contained in:
Kunal Mehta 2019-06-17 15:23:06 -04:00
parent 874cf5f355
commit dd8aab7382
6 changed files with 2 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES-1.34
View file

@ -209,6 +209,8 @@ because of Phabricator reports.
specified, deprecated in 1.30, have been removed.
* BufferingStatsdDataFactory::getBuffer(), deprecated in 1.30, has been removed.
* The constant DB_SLAVE, deprecated in 1.28, has been removed. Use DB_REPLICA.
* Replacer, DoubleReplacer, HashtableReplacer and RegexlikeReplacer
(deprecated in 1.32) have been removed. Closures should be used instead.
* …
=== Deprecations in 1.34 ===

4
autoload.php
View file

@ -416,7 +416,6 @@ $wgAutoloadLocalClasses = [
'DnsSrvDiscoverer' => __DIR__ . '/includes/libs/DnsSrvDiscoverer.php',
'DoubleRedirectJob' => __DIR__ . '/includes/jobqueue/jobs/DoubleRedirectJob.php',
'DoubleRedirectsPage' => __DIR__ . '/includes/specials/SpecialDoubleRedirects.php',
'DoubleReplacer' => __DIR__ . '/includes/libs/replacers/DoubleReplacer.php',
'DummyLinker' => __DIR__ . '/includes/DummyLinker.php',
'DummySearchIndexFieldDefinition' => __DIR__ . '/includes/search/DummySearchIndexFieldDefinition.php',
'DummyTermColorer' => __DIR__ . '/maintenance/term/MWTerm.php',
@ -631,7 +630,6 @@ $wgAutoloadLocalClasses = [
'HashConfig' => __DIR__ . '/includes/config/HashConfig.php',
'HashRing' => __DIR__ . '/includes/libs/HashRing.php',
'HashSiteStore' => __DIR__ . '/includes/site/HashSiteStore.php',
'HashtableReplacer' => __DIR__ . '/includes/libs/replacers/HashtableReplacer.php',
'HistoryAction' => __DIR__ . '/includes/actions/HistoryAction.php',
'HistoryBlob' => __DIR__ . '/includes/historyblob/HistoryBlob.php',
'HistoryBlobCurStub' => __DIR__ . '/includes/historyblob/HistoryBlobCurStub.php',
@ -1218,14 +1216,12 @@ $wgAutoloadLocalClasses = [
'RefreshImageMetadata' => __DIR__ . '/maintenance/refreshImageMetadata.php',
'RefreshLinks' => __DIR__ . '/maintenance/refreshLinks.php',
'RefreshLinksJob' => __DIR__ . '/includes/jobqueue/jobs/RefreshLinksJob.php',
'RegexlikeReplacer' => __DIR__ . '/includes/libs/replacers/RegexlikeReplacer.php',
'RemexStripTagHandler' => __DIR__ . '/includes/parser/RemexStripTagHandler.php',
'RemoveInvalidEmails' => __DIR__ . '/maintenance/removeInvalidEmails.php',
'RemoveUnusedAccounts' => __DIR__ . '/maintenance/removeUnusedAccounts.php',
'RenameDbPrefix' => __DIR__ . '/maintenance/renameDbPrefix.php',
'RenderAction' => __DIR__ . '/includes/actions/RenderAction.php',
'ReplacementArray' => __DIR__ . '/includes/libs/ReplacementArray.php',
'Replacer' => __DIR__ . '/includes/libs/replacers/Replacer.php',
'ReplicatedBagOStuff' => __DIR__ . '/includes/libs/objectcache/ReplicatedBagOStuff.php',
'RepoGroup' => __DIR__ . '/includes/filerepo/RepoGroup.php',
'RequestContext' => __DIR__ . '/includes/context/RequestContext.php',

46
includes/libs/replacers/DoubleReplacer.php
View file

@ -1,46 +0,0 @@
<?php
/**
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
*/
/**
* Class to perform secondary replacement within each replacement string
*
* @deprecated since 1.32, use a Closure instead
*/
class DoubleReplacer extends Replacer {
/**
* @param mixed $from
* @param mixed $to
* @param int $index
*/
public function __construct( $from, $to, $index = 0 ) {
wfDeprecated( __METHOD__, '1.32' );
$this->from = $from;
$this->to = $to;
$this->index = $index;
}
/**
* @param array $matches
* @return mixed
*/
public function replace( array $matches ) {
return str_replace( $this->from, $this->to, $matches[$this->index] );
}
}

46
includes/libs/replacers/HashtableReplacer.php
View file

@ -1,46 +0,0 @@
<?php
/**
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
*/
/**
* Class to perform replacement based on a simple hashtable lookup
*
* @deprecated since 1.32, use a Closure instead
*/
class HashtableReplacer extends Replacer {
private $table, $index;
/**
* @param array $table
* @param int $index
*/
public function __construct( $table, $index = 0 ) {
wfDeprecated( __METHOD__, '1.32' );
$this->table = $table;
$this->index = $index;
}
/**
* @param array $matches
* @return mixed
*/
public function replace( array $matches ) {
return $this->table[$matches[$this->index]];
}
}

49
includes/libs/replacers/RegexlikeReplacer.php
View file

@ -1,49 +0,0 @@
<?php
/**
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
*/
/**
* Class to replace regex matches with a string similar to that used in preg_replace()
*
* @deprecated since 1.32, use a Closure instead
*/
class RegexlikeReplacer extends Replacer {
private $r;
/**
* @param string $r
*/
public function __construct( $r ) {
wfDeprecated( __METHOD__, '1.32' );
$this->r = $r;
}
/**
* @param array $matches
* @return string
*/
public function replace( array $matches ) {
$pairs = [];
foreach ( $matches as $i => $match ) {
$pairs["\$$i"] = $match;
}
return strtr( $this->r, $pairs );
}
}

41
includes/libs/replacers/Replacer.php
View file

@ -1,41 +0,0 @@
<?php
/**
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
*/
/**
* Base class for "replacers", objects used in preg_replace_callback() and
* StringUtils::delimiterReplaceCallback()
*
* @deprecated since 1.32, use a Closure instead
*/
abstract class Replacer {
/**
* @return array
*/
public function cb() {
wfDeprecated( __METHOD__, '1.32' );
return [ $this, 'replace' ];
}
/**
* @param array $matches
* @return string
*/
abstract public function replace( array $matches );
}