Adding upstream version 1.11.1.upstream/1.11.1upstream

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

2 files changed, 11 insertions, 10 deletions

diff --git a/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php b/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
index 506f3b8..10cd644 100644
--- a/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
+++ b/test/php/library/Director/IcingaConfig/IcingaConfigHelperTest.php
@@ -18,11 +18,10 @@ class IcingaConfigHelperTest extends BaseTestCase
         $this->assertEquals(c::parseInterval('1h 5m 60s'), 3960);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testWhetherInvalidIntervalStringRaisesException()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         c::parseInterval('1h 5m 60x');
     }
 
diff --git a/test/php/library/Director/IcingaConfig/StateFilterTest.php b/test/php/library/Director/IcingaConfig/StateFilterTest.php
index 82e94d8..2c997bd 100644
--- a/test/php/library/Director/IcingaConfig/StateFilterTest.php
+++ b/test/php/library/Director/IcingaConfig/StateFilterTest.php
@@ -2,6 +2,8 @@
 
 namespace Tests\Icinga\Module\Director\IcingaConfig;
 
+use Icinga\Exception\InvalidPropertyException;
+use Icinga\Exception\ProgrammingError;
 use Icinga\Module\Director\IcingaConfig\StateFilterSet;
 use Icinga\Module\Director\Objects\IcingaUser;
 use Icinga\Module\Director\Test\BaseTestCase;
@@ -23,19 +25,17 @@ class StateFilterSetTest extends BaseTestCase
         );
     }
 
-    /**
-     * @expectedException \Icinga\Exception\InvalidPropertyException
-     */
     public function testFailsForInvalidProperties()
     {
+        $this->expectException(InvalidPropertyException::class);
+
         $set = new StateFilterSet('bla');
     }
 
-    /**
-     * @expectedException \Icinga\Exception\ProgrammingError
-     */
     public function testCannotBeStoredForAnUnstoredUser()
     {
+        $this->expectException(ProgrammingError::class);
+
         StateFilterSet::forIcingaObject(
             $this->user1(),
             'states'
@@ -152,7 +152,7 @@ class StateFilterSetTest extends BaseTestCase
         ));
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         if ($this->hasDb()) {
             $users = array(
@@ -167,5 +167,7 @@ class StateFilterSetTest extends BaseTestCase
                 }
             }
         }
+
+        parent::tearDown();
     }
 }