Description: Adapt to PHPUnit 8.x and 9.x API.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/TestCase.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/TestCase.php
@@ -24,7 +24,7 @@
  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
  */
 class Horde_Kolab_Format_TestCase
-extends PHPUnit_Framework_TestCase
+extends Horde_Test_Case
 {
     private $_factory;
 
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/DateTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/DateTest.php
@@ -28,15 +28,15 @@
  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
  */
 class Horde_Kolab_Format_Unit_DateTest
-extends PHPUnit_Framework_TestCase
+extends Horde_Test_Case
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->_oldTimezone = date_default_timezone_get();
         date_default_timezone_set('Europe/Berlin');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         date_default_timezone_set($this->_oldTimezone);
     }
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Exception/MissingUidTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Exception/MissingUidTest.php
@@ -28,7 +28,7 @@
  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
  */
 class Horde_Kolab_Format_Unit_Exception_MissingUidTest
-extends PHPUnit_Framework_TestCase
+extends Horde_Test_Case
 {
     public function testMissingUidTest()
     {
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Exception/MissingValueTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Exception/MissingValueTest.php
@@ -28,7 +28,7 @@
  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
  */
 class Horde_Kolab_Format_Unit_Exception_MissingValueTest
-extends PHPUnit_Framework_TestCase
+extends Horde_Test_Case
 {
     public function testMissingValueTest()
     {
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Exception/ParseErrorTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Exception/ParseErrorTest.php
@@ -28,7 +28,7 @@
  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
  */
 class Horde_Kolab_Format_Unit_Exception_ParseErrorTest
-extends PHPUnit_Framework_TestCase
+extends Horde_Test_Case
 {
     public function testParseError()
     {
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/FactoryTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/FactoryTest.php
@@ -28,7 +28,7 @@
  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
  */
 class Horde_Kolab_Format_Unit_FactoryTest
-extends PHPUnit_Framework_TestCase
+extends Horde_Test_Case
 {
     public function testFactory()
     {
@@ -84,20 +84,16 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testFactoryException()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $factory = new Horde_Kolab_Format_Factory();
         $factory->create('UNKNOWN', 'contact');
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testUnknownFormatException()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $factory = new Horde_Kolab_Format_Factory();
         $factory->create('Exception', 'InvalidRoot');
     }
@@ -183,11 +179,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testTypeMissing()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $factory = new Horde_Kolab_Format_Factory();
         $factory->createXmlType('Horde_Kolab_Format_Stub_Types_NOSUCH');
     }
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/EnvelopeTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/EnvelopeTest.php
@@ -28,11 +28,11 @@
  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
  */
 class Horde_Kolab_Format_Unit_Xml_EnvelopeTest
-extends PHPUnit_Framework_TestCase
+extends Horde_Test_Case
 {
     public function testSave()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<uid>test</uid>',
             $this->_getEnvelope()->save(
                 array('uid' => 'test', 'type' => 'test')
@@ -40,12 +40,10 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testMissingType()
     {
-        $this->assertContains(
+        $this->expectException('Horde_Kolab_Format_Exception');
+        $this->assertStringContainsString(
             '<uid>test</uid>',
             $this->_getEnvelope()->save(array('uid' => 'test'))
         );
@@ -53,7 +51,7 @@
 
     public function testType()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<test version="1.0">',
             $this->_getEnvelope()->save(
                 array('uid' => 'test', 'type' => 'test')
@@ -63,7 +61,7 @@
 
     public function testXml()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<testelement/>',
             $this->_getEnvelope()->save(
                 array('uid' => 'test', 'type' => 'test', 'xml' => '<testelement/>')
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/ParserTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/ParserTest.php
@@ -28,7 +28,7 @@
  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
  */
 class Horde_Kolab_Format_Unit_Xml_ParserTest
-extends PHPUnit_Framework_TestCase
+extends Horde_Test_Case
 {
     public function testParseString()
     {
@@ -41,11 +41,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_ParseError
-     */
     public function testParseMissingChild()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_ParseError');
         $parser = new Horde_Kolab_Format_Xml_Parser(
             new DOMDocument('1.0', 'UTF-8')
         );
@@ -82,11 +80,9 @@
         $this->assertInstanceOf('DOMDocument', $parser->parse($data));
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_ParseError
-     */
     public function testParseUmlautWrongEncoding()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_ParseError');
         $data = fopen('php://temp', 'r+');
         fwrite($data, "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\n<kolab><ä/></kolab>");
         $parser = new Horde_Kolab_Format_Xml_Parser(
@@ -95,11 +91,9 @@
         $parser->parse($data);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_ParseError
-     */
     public function testSecondParseAttemptBroken()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_ParseError');
         $parser = new Horde_Kolab_Format_Xml_Parser(
             new DOMDocument('1.0', 'UTF-8')
         );
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/DateTimeTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/DateTimeTest.php
@@ -30,7 +30,7 @@
 class Horde_Kolab_Format_Unit_Xml_Type_DateTimeTest
 extends Horde_Kolab_Format_TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         date_default_timezone_set('Europe/Berlin');
     }
@@ -68,11 +68,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testLoadEmptyDateTime()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0"><datetime></datetime></kolab>'
@@ -96,11 +94,9 @@
         $this->assertInstanceOf('DateTime', $attributes['datetime']['date']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testLoadNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $this->loadWithClass('Horde_Kolab_Format_Stub_DateTimeNotEmpty');
     }
 
@@ -176,11 +172,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testSaveNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $this->saveWithClass('Horde_Kolab_Format_Stub_DateTimeNotEmpty');
     }
 
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/XmlTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/XmlTest.php
@@ -28,13 +28,11 @@
  * @link       http://www.horde.org/libraries/Horde_Kolab_Format
  */
 class Horde_Kolab_Format_Unit_XmlTest
-extends PHPUnit_Framework_TestCase
+extends Horde_Test_Case
 {
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingUid
-     */
     public function testMissingUid()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingUid');
         $factory = new Horde_Kolab_Format_Factory();
         $note = $factory->create('Xml', 'Note');
         $note->save(array());
@@ -44,7 +42,7 @@
     {
         $factory = new Horde_Kolab_Format_Factory();
         $note = $factory->create('Xml', 'Note');
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<note version="1.0">',
             $note->save(array('uid' => 'test'))
         );
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Integration/XmlTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Integration/XmlTest.php
@@ -32,7 +32,7 @@
 {
     public function testBasic()
     {
-        $this->assertContains(
+        $this->assertStringContainsStringIgnoringCase(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0">
   <body></body>
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Decorator/MemoryTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Decorator/MemoryTest.php
@@ -32,6 +32,7 @@
 {
     public function testConstructor()
     {
+        $this->expectNotToPerformAssertions();
         $this->getFactory()->create(
             'XML', 'contact', array('memlog' => true)
         );
@@ -42,7 +43,7 @@
         $timed = $this->_getMemoryMock();
         $a = '';
         $timed->load($a);
-        $this->assertContains(
+        $this->assertStringContainsString(
             'Kolab Format data parsing complete. Memory usage:',
             array_pop($this->logger->log)
         );
@@ -53,7 +54,7 @@
         $timed = $this->_getMemoryMock();
         $a = array();
         $timed->save($a);
-        $this->assertContains(
+        $this->assertStringContainsString(
             'Kolab Format data generation complete. Memory usage:',
             array_pop($this->logger->log)
         );
@@ -63,7 +64,8 @@
     {
         $this->logger = new Horde_Kolab_Format_Stub_Log();
         return new Horde_Kolab_Format_Decorator_Memory(
-            $this->getMock('Horde_Kolab_Format'),
+            $this->getMockBuilder('Horde_Kolab_Format')
+                 ->getMock(),
             new Horde_Support_Memory(),
             $this->logger
         );
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Decorator/TimedTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Decorator/TimedTest.php
@@ -32,6 +32,7 @@
 {
     public function testConstructor()
     {
+        $this->expectNotToPerformAssertions();
         $this->getFactory()->create(
             'XML', 'contact', array('timelog' => true)
         );
@@ -42,8 +43,7 @@
         $timed = $this->_getTimedMock();
         $a = '';
         $timed->load($a);
-        $this->assertInternalType(
-            'float',
+        $this->assertIsFloat(
             $timed->timeSpent()
         );
     }
@@ -65,7 +65,7 @@
         $timed = $this->_getTimedMock();
         $a = '';
         $timed->load($a);
-        $this->assertContains(
+        $this->assertStringContainsString(
             'Kolab Format data parsing complete. Time spent:',
             array_pop($this->logger->log)
         );
@@ -76,7 +76,7 @@
         $timed = $this->_getTimedMock();
         $a = array();
         $timed->save($a);
-        $this->assertContains(
+        $this->assertStringContainsString(
             'Kolab Format data generation complete. Time spent:',
             array_pop($this->logger->log)
         );
@@ -84,8 +84,10 @@
 
     public function testNoLog()
     {
+        $this->expectNotToPerformAssertions();
         $timed = new Horde_Kolab_Format_Decorator_Timed(
-            $this->getMock('Horde_Kolab_Format'),
+            $this->getMockBuilder('Horde_Kolab_Format')
+                 ->getMock(),
             new Horde_Support_Timer(),
             true
         );
@@ -97,7 +99,8 @@
     {
         $this->logger = new Horde_Kolab_Format_Stub_Log();
         return new Horde_Kolab_Format_Decorator_Timed(
-            $this->getMock('Horde_Kolab_Format'),
+            $this->getMockBuilder('Horde_Kolab_Format')
+                 ->getMock(),
             new Horde_Support_Timer(),
             $this->logger
         );
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/BooleanTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/BooleanTest.php
@@ -74,11 +74,9 @@
         $this->assertTrue($attributes['boolean']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testLoadNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $this->loadWithClass('Horde_Kolab_Format_Stub_BooleanNotEmpty');
     }
 
@@ -143,19 +141,15 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testSaveNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $this->saveWithClass('Horde_Kolab_Format_Stub_BooleanNotEmpty');
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testSaveInvalidBoolean()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $this->saveWithClass(
             'Horde_Kolab_Format_Stub_IntegerNotEmpty',
             null,
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/ColorTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/ColorTest.php
@@ -75,11 +75,9 @@
         $this->assertEquals('#abcdef', $attributes['color']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testLoadInvalid()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0"><color>#09aFAfD</color>c</kolab>',
@@ -141,11 +139,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testSaveNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         list($helper, $root_node, $type) = $this->getXmlType(
             'Horde_Kolab_Format_Stub_ColorNotEmpty',
             '<?xml version="1.0" encoding="UTF-8"?>
@@ -158,11 +154,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testSaveInvalidColor()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $this->saveToXml(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0"/>',
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/CompositeTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/CompositeTest.php
@@ -60,11 +60,9 @@
         $this->assertEquals(array('X' => 'Y'), $attributes['composite']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testLoadNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0"/>',
@@ -152,11 +150,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testSaveNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $this->saveToXml(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0"/>',
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/CreationDateTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/CreationDateTest.php
@@ -53,11 +53,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testLoadInvalidCreationDateValue()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0" a="b"><creation-date>2011A-06-28T08:42:11Z</creation-date>c</kolab>',
@@ -135,11 +133,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testSaveFailsOverwritingOldValue()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $this->saveToXml(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0" a="b"><creation-date type="strange"><b/>1970-01-01T00:00:00Z<a/></creation-date>c</kolab>',
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/IntegerTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/IntegerTest.php
@@ -39,11 +39,9 @@
         $this->assertSame(1, $attributes['integer']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testLoadStrangeInteger()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0" a="b"><integer type="strange"><b/>false<a/></integer>c</kolab>'
@@ -67,11 +65,9 @@
         $this->assertSame(10, $attributes['integer']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testLoadNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $this->loadWithClass('Horde_Kolab_Format_Stub_IntegerNotEmpty');
     }
 
@@ -123,19 +119,15 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testSaveNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $this->saveWithClass('Horde_Kolab_Format_Stub_IntegerNotEmpty');
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testSaveInvalidInteger()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $this->saveWithClass(
             'Horde_Kolab_Format_Stub_IntegerNotEmpty',
             null,
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/MultipleTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/MultipleTest.php
@@ -72,11 +72,9 @@
         $this->assertEquals(array('X'), $attributes['string']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testLoadNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $params = array();
         list($helper, $root_node, $type) = $this->getXmlType(
             'Horde_Kolab_Format_Stub_MultipleNotEmpty',
@@ -161,11 +159,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testSaveNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $params = array();
         list($helper, $root_node, $type) = $this->getXmlType(
             'Horde_Kolab_Format_Stub_MultipleNotEmpty'
@@ -175,11 +171,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testSaveInvalidMultiple()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $params = array('relaxed' => false);
         list($helper, $root_node, $type) = $this->getXmlType(
             'Horde_Kolab_Format_Xml_Type_Multiple_Boolean'
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/PrefsApplicationTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/PrefsApplicationTest.php
@@ -60,11 +60,9 @@
         $this->assertEquals('STRANGE', $attributes['application']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testLoadEmptyApplication()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0"><application></application></kolab>',
@@ -72,11 +70,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testLoadMissingApplication()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0"/>',
@@ -84,11 +80,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testLoadNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0"/>',
@@ -150,11 +144,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testSaveNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $this->saveToXml(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0"/>',
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/RecurrenceTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/RecurrenceTest.php
@@ -30,11 +30,9 @@
 class Horde_Kolab_Format_Unit_Xml_Type_RecurrenceTest
 extends Horde_Kolab_Format_TestCase
 {
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testEmptyInterval()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0" a="b"><recurrence>TEST</recurrence>c</kolab>'
@@ -42,11 +40,9 @@
         $this->assertEquals(array(), $attributes['recurrence']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_ParseError
-     */
     public function testIntervalBelowZero()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_ParseError');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0" a="b"><recurrence><interval>-1</interval>TEST</recurrence>c</kolab>'
@@ -54,22 +50,18 @@
         $this->assertEquals(array(), $attributes['recurrence']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_ParseError
-     */
     public function testMissingCycle()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_ParseError');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0" a="b"><recurrence><interval>2</interval>TEST</recurrence>c</kolab>'
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_ParseError
-     */
     public function testMissingWeekday()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_ParseError');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0" a="b"><recurrence cycle="weekly"><interval>1</interval>TEST</recurrence>c</kolab>'
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/RootTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/RootTest.php
@@ -39,11 +39,9 @@
         $this->assertEquals('A', $attributes['uid']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_InvalidRoot
-     */
     public function testMissingRootNode()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_InvalidRoot');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?><test/>'
         );
@@ -68,11 +66,9 @@
         $this->assertEquals('1', $attributes['_api-version']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_InvalidRoot
-     */
     public function testLoadHigherVersion()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_InvalidRoot');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="2.0" a="b">c</kolab>'
@@ -139,11 +135,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_InvalidRoot
-     */
     public function testOverwriteHigherVersion()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_InvalidRoot');
         $this->saveToXml(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="2.0" a="b">c</kolab>',
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/StringTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/StringTest.php
@@ -72,11 +72,9 @@
         $this->assertEquals('DEFAULT', $attributes['string']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testLoadNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $this->loadWithClass('Horde_Kolab_Format_Stub_StringNotEmpty');
     }
 
@@ -130,11 +128,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingValue
-     */
     public function testSaveNotEmpty()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingValue');
         $this->saveWithClass('Horde_Kolab_Format_Stub_StringNotEmpty');
     }
 
--- a/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/UidTest.php
+++ b/Horde_Kolab_Format-2.0.9/test/Horde/Kolab/Format/Unit/Xml/Type/UidTest.php
@@ -49,22 +49,18 @@
         $this->assertEquals('STRANGE', $attributes['uid']);
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingUid
-     */
     public function testLoadMissingUidText()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingUid');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0" a="b"><uid></uid>c</kolab>'
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingUid
-     */
     public function testLoadMissingUid()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingUid');
         $attributes = $this->load(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0" a="b">c</kolab>'
@@ -105,11 +101,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception_MissingUid
-     */
     public function testSaveMissingData()
     {
+        $this->expectException('Horde_Kolab_Format_Exception_MissingUid');
         $this->saveToXml();
     }
 
@@ -155,11 +149,9 @@
         );
     }
 
-    /**
-     * @expectedException Horde_Kolab_Format_Exception
-     */
     public function testOverwriteOldUid()
     {
+        $this->expectException('Horde_Kolab_Format_Exception');
         $this->saveToXml(
             '<?xml version="1.0" encoding="UTF-8"?>
 <kolab version="1.0" a="b"><uid>OLD</uid>c</kolab>',