Remove dead code about old phpunit version

umherirrender · umherirrender · commit 12f432333aa3 · 2021-01-02T21:36:46.000+01:00
Change-Id: I0278aada66e4661c05381efa26d80e22c4205a41
diff --git a/tests/Reader/DBATest.php b/tests/Reader/DBATest.php
@@ -18,13 +18,7 @@ protected function setUp() : void {
 	}
 
 	public function testConstructor() {
-		if ( is_callable( [ $this, 'setExpectedException' ] ) ) {
-			// PHPUnit 4.8
-			$this->setExpectedException( Exception::class );
-		} else {
-			// PHPUnit 6+
-			$this->expectException( Exception::class );
-		}
+		$this->expectException( Exception::class );
 		// Silence native error from dba_open()
 		// @codingStandardsIgnoreLine Generic.PHP.NoSilencedErrors
 		@new DBA( '/tmp/non-exist' );
diff --git a/tests/Reader/HashTest.php b/tests/Reader/HashTest.php
@@ -9,13 +9,7 @@
 class HashTest extends \PHPUnit\Framework\TestCase {
 
 	public function testConstructor_fail() {
-		if ( is_callable( [ $this, 'setExpectedException' ] ) ) {
-			// PHPUnit 4.8
-			$this->setExpectedException( \InvalidArgumentException::class );
-		} else {
-			// PHPUnit 6+
-			$this->expectException( \InvalidArgumentException::class );
-		}
+		$this->expectException( \InvalidArgumentException::class );
 		new Hash( 'not an array' );
 	}
 
diff --git a/tests/Reader/PHPTest.php b/tests/Reader/PHPTest.php
@@ -27,27 +27,15 @@ protected function tearDown() : void {
 
 	// File can't be opened
 	public function testConstructorOpen() {
-		if ( is_callable( [ $this, 'setExpectedException' ] ) ) {
-			// PHPUnit 4.8
-			$this->setExpectedException( Exception::class );
-		} else {
-			// PHPUnit 6+
-			$this->expectException( Exception::class );
-		}
+		$this->expectException( Exception::class );
 		// Ignore native error from fopen()
 		// @codingStandardsIgnoreLine Generic.PHP.NoSilencedErrors
 		@new PHP( '/tmp/non-exist' );
 	}
 
 	// File contains fewer than 2048 bytes
 	public function testConstructorRead() {
-		if ( is_callable( [ $this, 'setExpectedException' ] ) ) {
-			// PHPUnit 4.8
-			$this->setExpectedException( Exception::class );
-		} else {
-			// PHPUnit 6+
-			$this->expectException( Exception::class );
-		}
+		$this->expectException( Exception::class );
 		new PHP( $this->cdbFile );
 	}
 }
