objectcache: update MemcachedPeclBagOStuff for pecl memcached 3.0.0

[lhc/web/wiklou.git] / tests / phpunit / includes / libs / objectcache / BagOStuffTest.php

diff --git a/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php b/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
index a1afa77..10fba83 100644 (file)
--- a/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
@@ -92,12 +92,12 @@ class BagOStuffTest extends MediaWikiTestCase {
                // merge on non-existing value
                $merged = $this->cache->merge( $key, $callback, 0 );
                $this->assertTrue( $merged );
-               $this->assertEquals( $this->cache->get( $key ), 'merged' );
+               $this->assertEquals( 'merged', $this->cache->get( $key ) );
 
                // merge on existing value
                $merged = $this->cache->merge( $key, $callback, 0 );
                $this->assertTrue( $merged );
-               $this->assertEquals( $this->cache->get( $key ), 'mergedmerged' );
+               $this->assertEquals( 'mergedmerged', $this->cache->get( $key ) );
 
                /*
                 * Test concurrent merges by forking this process, if:
@@ -163,6 +163,9 @@ class BagOStuffTest extends MediaWikiTestCase {
                $this->assertTrue( $this->cache->add( $key, 'test' ) );
        }
 
+       /**
+        * @covers BagOStuff::get
+        */
        public function testGet() {
                $value = [ 'this' => 'is', 'a' => 'test' ];
 
@@ -275,7 +278,7 @@ class BagOStuffTest extends MediaWikiTestCase {
         * @covers BagOStuff::trackDuplicateKeys
         */
        public function testReportDupes() {
-               $logger = $this->getMock( 'Psr\Log\NullLogger' );
+               $logger = $this->createMock( Psr\Log\NullLogger::class );
                $logger->expects( $this->once() )
                        ->method( 'warning' )
                        ->with( 'Duplicate get(): "{key}" fetched {count} times', [