dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Revert "Fix link prefix/suffixes around Category and Language links.""
[lhc/web/wiklou.git]
/
includes
/
cache
/
localisation
/
LocalisationCache.php
diff --git
a/includes/cache/localisation/LocalisationCache.php
b/includes/cache/localisation/LocalisationCache.php
index
58a67ad
..
a0ce95e
100644
(file)
--- a/
includes/cache/localisation/LocalisationCache.php
+++ b/
includes/cache/localisation/LocalisationCache.php
@@
-20,8
+20,6
@@
* @file
*/
* @file
*/
-use Cdb\Reader as CdbReader;
-use Cdb\Writer as CdbWriter;
use CLDRPluralRuleParser\Evaluator;
use CLDRPluralRuleParser\Error as CLDRPluralRuleError;
use MediaWiki\MediaWikiServices;
use CLDRPluralRuleParser\Evaluator;
use CLDRPluralRuleParser\Error as CLDRPluralRuleError;
use MediaWiki\MediaWikiServices;
@@
-687,7
+685,7
@@
class LocalisationCache {
* exists, the data array is returned, otherwise false is returned.
*
* @param string $code
* exists, the data array is returned, otherwise false is returned.
*
* @param string $code
- * @param array $deps
+ * @param array
&
$deps
* @return array
*/
protected function readSourceFilesAndRegisterDeps( $code, &$deps ) {
* @return array
*/
protected function readSourceFilesAndRegisterDeps( $code, &$deps ) {
@@
-719,7
+717,7
@@
class LocalisationCache {
* Merge two localisation values, a primary and a fallback, overwriting the
* primary value in place.
* @param string $key
* Merge two localisation values, a primary and a fallback, overwriting the
* primary value in place.
* @param string $key
- * @param mixed $value
+ * @param mixed
&
$value
* @param mixed $fallbackValue
*/
protected function mergeItem( $key, &$value, $fallbackValue ) {
* @param mixed $fallbackValue
*/
protected function mergeItem( $key, &$value, $fallbackValue ) {
@@
-749,7
+747,7
@@
class LocalisationCache {
}
/**
}
/**
- * @param mixed $value
+ * @param mixed
&
$value
* @param mixed $fallbackValue
*/
protected function mergeMagicWords( &$value, $fallbackValue ) {
* @param mixed $fallbackValue
*/
protected function mergeMagicWords( &$value, $fallbackValue ) {
@@
-775,7
+773,7
@@
class LocalisationCache {
* otherwise.
* @param array $codeSequence
* @param string $key
* otherwise.
* @param array $codeSequence
* @param string $key
- * @param mixed $value
+ * @param mixed
&
$value
* @param mixed $fallbackValue
* @return bool
*/
* @param mixed $fallbackValue
* @return bool
*/