From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 1 Dec 2017 21:28:36 +0000 (-0800)
Subject: objectcache: Fix HashBagOStuffTest test in PHP 7.1
X-Git-Tag: 1.31.0-rc.0~1320^2
X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=commitdiff_plain;h=7dbc5b0fe63a10573ebf0f705d6857b3382288dd;p=lhc%2Fweb%2Fwiklou.git

objectcache: Fix HashBagOStuffTest test in PHP 7.1

> There was 1 error:
>
> 1) HashBagOStuffTest::testEvictionAdd
> A non-numeric value encountered
>
> tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php:106

This warning is new in PHP 7.1, however the behaviour is not new.
This code was already not behaving as it should have. Concatenation
preceeds addition/multiplication. As such, this was producing
(int)-10 each time instead of (str)"key0" through (str)"key10".

Change-Id: Ibb1a59e373740772f02dfec77ee7ebd9d181d852
---

diff --git a/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php b/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
index b2278c3437..53d27c0afb 100644
--- a/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
@@ -103,7 +103,7 @@ class HashBagOStuffTest extends PHPUnit_Framework_TestCase {
 		for ( $i = 10; $i < 20; $i++ ) {
 			$cache->set( "key$i", 1 );
 			$this->assertEquals( 1, $cache->get( "key$i" ) );
-			$this->assertEquals( false, $cache->get( "key" . $i - 10 ) );
+			$this->assertEquals( false, $cache->get( "key" . ( $i - 10 ) ) );
 		}
 	}