Remove derprecaed phpunit code

webmozarts · Jan 18, 2021 · baa9848 · baa9848
1 parent b1dcb28
commit baa9848
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 33 deletions.
diff --git a/tests/AssertTest.php b/tests/AssertTest.php
@@ -598,7 +598,7 @@ public function testAssert($method, $args, $success, $multibyte = false, $minVer
         }
 
         if (!$success) {
-            $this->setExpectedException('\InvalidArgumentException');
+            $this->expectException('\InvalidArgumentException');
         }
 
         call_user_func_array(array('Webmozart\Assert\Assert', $method), $args);
@@ -620,7 +620,7 @@ public function testNullOr($method, $args, $success, $multibyte = false, $minVer
         }
 
         if (!$success && null !== reset($args)) {
-            $this->setExpectedException('\InvalidArgumentException');
+            $this->expectException('\InvalidArgumentException');
         }
 
         call_user_func_array(array('Webmozart\Assert\Assert', 'nullOr'.ucfirst($method)), $args);
@@ -651,7 +651,7 @@ public function testAllArray($method, $args, $success, $multibyte = false, $minV
         }
 
         if (!$success) {
-            $this->setExpectedException('\InvalidArgumentException');
+            $this->expectException('\InvalidArgumentException');
         }
 
         $arg = array_shift($args);
@@ -676,7 +676,7 @@ public function testAllTraversable($method, $args, $success, $multibyte = false,
         }
 
         if (!$success) {
-            $this->setExpectedException('\InvalidArgumentException');
+            $this->expectException('\InvalidArgumentException');
         }
 
         $arg = array_shift($args);
@@ -716,14 +716,15 @@ public function getStringConversions()
      */
     public function testConvertValuesToStrings($method, $args, $exceptionMessage)
     {
-        $this->setExpectedException('\InvalidArgumentException', $exceptionMessage);
+        $this->expectException('\InvalidArgumentException', $exceptionMessage);
+        $this->expectExceptionMessage($exceptionMessage);
 
         call_user_func_array(array('Webmozart\Assert\Assert', $method), $args);
     }
 
     public function testAnUnknownMethodThrowsABadMethodCall()
     {
-        $this->setExpectedException('\BadMethodCallException');
+        $this->expectException('\BadMethodCallException');
 
         Assert::nonExistentMethod();
     }

diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
@@ -9,30 +9,4 @@
  */
 class BaseTestCase extends TestCase
 {
-    /**
-     * The setExpectedException got removed in later phpunit versions,
-     * and instead it got split up into three functions.
-     *
-     * So if the newer functions exist we call those where needed, and otherwise
-     * we just use the original function.
-     *
-     * @param string $exceptionName
-     * @param string $exceptionMessage
-     * @param int $exceptionCode
-     */
-    public function setExpectedException($exceptionName, $exceptionMessage = '', $exceptionCode = null)
-    {
-        if (method_exists($this, 'expectException')) {
-            $this->expectException($exceptionName);
-            if ($exceptionMessage) {
-                $this->expectExceptionMessage($exceptionMessage);
-            }
-            if ($exceptionCode) {
-                $this->expectExceptionCode($exceptionCode);
-            }
-
-            return;
-        }
-        parent::setExpectedException($exceptionName, $exceptionMessage, $exceptionCode);
-    }
 }
diff --git a/tests/ProjectCodeTest.php b/tests/ProjectCodeTest.php
@@ -119,7 +119,7 @@ public function testHasThrowsAnnotation($method)
             )
         );
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '@throws InvalidArgumentException',
             $doc,
             sprintf(