Adding upstream version 1.11.1.upstream/1.11.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 3 insertions, 4 deletions

diff --git a/test/php/library/Director/Data/AssignFilterHelperTest.php b/test/php/library/Director/Data/AssignFilterHelperTest.php
index 5fcdd95..e7c2f84 100644
--- a/test/php/library/Director/Data/AssignFilterHelperTest.php
+++ b/test/php/library/Director/Data/AssignFilterHelperTest.php
@@ -11,7 +11,7 @@ class AssignFilterHelperTest extends BaseTestCase
 {
     protected static $exampleHost;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$exampleHost = (object) [
             'address'              => '127.0.0.1',
diff --git a/test/php/library/Director/Data/RecursiveUtf8ValidatorTest.php b/test/php/library/Director/Data/RecursiveUtf8ValidatorTest.php
index 1434d4a..9b4bf33 100644
--- a/test/php/library/Director/Data/RecursiveUtf8ValidatorTest.php
+++ b/test/php/library/Director/Data/RecursiveUtf8ValidatorTest.php
@@ -7,11 +7,10 @@ use Icinga\Module\Director\Test\BaseTestCase;
 
 class RecursiveUtf8ValidatorTest extends BaseTestCase
 {
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testDetectInvalidUtf8Character()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         RecursiveUtf8Validator::validateRows([
             (object) [
                 'name'  => 'test 1',