From f6633d9f46951e57e5c7060953194aeeb7522024 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 8 Oct 2019 11:27:22 -0700 Subject: [PATCH] Services: Convert BlobStoreFactory's static to a const now HHVM is gone Change-Id: Ia319c881f0457fde71e355eca4873ac157e605d3 (cherry picked from commit 4afe9030c2ff36811e5ff8260e9c401b6e047c01) --- includes/ServiceWiring.php | 2 +- includes/Storage/BlobStoreFactory.php | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index 860edfd0c5..6d3fe6c4bd 100644 --- a/includes/ServiceWiring.php +++ b/includes/ServiceWiring.php @@ -107,7 +107,7 @@ return [ $services->getDBLoadBalancerFactory(), $services->getExternalStoreAccess(), $services->getMainWANObjectCache(), - new ServiceOptions( BlobStoreFactory::$constructorOptions, + new ServiceOptions( BlobStoreFactory::CONSTRUCTOR_OPTIONS, $services->getMainConfig() ), $services->getContentLanguage() ); diff --git a/includes/Storage/BlobStoreFactory.php b/includes/Storage/BlobStoreFactory.php index b59c68d175..c1371c9336 100644 --- a/includes/Storage/BlobStoreFactory.php +++ b/includes/Storage/BlobStoreFactory.php @@ -61,12 +61,10 @@ class BlobStoreFactory { private $contLang; /** - * TODO Make this a const when HHVM support is dropped (T192166) - * * @var array * @since 1.34 */ - public static $constructorOptions = [ + public const CONSTRUCTOR_OPTIONS = [ 'CompressRevisions', 'DefaultExternalStore', 'LegacyEncoding', @@ -80,7 +78,7 @@ class BlobStoreFactory { ServiceOptions $options, Language $contLang ) { - $options->assertRequiredOptions( self::$constructorOptions ); + $options->assertRequiredOptions( self::CONSTRUCTOR_OPTIONS ); $this->lbFactory = $lbFactory; $this->extStoreAccess = $extStoreAccess; -- 2.20.1