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

Remove useless use of current and end

Browse source 
The ConfigRepository is not an Interable (any more), so these functions
don't have any useable effect.

Bug: T221045
Change-Id: I6e5bfd9d922d2838c65d52815590dcad1fe6d284
This commit is contained in:
Florian 2019-05-18 20:50:47 +02:00 committed by Florianschmidtwelzow
parent 6896da4e14
commit e2273bcd86
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/config/ConfigRepository.php
View file

@ -189,19 +189,12 @@ class ConfigRepository implements SalvageableService {
public function salvage( SalvageableService $other ) {
Assert::parameterType( self::class, $other, '$other' );
/** @var ConfigRepository $other */
$otherCurrentObj = $other->current();
foreach ( $other->configItems['public'] as $name => $otherConfig ) {
if ( isset( $this->configItems['public'][$name] ) ) {
continue;
}
$this->add( $name, $otherConfig );
// recover the pointer of the other config repository
if ( $otherCurrentObj === $otherConfig ) {
end( $this->configItems['public'] );
}
}
foreach ( $other->configItems['private'] as $name => $otherConfig ) {
if ( isset( $this->configItems['private'][$name] ) ) {
@ -209,11 +202,6 @@ class ConfigRepository implements SalvageableService {
}
$this->add( $name, $otherConfig );
// recover the pointer of the other config repository
if ( $otherCurrentObj === $otherConfig ) {
end( $this->configItems['private'] );
}
}
// disable $other