Merge "Make DBAccessBase use DBConnRef, rename $wiki, and hide getLoadBalancer()"

[lhc/web/wiklou.git] / includes / config / ConfigRepository.php

diff --git a/includes/config/ConfigRepository.php b/includes/config/ConfigRepository.php
index d48eb0e..ceb3944 100644 (file)
--- a/includes/config/ConfigRepository.php
+++ b/includes/config/ConfigRepository.php
@@ -188,6 +188,8 @@ class ConfigRepository implements SalvageableService {
         */
        public function salvage( SalvageableService $other ) {
                Assert::parameterType( self::class, $other, '$other' );
+               /** @var self $other */
+               '@phan-var self $other';
 
                foreach ( $other->configItems['public'] as $name => $otherConfig ) {
                        if ( isset( $this->configItems['public'][$name] ) ) {