aboutsummaryrefslogtreecommitdiffstats
path: root/includes/libs/ReplacementArray.php
diff options
context:
space:
mode:
authorMax Semenik <maxsem.wiki@gmail.com>2016-01-28 17:49:38 -0800
committerReedy <reedy@wikimedia.org>2016-02-10 08:16:33 +0000
commitb41307acc031ad4778ea2d8ac9fb12a7f12f8f3b (patch)
treee05482dc2f4fbcf0caeeb7d1321878d2f78949d0 /includes/libs/ReplacementArray.php
parent7a84c29895a58f492f02c0be3432b4418f01c6e2 (diff)
downloadmediawikicore-b41307acc031ad4778ea2d8ac9fb12a7f12f8f3b.tar.gz
mediawikicore-b41307acc031ad4778ea2d8ac9fb12a7f12f8f3b.zip
Drop FastStringSearch support from ReplacementArray
It's not needed after a PHP 5.5 switch Change-Id: I989f39d59878039d8cc320af957a90982e48d08d
Diffstat (limited to 'includes/libs/ReplacementArray.php')
-rw-r--r--includes/libs/ReplacementArray.php30
1 files changed, 3 insertions, 27 deletions
diff --git a/includes/libs/ReplacementArray.php b/includes/libs/ReplacementArray.php
index ea50a854b2eb..02762f36d146 100644
--- a/includes/libs/ReplacementArray.php
+++ b/includes/libs/ReplacementArray.php
@@ -19,19 +19,17 @@
*/
/**
- * Replacement array for FSS with fallback to strtr()
- * Supports lazy initialisation of FSS resource
+ * Wrapper around strtr() that holds replacements
*/
class ReplacementArray {
private $data = false;
- private $fss = false;
/**
* Create an object with the specified replacement array
* The array should have the same form as the replacement array for strtr()
* @param array $data
*/
- public function __construct( $data = array() ) {
+ public function __construct( $data = [] ) {
$this->data = $data;
}
@@ -42,17 +40,12 @@ class ReplacementArray {
return array( 'data' );
}
- public function __wakeup() {
- $this->fss = false;
- }
-
/**
* Set the whole replacement array at once
* @param array $data
*/
public function setArray( $data ) {
$this->data = $data;
- $this->fss = false;
}
/**
@@ -69,7 +62,6 @@ class ReplacementArray {
*/
public function setPair( $from, $to ) {
$this->data[$from] = $to;
- $this->fss = false;
}
/**
@@ -77,7 +69,6 @@ class ReplacementArray {
*/
public function mergeArray( $data ) {
$this->data = $data + $this->data;
- $this->fss = false;
}
/**
@@ -85,7 +76,6 @@ class ReplacementArray {
*/
public function merge( ReplacementArray $other ) {
$this->data = $other->data + $this->data;
- $this->fss = false;
}
/**
@@ -93,7 +83,6 @@ class ReplacementArray {
*/
public function removePair( $from ) {
unset( $this->data[$from] );
- $this->fss = false;
}
/**
@@ -103,7 +92,6 @@ class ReplacementArray {
foreach ( $data as $from => $to ) {
$this->removePair( $from );
}
- $this->fss = false;
}
/**
@@ -111,18 +99,6 @@ class ReplacementArray {
* @return string
*/
public function replace( $subject ) {
- if (
- function_exists( 'fss_prep_replace' ) &&
- version_compare( PHP_VERSION, '5.5.0' ) < 0
- ) {
- if ( $this->fss === false ) {
- $this->fss = fss_prep_replace( $this->data );
- }
- $result = fss_exec_replace( $this->fss, $subject );
- } else {
- $result = strtr( $subject, $this->data );
- }
-
- return $result;
+ return strtr( $subject, $this->data );
}
}