tests: Use latest PHPUnit version

lippserd · lippserd · commit d5c87b1f664b · 2025-12-12T11:39:17.000+01:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -17,7 +17,6 @@ jobs:
     with:
       databases: true
       php-extensions: ldap
-      phpunit-version: 9.6
       dependencies: |
         {
           "./icinga-php/ipl"                : "https://github.com/Icinga/icinga-php-library.git#snapshot/nightly",
diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
@@ -165,7 +165,7 @@ public function getResponseMock()
          * @return  ConfigObject
          * @throws  RuntimeException
          */
-        protected function createDbConfigFor($name)
+        protected static function createDbConfigFor($name)
         {
             if (array_key_exists($name, self::$dbConfiguration)) {
                 $config = new ConfigObject(self::$dbConfiguration[$name]);
@@ -193,10 +193,10 @@ protected function createDbConfigFor($name)
          *
          * @return  array
          */
-        protected function createDbConnectionFor($name)
+        protected static function createDbConnectionFor($name)
         {
             try {
-                $conn = ResourceFactory::createResource($this->createDbConfigFor($name));
+                $conn = ResourceFactory::createResource(static::createDbConfigFor($name));
             } catch (Exception $e) {
                 $conn = $e->getMessage();
             }
@@ -211,29 +211,29 @@ protected function createDbConnectionFor($name)
          *
          * @return DbConnection
          */
-        public function mysqlDb()
+        public static function mysqlDb()
         {
-            return $this->createDbConnectionFor('mysql');
+            return static::createDbConnectionFor('mysql');
         }
 
         /**
          * PHPUnit provider for pgsql
          *
          * @return DbConnection
          */
-        public function pgsqlDb()
+        public static function pgsqlDb()
         {
-            return $this->createDbConnectionFor('pgsql');
+            return static::createDbConnectionFor('pgsql');
         }
 
         /**
          * PHPUnit provider for oracle
          *
          * @return DbConnection
          */
-        public function oracleDb()
+        public static function oracleDb()
         {
-            return $this->createDbConnectionFor('oracle');
+            return static::createDbConnectionFor('oracle');
         }
 
         /**
@@ -248,15 +248,15 @@ public function loadSql(DbConnection $resource, $filename)
         {
             if (!is_file($filename)) {
                 throw new RuntimeException(
-                    'Sql file not found: ' . $filename . ' (test=' . $this->getName() . ')'
+                    'Sql file not found: ' . $filename . ' (test=' . $this->name() . ')'
                 );
             }
 
             $sqlData = file_get_contents($filename);
 
             if (!$sqlData) {
                 throw new RuntimeException(
-                    'Sql file is empty: ' . $filename . ' (test=' . $this->getName() . ')'
+                    'Sql file is empty: ' . $filename . ' (test=' . $this->name() . ')'
                 );
             }
 
diff --git a/library/Icinga/Test/DbTest.php b/library/Icinga/Test/DbTest.php
@@ -12,21 +12,21 @@ interface DbTest
      *
      * @return DbConnection
      */
-    public function mysqlDb();
+    public static function mysqlDb();
 
     /**
      * PHPUnit provider for pgsql
      *
      * @return DbConnection
      */
-    public function pgsqlDb();
+    public static function pgsqlDb();
 
     /**
      * PHPUnit provider for oracle
      *
      * @return DbConnection
      */
-    public function oracleDb();
+    public static function oracleDb();
 
     /**
      * Executes sql file on PDO object
diff --git a/test/php/application/forms/Config/UserBackendReorderFormTest.php b/test/php/application/forms/Config/UserBackendReorderFormTest.php
@@ -7,7 +7,6 @@
 use Icinga\Application\Config;
 use Icinga\Forms\Config\UserBackendConfigForm;
 use Icinga\Forms\Config\UserBackendReorderForm;
-use Icinga\Application\Icinga;
 
 class UserBackendConfigFormWithoutSave extends UserBackendConfigForm
 {
@@ -30,7 +29,7 @@ public function getConfigForm()
     }
 }
 
-class AuthenticationBackendReorderFormTest extends BaseTestCase
+class UserBackendReorderFormTest extends BaseTestCase
 {
     public function testMoveBackend()
     {
diff --git a/test/php/library/Icinga/File/Storage/LocalFileStorageTest.php b/test/php/library/Icinga/File/Storage/LocalFileStorageTest.php
@@ -11,16 +11,11 @@
 
 class LocalFileStorageTest extends BaseTestCase
 {
-    /**
-     * @var int
-     */
-    protected $oldErrorReportingLevel;
+    protected static int $oldErrorReportingLevel;
 
-    public function __construct($name = null, array $data = array(), $dataName = '')
+    public static function setUpBeforeClass(): void
     {
-        parent::__construct($name, $data, $dataName);
-
-        $this->oldErrorReportingLevel = error_reporting();
+        static::$oldErrorReportingLevel = error_reporting();
         error_reporting(E_ALL);
 
         set_error_handler(function ($errno, $errstr, $errfile, $errline) {
@@ -40,9 +35,9 @@ public function __construct($name = null, array $data = array(), $dataName = '')
         });
     }
 
-    public function __destruct()
+    public static function tearDownAfterClass(): void
     {
-        error_reporting($this->oldErrorReportingLevel);
+        error_reporting(static::$oldErrorReportingLevel);
         restore_error_handler();
     }
 
diff --git a/test/php/library/Icinga/File/Storage/TemporaryLocalFileStorageTest.php b/test/php/library/Icinga/File/Storage/TemporaryLocalFileStorageTest.php
@@ -19,8 +19,8 @@ public function testDestructorRemovesFiles()
 
         $storage = null;
 
-        $this->assertFileNotExists($fooPath);
-        $this->assertFileNotExists($barPath);
+        $this->assertFileDoesNotExist($fooPath);
+        $this->assertFileDoesNotExist($barPath);
     }
 
     public function testDestructorRemovesDirectories()
@@ -32,7 +32,7 @@ public function testDestructorRemovesDirectories()
 
         $storage = null;
 
-        $this->assertDirectoryNotExists($dirPath);
+        $this->assertDirectoryDoesNotExist($dirPath);
     }
 
     public function testDestructorRemovesNestedDirectories()
@@ -46,6 +46,6 @@ public function testDestructorRemovesNestedDirectories()
 
         $storage = null;
 
-        $this->assertDirectoryNotExists($aPath);
+        $this->assertDirectoryDoesNotExist($aPath);
     }
 }
diff --git a/test/php/library/Icinga/Test/BaseTestCaseTest.php b/test/php/library/Icinga/Test/BaseTestCaseTest.php
@@ -5,6 +5,8 @@
 
 use Mockery;
 use Icinga\Test\BaseTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
 
 class BaseTestCaseTest extends BaseTestCase
 {
@@ -19,27 +21,21 @@ public function tearDown(): void
         }
     }
 
-    /**
-     * @dataProvider mysqlDb
-     */
+    #[DataProvider('mysqlDb')]
     public function testWhetherMySqlProviderAnnotationSetsUpZendDbAdapter($resource)
     {
         $this->setupDbProvider($resource);
         $this->assertInstanceOf('Zend_Db_Adapter_Pdo_Mysql', $resource->getDbAdapter());
     }
 
-    /**
-     * @dataProvider mysqlDb
-     */
+    #[DataProvider('mysqlDb')]
     public function testWhetherMySqlAdapterWorks($resource)
     {
         $this->setupDbProvider($resource);
         $this->dbAdapterSqlLoadTable($resource);
     }
 
-    /**
-     * @dataProvider mysqlDb
-     */
+    #[DataProvider('mysqlDb')]
     public function testWhetherCreatingTablesWithMySqlAdapterWorks($resource)
     {
         $this->setupDbProvider($resource);
@@ -50,10 +46,8 @@ public function testWhetherCreatingTablesWithMySqlAdapterWorks($resource)
         $this->assertCount(1, $tables);
     }
 
-    /**
-     * @dataProvider mysqlDb
-     * @depends testWhetherCreatingTablesWithMySqlAdapterWorks
-     */
+    #[DataProvider('mysqlDb')]
+    #[Depends('testWhetherCreatingTablesWithMySqlAdapterWorks')]
     public function testWhetherSetupDbProviderCleansUpMySqlAdapter($resource)
     {
         $this->setupDbProvider($resource);
@@ -62,27 +56,21 @@ public function testWhetherSetupDbProviderCleansUpMySqlAdapter($resource)
         $this->assertCount(0, $tables);
     }
 
-    /**
-     * @dataProvider pgsqlDb
-     */
+    #[DataProvider('pgsqlDb')]
     public function testWhetherPgSqlProviderAnnotationSetsUpZendDbAdapter($resource)
     {
         $this->setupDbProvider($resource);
         $this->assertInstanceOf('Zend_Db_Adapter_Pdo_Pgsql', $resource->getDbAdapter());
     }
 
-    /**
-     * @dataProvider pgsqlDb
-     */
+    #[DataProvider('pgsqlDb')]
     public function testWhetherPgSqlAdapterWorks($resource)
     {
         $this->setupDbProvider($resource);
         $this->dbAdapterSqlLoadTable($resource);
     }
 
-    /**
-     * @dataProvider pgsqlDb
-     */
+    #[DataProvider('pgsqlDb')]
     public function testWhetherCreatingTablesWithPgSqlAdapterWorks($resource)
     {
         $this->setupDbProvider($resource);
@@ -93,10 +81,8 @@ public function testWhetherCreatingTablesWithPgSqlAdapterWorks($resource)
         $this->assertCount(1, $tables);
     }
 
-    /**
-     * @dataProvider pgsqlDb
-     * @depends testWhetherCreatingTablesWithPgSqlAdapterWorks
-     */
+    #[DataProvider('pgsqlDb')]
+    #[Depends('testWhetherCreatingTablesWithPgSqlAdapterWorks')]
     public function testWhetherSetupDbProviderCleansUpPgSqlAdapter($resource)
     {
         $this->setupDbProvider($resource);
@@ -105,27 +91,21 @@ public function testWhetherSetupDbProviderCleansUpPgSqlAdapter($resource)
         $this->assertCount(0, $tables);
     }
 
-    /**
-     * @dataProvider oracleDb
-     */
+    #[DataProvider('oracleDb')]
     public function testWhetherOciProviderAnnotationSetsUpZendDbAdapter($resource)
     {
         $this->setupDbProvider($resource);
         $this->assertInstanceOf('Zend_Db_Adapter_Pdo_Oci', $resource->getDbAdapter());
     }
 
-    /**
-     * @dataProvider oracleDb
-     */
+    #[DataProvider('oracleDb')]
     public function testWhetherOciAdapterWorks($resource)
     {
         $this->setupDbProvider($resource);
         $this->dbAdapterSqlLoadTable($resource);
     }
 
-    /**
-     * @dataProvider oracleDb
-     */
+    #[DataProvider('oracleDb')]
     public function testWhetherCreatingTablesWithOciAdapterWorks($resource)
     {
         $this->setupDbProvider($resource);
@@ -136,10 +116,8 @@ public function testWhetherCreatingTablesWithOciAdapterWorks($resource)
         $this->assertCount(1, $tables);
     }
 
-    /**
-     * @dataProvider oracleDb
-     * @depends testWhetherCreatingTablesWithOciAdapterWorks
-     */
+    #[DataProvider('oracleDb')]
+    #[Depends('testWhetherCreatingTablesWithOciAdapterWorks')]
     public function testWhetherSetupDbProviderCleansUpOciAdapter($resource)
     {
         $this->setupDbProvider($resource);
diff --git a/test/php/library/Icinga/User/PreferencesTest.php b/test/php/library/Icinga/User/PreferencesTest.php
@@ -6,7 +6,7 @@
 use Icinga\User\Preferences;
 use Icinga\Test\BaseTestCase;
 
-class PreferfencesTest extends BaseTestCase
+class PreferencesTest extends BaseTestCase
 {
     public function testWhetherPreferencesCanBeSet()
     {
diff --git a/test/php/library/Icinga/Util/StringHelperTest.php b/test/php/library/Icinga/Util/StringHelperTest.php
@@ -6,7 +6,7 @@
 use Icinga\Test\BaseTestCase;
 use Icinga\Util\StringHelper;
 
-class StringTest extends BaseTestCase
+class StringHelperTest extends BaseTestCase
 {
     public function testWhetherTrimSplitReturnsACorrectValue()
     {
diff --git a/test/php/library/Icinga/Web/Session/PhpSessionTest.php b/test/php/library/Icinga/Web/Session/PhpSessionTest.php
@@ -15,7 +15,6 @@ private function getSession()
         }
         return PhpSession::create(
             array(
-                'use_cookies'   => false,
                 'save_path'     => '/tmp',
                 'test_session_name' => 'IcingawebUnittest'
             )
diff --git a/test/php/library/Icinga/Web/Widget/DashboardTest.php b/test/php/library/Icinga/Web/Widget/DashboardTest.php
@@ -7,11 +7,12 @@
 // of the global state (e.g. autoloaders are in the global state)
 require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
 
-use Mockery;
 use Icinga\Test\BaseTestCase;
 use Icinga\Web\Widget\Dashboard;
-use Icinga\Web\Widget\Dashboard\Pane;
 use Icinga\Web\Widget\Dashboard\Dashlet;
+use Icinga\Web\Widget\Dashboard\Pane;
+use Mockery;
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 
 class DashletWithMockedView extends Dashlet
 {
@@ -277,10 +278,9 @@ public function testWhetherDetermineActivePaneThrowsAnExceptionIfCouldNotDetermi
     }
 
     /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
      * @depends testWhetherCreatePaneCreatesAPane
      */
+    #[RunInSeparateProcess]
     public function testWhetherDetermineActivePaneThrowsAnExceptionIfCouldNotDetermineInvalidPane()
     {
         $this->expectException(\Icinga\Exception\ProgrammingError::class);
@@ -314,10 +314,9 @@ public function testWhetherDetermineActivePaneDeterminesActivePane()
     }
 
     /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
      * @depends testWhetherCreatePaneCreatesAPane
      */
+    #[RunInSeparateProcess]
     public function testWhetherDetermineActivePaneDeterminesActiveValidPane()
     {
         $dashboard = new DashboardWithPredefinableActiveName();

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ jobs:`
`17`	`17`	`with:`
`18`	`18`	`databases: true`
`19`	`19`	`php-extensions: ldap`
`20`		`- phpunit-version: 9.6`
`21`	`20`	`dependencies: \|`
`22`	`21`	`{`
`23`	`22`	`"./icinga-php/ipl" : "https://github.com/Icinga/icinga-php-library.git#snapshot/nightly",`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public function getResponseMock()`
`165`	`165`	`* @return ConfigObject`
`166`	`166`	`* @throws RuntimeException`
`167`	`167`	`*/`
`168`		`- protected function createDbConfigFor($name)`
	`168`	`+ protected static function createDbConfigFor($name)`
`169`	`169`	`{`
`170`	`170`	`if (array_key_exists($name, self::$dbConfiguration)) {`
`171`	`171`	`$config = new ConfigObject(self::$dbConfiguration[$name]);`
`@@ -193,10 +193,10 @@ protected function createDbConfigFor($name)`
`193`	`193`	`*`
`194`	`194`	`* @return array`
`195`	`195`	`*/`
`196`		`- protected function createDbConnectionFor($name)`
	`196`	`+ protected static function createDbConnectionFor($name)`
`197`	`197`	`{`
`198`	`198`	`try {`
`199`		`- $conn = ResourceFactory::createResource($this->createDbConfigFor($name));`
	`199`	`+ $conn = ResourceFactory::createResource(static::createDbConfigFor($name));`
`200`	`200`	`} catch (Exception $e) {`
`201`	`201`	`$conn = $e->getMessage();`
`202`	`202`	`}`
`@@ -211,29 +211,29 @@ protected function createDbConnectionFor($name)`
`211`	`211`	`*`
`212`	`212`	`* @return DbConnection`
`213`	`213`	`*/`
`214`		`- public function mysqlDb()`
	`214`	`+ public static function mysqlDb()`
`215`	`215`	`{`
`216`		`- return $this->createDbConnectionFor('mysql');`
	`216`	`+ return static::createDbConnectionFor('mysql');`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`/**`
`220`	`220`	`* PHPUnit provider for pgsql`
`221`	`221`	`*`
`222`	`222`	`* @return DbConnection`
`223`	`223`	`*/`
`224`		`- public function pgsqlDb()`
	`224`	`+ public static function pgsqlDb()`
`225`	`225`	`{`
`226`		`- return $this->createDbConnectionFor('pgsql');`
	`226`	`+ return static::createDbConnectionFor('pgsql');`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`/**`
`230`	`230`	`* PHPUnit provider for oracle`
`231`	`231`	`*`
`232`	`232`	`* @return DbConnection`
`233`	`233`	`*/`
`234`		`- public function oracleDb()`
	`234`	`+ public static function oracleDb()`
`235`	`235`	`{`
`236`		`- return $this->createDbConnectionFor('oracle');`
	`236`	`+ return static::createDbConnectionFor('oracle');`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`/**`
`@@ -248,15 +248,15 @@ public function loadSql(DbConnection $resource, $filename)`
`248`	`248`	`{`
`249`	`249`	`if (!is_file($filename)) {`
`250`	`250`	`throw new RuntimeException(`
`251`		`- 'Sql file not found: ' . $filename . ' (test=' . $this->getName() . ')'`
	`251`	`+ 'Sql file not found: ' . $filename . ' (test=' . $this->name() . ')'`
`252`	`252`	`);`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`$sqlData = file_get_contents($filename);`
`256`	`256`
`257`	`257`	`if (!$sqlData) {`
`258`	`258`	`throw new RuntimeException(`
`259`		`- 'Sql file is empty: ' . $filename . ' (test=' . $this->getName() . ')'`
	`259`	`+ 'Sql file is empty: ' . $filename . ' (test=' . $this->name() . ')'`
`260`	`260`	`);`
`261`	`261`	`}`
`262`	`262`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`use Icinga\Application\Config;`
`8`	`8`	`use Icinga\Forms\Config\UserBackendConfigForm;`
`9`	`9`	`use Icinga\Forms\Config\UserBackendReorderForm;`
`10`		`-use Icinga\Application\Icinga;`
`11`	`10`
`12`	`11`	`class UserBackendConfigFormWithoutSave extends UserBackendConfigForm`
`13`	`12`	`{`
`@@ -30,7 +29,7 @@ public function getConfigForm()`
`30`	`29`	`}`
`31`	`30`	`}`
`32`	`31`
`33`		`-class AuthenticationBackendReorderFormTest extends BaseTestCase`
	`32`	`+class UserBackendReorderFormTest extends BaseTestCase`
`34`	`33`	`{`
`35`	`34`	`public function testMoveBackend()`
`36`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,16 +11,11 @@`
`11`	`11`
`12`	`12`	`class LocalFileStorageTest extends BaseTestCase`
`13`	`13`	`{`
`14`		`- /**`
`15`		`- * @var int`
`16`		`- */`
`17`		`- protected $oldErrorReportingLevel;`
	`14`	`+ protected static int $oldErrorReportingLevel;`
`18`	`15`
`19`		`- public function __construct($name = null, array $data = array(), $dataName = '')`
	`16`	`+ public static function setUpBeforeClass(): void`
`20`	`17`	`{`
`21`		`- parent::__construct($name, $data, $dataName);`
`22`		`-`
`23`		`- $this->oldErrorReportingLevel = error_reporting();`
	`18`	`+ static::$oldErrorReportingLevel = error_reporting();`
`24`	`19`	`error_reporting(E_ALL);`
`25`	`20`
`26`	`21`	`set_error_handler(function ($errno, $errstr, $errfile, $errline) {`
`@@ -40,9 +35,9 @@ public function __construct($name = null, array $data = array(), $dataName = '')`
`40`	`35`	`});`
`41`	`36`	`}`
`42`	`37`
`43`		`- public function __destruct()`
	`38`	`+ public static function tearDownAfterClass(): void`
`44`	`39`	`{`
`45`		`- error_reporting($this->oldErrorReportingLevel);`
	`40`	`+ error_reporting(static::$oldErrorReportingLevel);`
`46`	`41`	`restore_error_handler();`
`47`	`42`	`}`
`48`	`43`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ public function testDestructorRemovesFiles()`
`19`	`19`
`20`	`20`	`$storage = null;`
`21`	`21`
`22`		`- $this->assertFileNotExists($fooPath);`
`23`		`- $this->assertFileNotExists($barPath);`
	`22`	`+ $this->assertFileDoesNotExist($fooPath);`
	`23`	`+ $this->assertFileDoesNotExist($barPath);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function testDestructorRemovesDirectories()`
`@@ -32,7 +32,7 @@ public function testDestructorRemovesDirectories()`
`32`	`32`
`33`	`33`	`$storage = null;`
`34`	`34`
`35`		`- $this->assertDirectoryNotExists($dirPath);`
	`35`	`+ $this->assertDirectoryDoesNotExist($dirPath);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public function testDestructorRemovesNestedDirectories()`
`@@ -46,6 +46,6 @@ public function testDestructorRemovesNestedDirectories()`
`46`	`46`
`47`	`47`	`$storage = null;`
`48`	`48`
`49`		`- $this->assertDirectoryNotExists($aPath);`
	`49`	`+ $this->assertDirectoryDoesNotExist($aPath);`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`use Mockery;`
`7`	`7`	`use Icinga\Test\BaseTestCase;`
	`8`	`+use PHPUnit\Framework\Attributes\DataProvider;`
	`9`	`+use PHPUnit\Framework\Attributes\Depends;`
`8`	`10`
`9`	`11`	`class BaseTestCaseTest extends BaseTestCase`
`10`	`12`	`{`
`@@ -19,27 +21,21 @@ public function tearDown(): void`
`19`	`21`	`}`
`20`	`22`	`}`
`21`	`23`
`22`		`- /**`
`23`		`- * @dataProvider mysqlDb`
`24`		`- */`
	`24`	`+ #[DataProvider('mysqlDb')]`
`25`	`25`	`public function testWhetherMySqlProviderAnnotationSetsUpZendDbAdapter($resource)`
`26`	`26`	`{`
`27`	`27`	`$this->setupDbProvider($resource);`
`28`	`28`	`$this->assertInstanceOf('Zend_Db_Adapter_Pdo_Mysql', $resource->getDbAdapter());`
`29`	`29`	`}`
`30`	`30`
`31`		`- /**`
`32`		`- * @dataProvider mysqlDb`
`33`		`- */`
	`31`	`+ #[DataProvider('mysqlDb')]`
`34`	`32`	`public function testWhetherMySqlAdapterWorks($resource)`
`35`	`33`	`{`
`36`	`34`	`$this->setupDbProvider($resource);`
`37`	`35`	`$this->dbAdapterSqlLoadTable($resource);`
`38`	`36`	`}`
`39`	`37`
`40`		`- /**`
`41`		`- * @dataProvider mysqlDb`
`42`		`- */`
	`38`	`+ #[DataProvider('mysqlDb')]`
`43`	`39`	`public function testWhetherCreatingTablesWithMySqlAdapterWorks($resource)`
`44`	`40`	`{`
`45`	`41`	`$this->setupDbProvider($resource);`
`@@ -50,10 +46,8 @@ public function testWhetherCreatingTablesWithMySqlAdapterWorks($resource)`
`50`	`46`	`$this->assertCount(1, $tables);`
`51`	`47`	`}`
`52`	`48`
`53`		`- /**`
`54`		`- * @dataProvider mysqlDb`
`55`		`- * @depends testWhetherCreatingTablesWithMySqlAdapterWorks`
`56`		`- */`
	`49`	`+ #[DataProvider('mysqlDb')]`
	`50`	`+ #[Depends('testWhetherCreatingTablesWithMySqlAdapterWorks')]`
`57`	`51`	`public function testWhetherSetupDbProviderCleansUpMySqlAdapter($resource)`
`58`	`52`	`{`
`59`	`53`	`$this->setupDbProvider($resource);`
`@@ -62,27 +56,21 @@ public function testWhetherSetupDbProviderCleansUpMySqlAdapter($resource)`
`62`	`56`	`$this->assertCount(0, $tables);`
`63`	`57`	`}`
`64`	`58`
`65`		`- /**`
`66`		`- * @dataProvider pgsqlDb`
`67`		`- */`
	`59`	`+ #[DataProvider('pgsqlDb')]`
`68`	`60`	`public function testWhetherPgSqlProviderAnnotationSetsUpZendDbAdapter($resource)`
`69`	`61`	`{`
`70`	`62`	`$this->setupDbProvider($resource);`
`71`	`63`	`$this->assertInstanceOf('Zend_Db_Adapter_Pdo_Pgsql', $resource->getDbAdapter());`
`72`	`64`	`}`
`73`	`65`
`74`		`- /**`
`75`		`- * @dataProvider pgsqlDb`
`76`		`- */`
	`66`	`+ #[DataProvider('pgsqlDb')]`
`77`	`67`	`public function testWhetherPgSqlAdapterWorks($resource)`
`78`	`68`	`{`
`79`	`69`	`$this->setupDbProvider($resource);`
`80`	`70`	`$this->dbAdapterSqlLoadTable($resource);`
`81`	`71`	`}`
`82`	`72`
`83`		`- /**`
`84`		`- * @dataProvider pgsqlDb`
`85`		`- */`
	`73`	`+ #[DataProvider('pgsqlDb')]`
`86`	`74`	`public function testWhetherCreatingTablesWithPgSqlAdapterWorks($resource)`
`87`	`75`	`{`
`88`	`76`	`$this->setupDbProvider($resource);`
`@@ -93,10 +81,8 @@ public function testWhetherCreatingTablesWithPgSqlAdapterWorks($resource)`
`93`	`81`	`$this->assertCount(1, $tables);`
`94`	`82`	`}`
`95`	`83`
`96`		`- /**`
`97`		`- * @dataProvider pgsqlDb`
`98`		`- * @depends testWhetherCreatingTablesWithPgSqlAdapterWorks`
`99`		`- */`
	`84`	`+ #[DataProvider('pgsqlDb')]`
	`85`	`+ #[Depends('testWhetherCreatingTablesWithPgSqlAdapterWorks')]`
`100`	`86`	`public function testWhetherSetupDbProviderCleansUpPgSqlAdapter($resource)`
`101`	`87`	`{`
`102`	`88`	`$this->setupDbProvider($resource);`
`@@ -105,27 +91,21 @@ public function testWhetherSetupDbProviderCleansUpPgSqlAdapter($resource)`
`105`	`91`	`$this->assertCount(0, $tables);`
`106`	`92`	`}`
`107`	`93`
`108`		`- /**`
`109`		`- * @dataProvider oracleDb`
`110`		`- */`
	`94`	`+ #[DataProvider('oracleDb')]`
`111`	`95`	`public function testWhetherOciProviderAnnotationSetsUpZendDbAdapter($resource)`
`112`	`96`	`{`
`113`	`97`	`$this->setupDbProvider($resource);`
`114`	`98`	`$this->assertInstanceOf('Zend_Db_Adapter_Pdo_Oci', $resource->getDbAdapter());`
`115`	`99`	`}`
`116`	`100`
`117`		`- /**`
`118`		`- * @dataProvider oracleDb`
`119`		`- */`
	`101`	`+ #[DataProvider('oracleDb')]`
`120`	`102`	`public function testWhetherOciAdapterWorks($resource)`
`121`	`103`	`{`
`122`	`104`	`$this->setupDbProvider($resource);`
`123`	`105`	`$this->dbAdapterSqlLoadTable($resource);`
`124`	`106`	`}`
`125`	`107`
`126`		`- /**`
`127`		`- * @dataProvider oracleDb`
`128`		`- */`
	`108`	`+ #[DataProvider('oracleDb')]`
`129`	`109`	`public function testWhetherCreatingTablesWithOciAdapterWorks($resource)`
`130`	`110`	`{`
`131`	`111`	`$this->setupDbProvider($resource);`
`@@ -136,10 +116,8 @@ public function testWhetherCreatingTablesWithOciAdapterWorks($resource)`
`136`	`116`	`$this->assertCount(1, $tables);`
`137`	`117`	`}`
`138`	`118`
`139`		`- /**`
`140`		`- * @dataProvider oracleDb`
`141`		`- * @depends testWhetherCreatingTablesWithOciAdapterWorks`
`142`		`- */`
	`119`	`+ #[DataProvider('oracleDb')]`
	`120`	`+ #[Depends('testWhetherCreatingTablesWithOciAdapterWorks')]`
`143`	`121`	`public function testWhetherSetupDbProviderCleansUpOciAdapter($resource)`
`144`	`122`	`{`
`145`	`123`	`$this->setupDbProvider($resource);`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use Icinga\User\Preferences;`
`7`	`7`	`use Icinga\Test\BaseTestCase;`
`8`	`8`
`9`		`-class PreferfencesTest extends BaseTestCase`
	`9`	`+class PreferencesTest extends BaseTestCase`
`10`	`10`	`{`
`11`	`11`	`public function testWhetherPreferencesCanBeSet()`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use Icinga\Test\BaseTestCase;`
`7`	`7`	`use Icinga\Util\StringHelper;`
`8`	`8`
`9`		`-class StringTest extends BaseTestCase`
	`9`	`+class StringHelperTest extends BaseTestCase`
`10`	`10`	`{`
`11`	`11`	`public function testWhetherTrimSplitReturnsACorrectValue()`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ private function getSession()`
`15`	`15`	`}`
`16`	`16`	`return PhpSession::create(`
`17`	`17`	`array(`
`18`		`- 'use_cookies' => false,`
`19`	`18`	`'save_path' => '/tmp',`
`20`	`19`	`'test_session_name' => 'IcingawebUnittest'`
`21`	`20`	`)`