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

Merge "objectcache: Deprecate SerializedValueContainer::isUnified()"

Browse source
This commit is contained in:
jenkins-bot 2024-03-19 18:18:29 +00:00 committed by Gerrit Code Review
commit c19f0ae0f1
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES-1.42
View file

@ -621,6 +621,8 @@ because of Phabricator reports.
Vuex 4 will remain accessible for the foreseeable future. Pinia should be used
for new projects.
* Linker::makeHeadline() has been deprecated.
* SerializedValueContainer::isUnified() has been deprecated and now emits
deprecation warnings since 1.42.
* Linker::generateTOC(), Linker::tocIndent(), Linker::tocUnindent(),
Linker::tocLine(), Linker::tocLineEnd(), Linker::tocList() are deprecated.
* Title::getBrokenLinksFrom() has been deprecated.

4
includes/libs/objectcache/MediumSpecificBagOStuff.php
View file

@ -801,10 +801,6 @@ abstract class MediumSpecificBagOStuff extends BagOStuff {
* @return string|null|bool The combined string, false if missing, null on error
*/
final protected function resolveSegments( $key, $mainValue ) {
if ( SerializedValueContainer::isUnified( $mainValue ) ) {
return $this->unserialize( $mainValue->{SerializedValueContainer::UNIFIED_DATA} );
}
if ( SerializedValueContainer::isSegmented( $mainValue ) ) {
$orderedKeys = array_map(
function ( $segmentHash ) use ( $key ) {

5
includes/libs/objectcache/serialized/SerializedValueContainer.php
View file

@ -12,6 +12,9 @@ class SerializedValueContainer {
// 64 bit UID
private const SCHEMA_SEGMENTED = 'CAYCDAgCDw4';
/**
* @deprecated since 1.42
*/
public const UNIFIED_DATA = '__data__';
public const SEGMENTED_HASHES = '__hashes__';
@ -27,10 +30,12 @@ class SerializedValueContainer {
}
/**
* @deprecated since 1.42.
* @param mixed $value
* @return bool
*/
public static function isUnified( $value ) {
wfDeprecated( __METHOD__, '1.42' );
return (
$value instanceof stdClass &&
( $value->{self::SCHEMA} ?? null ) === self::SCHEMA_UNIFIED