Merge "phpunit: Use "@" instead of temporary error_reporting override"

Author: jenkins-bot

.phpcs.xml

@@ -35,6 +35,8 @@
 	</rule>
 	<rule ref="Generic.PHP.NoSilencedErrors.Discouraged">
 		<exclude-pattern>tests/phpunit/*</exclude-pattern>
+		<!-- For /lib/packages/*/tests/unit/**/*.php -->
+		<exclude-pattern>tests/unit/*</exclude-pattern>
 	</rule>
 
 	<!-- NOTE: We can not use the Squiz.Arrays.ArrayBracketSpacing sniff because it conflicts with

lib/packages/wikibase/data-model-services/tests/unit/Diff/ItemDiffTest.php

@@ -229,14 +229,13 @@ public function testIsEmpty( array $diffOps, $isEmpty ) {
 	 * diffs for substructures even in recursive mode (bug 51363).
 	 */
 	public function testAtomicSubstructureWorkaround() {
-		$oldErrorLevel = error_reporting( E_USER_ERROR );
-
 		$atomicListDiff = new DiffOpChange(
 			[ 'a' => 'A', 'b' => 'B' ],
 			[ 'b' => 'B', 'a' => 'A' ]
 		);
 
-		$diff = new ItemDiff( [
+		// Ignore intentional warning for "Invalid substructure diff"
+		$diff = @new ItemDiff( [
 			'aliases' => $atomicListDiff,
 			'label' => $atomicListDiff,
 			'description' => $atomicListDiff,
@@ -249,8 +248,6 @@ public function testAtomicSubstructureWorkaround() {
 		$this->assertInstanceOf( Diff::class, $diff->getDescriptionsDiff() );
 		$this->assertInstanceOf( Diff::class, $diff->getClaimsDiff() );
 		$this->assertInstanceOf( Diff::class, $diff->getSiteLinkDiff() );
-
-		error_reporting( $oldErrorLevel );
 	}
 
 }