Merge branch '5.0RC'5.0

1 files changed, 2 insertions, 6 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php b/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
index 1e4b92197..bc36c6b78 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
@@ -72,19 +72,15 @@ class StringUtilTest extends \PHPUnit\Framework\TestCase
         ];
     }
 
-    /**
-     * @expectedException \Sabre\DAV\Exception\BadRequest
-     */
     public function testBadCollation()
     {
+        $this->expectException('Sabre\DAV\Exception\BadRequest');
         StringUtil::textMatch('foobar', 'foo', 'blabla', 'contains');
     }
 
-    /**
-     * @expectedException \Sabre\DAV\Exception\BadRequest
-     */
     public function testBadMatchType()
     {
+        $this->expectException('Sabre\DAV\Exception\BadRequest');
         StringUtil::textMatch('foobar', 'foo', 'i;octet', 'booh');
     }