From e864e65d40936813d011c178fadaf098d58f05d0 Mon Sep 17 00:00:00 2001
From: Thalia <thalia.e.chan@googlemail.com>
Date: Fri, 30 Aug 2019 19:54:34 +0100
Subject: [PATCH] Use DatabaseBlock instead of deprecated Block in
 CompositeBlock tests

Change-Id: I377da7e070ccd4f1ebb4a3e9619833e912180491
---
 .../includes/block/CompositeBlockTest.php     | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/phpunit/includes/block/CompositeBlockTest.php b/tests/phpunit/includes/block/CompositeBlockTest.php
index fe8cee76a7..8409f562b5 100644
--- a/tests/phpunit/includes/block/CompositeBlockTest.php
+++ b/tests/phpunit/includes/block/CompositeBlockTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Block\BlockRestrictionStore;
 use MediaWiki\Block\CompositeBlock;
+use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Block\Restriction\PageRestriction;
 use MediaWiki\Block\Restriction\NamespaceRestriction;
 use MediaWiki\Block\SystemBlock;
@@ -16,12 +17,12 @@ class CompositeBlockTest extends MediaWikiLangTestCase {
 	private function getPartialBlocks() {
 		$sysopId = $this->getTestSysop()->getUser()->getId();
 
-		$userBlock = new Block( [
+		$userBlock = new DatabaseBlock( [
 			'address' => $this->getTestUser()->getUser(),
 			'by' => $sysopId,
 			'sitewide' => false,
 		] );
-		$ipBlock = new Block( [
+		$ipBlock = new DatabaseBlock( [
 			'address' => '127.0.0.1',
 			'by' => $sysopId,
 			'sitewide' => false,
@@ -66,12 +67,12 @@ class CompositeBlockTest extends MediaWikiLangTestCase {
 		return [
 			'Sitewide block and partial block' => [
 				[
-					new Block( [
+					new DatabaseBlock( [
 						'sitewide' => false,
 						'blockEmail' => true,
 						'allowUsertalk' => true,
 					] ),
-					new Block( [
+					new DatabaseBlock( [
 						'sitewide' => true,
 						'blockEmail' => false,
 						'allowUsertalk' => false,
@@ -86,7 +87,7 @@ class CompositeBlockTest extends MediaWikiLangTestCase {
 			],
 			'Partial block and system block' => [
 				[
-					new Block( [
+					new DatabaseBlock( [
 						'sitewide' => false,
 						'blockEmail' => true,
 						'allowUsertalk' => false,
@@ -104,7 +105,7 @@ class CompositeBlockTest extends MediaWikiLangTestCase {
 			],
 			'System block and user name hiding block' => [
 				[
-					new Block( [
+					new DatabaseBlock( [
 						'hideName' => true,
 						'sitewide' => true,
 						'blockEmail' => true,
@@ -123,12 +124,12 @@ class CompositeBlockTest extends MediaWikiLangTestCase {
 			],
 			'Two lenient partial blocks' => [
 				[
-					new Block( [
+					new DatabaseBlock( [
 						'sitewide' => false,
 						'blockEmail' => false,
 						'allowUsertalk' => true,
 					] ),
-					new Block( [
+					new DatabaseBlock( [
 						'sitewide' => false,
 						'blockEmail' => false,
 						'allowUsertalk' => true,
@@ -222,18 +223,18 @@ class CompositeBlockTest extends MediaWikiLangTestCase {
 		return [
 			'Read is not blocked' => [
 				[
-					new Block(),
-					new Block(),
+					new DatabaseBlock(),
+					new DatabaseBlock(),
 				],
 				'read',
 				false,
 			],
 			'Email is blocked if blocked by any blocks' => [
 				[
-					new Block( [
+					new DatabaseBlock( [
 						'blockEmail' => true,
 					] ),
-					new Block( [
+					new DatabaseBlock( [
 						'blockEmail' => false,
 					] ),
 				],
-- 
2.20.1