Renaming to fit naming scheme

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19680 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/XmlRpc/Generator/DomDocument.php

@@ -21,14 +21,14 @@
  */
 
 /**
- * @var Zend_XmlRpc_Generator_Abstract
+ * @var Zend_XmlRpc_Generator_GeneratorAbstract
  */
-require_once 'Zend/XmlRpc/Generator/Abstract.php';
+require_once 'Zend/XmlRpc/Generator/GeneratorAbstract.php';
 
 /**
  * DOMDocument based implementation of a XML/RPC generator
  */
-class Zend_XmlRpc_Generator_DOMDocument extends Zend_XmlRpc_Generator_Abstract
+class Zend_XmlRpc_Generator_DomDocument extends Zend_XmlRpc_Generator_GeneratorAbstract
 {
     /**
      * @var DOMDocument
@@ -47,7 +47,7 @@ class Zend_XmlRpc_Generator_DOMDocument extends Zend_XmlRpc_Generator_Abstract
      *
      * @param string $name
      * @param string $value
-     * @return Zend_XmlRpc_Generator_DOMDocument Fluent interface
+     * @return Zend_XmlRpc_Generator_DomDocument Fluent interface
      */
     public function startElement($name, $value = null)
     {
@@ -68,7 +68,7 @@ class Zend_XmlRpc_Generator_DOMDocument extends Zend_XmlRpc_Generator_Abstract
      * Resets $_currentElement to the next parent node in the hierarchy
      *
      * @param string $name
-     * @return Zend_XmlRpc_Generator_DOMDocument Fluent interface
+     * @return Zend_XmlRpc_Generator_DomDocument Fluent interface
      */
     public function endElement($name)
     {

library/Zend/XmlRpc/Generator/Abstract.php → library/Zend/XmlRpc/Generator/GeneratorAbstract.php

@@ -23,7 +23,7 @@
 /**
  * Abstract XML generator adapter
  */
-abstract class Zend_XmlRpc_Generator_Abstract
+abstract class Zend_XmlRpc_Generator_GeneratorAbstract
 {
     /**
      * @var string

library/Zend/XmlRpc/Generator/XmlWriter.php

@@ -21,14 +21,14 @@
  */
 
 /**
- * @var Zend_XmlRpc_Generator_Abstract
+ * @var Zend_XmlRpc_Generator_GeneratorAbstract
  */
-require_once 'Zend/XmlRpc/Generator/Abstract.php';
+require_once 'Zend/XmlRpc/Generator/GeneratorAbstract.php';
 
 /**
  * XML generator adapter based on XMLWriter
  */
-class Zend_XmlRpc_Generator_XMLWriter extends Zend_XmlRpc_Generator_Abstract
+class Zend_XmlRpc_Generator_XmlWriter extends Zend_XmlRpc_Generator_GeneratorAbstract
 {
     /**
      * XMLWriter instance
@@ -56,7 +56,7 @@ class Zend_XmlRpc_Generator_XMLWriter extends Zend_XmlRpc_Generator_Abstract
      *
      * @param string $name
      * @param string $value
-     * @return Zend_XmlRpc_Generator_XMLWriter Fluent interface
+     * @return Zend_XmlRpc_Generator_XmlWriter Fluent interface
      */
     public function startElement($name, $value = null)
     {
@@ -69,6 +69,14 @@ class Zend_XmlRpc_Generator_XMLWriter extends Zend_XmlRpc_Generator_Abstract
         return $this;
     }
 
+    /**
+     * End of an XML element
+     *
+     * Called to mark the end of an XML element
+     *
+     * @param string $name
+     * @return Zend_XmlRpc_Generator_XmlWriter Fluent interface
+     */
     public function endElement($name)
     {
         $this->_xmlWriter->endElement();

library/Zend/XmlRpc/Value.php

@@ -56,7 +56,7 @@ abstract class Zend_XmlRpc_Value
     protected $_xml;
 
     /**
-     * @var Zend_XmlRpc_Generator_Abstract
+     * @var Zend_XmlRpc_Generator_GeneratorAbstract
      */
     protected static $_generator;
 
@@ -100,13 +100,18 @@ abstract class Zend_XmlRpc_Value
     /**
      * Get XML generator instance
      *
-     * @return Zend_XmlRpc_Generator_Abstract
+     * @return Zend_XmlRpc_Generator_GeneratorAbstract
      */
     public static function getGenerator()
     {
         if (!self::$_generator) {
-            require_once 'Zend/XmlRpc/Generator/DOMDocument.php';
-            self::$_generator = new Zend_XmlRpc_Generator_DOMDocument();
+            if (extension_loaded('xmlwriter')) {
+                require_once 'Zend/XmlRpc/Generator/XmlWriter.php';
+                self::$_generator = new Zend_XmlRpc_Generator_XmlWriter();
+            } else {
+                require_once 'Zend/XmlRpc/Generator/DomDocument.php';
+                self::$_generator = new Zend_XmlRpc_Generator_DomDocument();
+            }
         }
 
         return self::$_generator;
@@ -115,10 +120,10 @@ abstract class Zend_XmlRpc_Value
     /**
      * Sets XML generator instance
      *
-     * @param Zend_XmlRpc_Generator_Abstract $generator
+     * @param Zend_XmlRpc_Generator_GeneratorAbstract $generator
      * @return void
      */
-    public static function setGenerator(Zend_XmlRpc_Generator_Abstract $generator)
+    public static function setGenerator(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         self::$_generator = $generator;
     }

tests/Zend/XmlRpc/GeneratorTest.php

@@ -22,8 +22,6 @@
 
 require_once "PHPUnit/Framework/TestCase.php";
 require_once "PHPUnit/Framework/TestSuite.php";
-require_once 'Zend/XmlRpc/Generator/DOMDocument.php';
-require_once 'Zend/XmlRpc/Generator/XMLWriter.php';
 require_once 'Zend/XmlRpc/TestProvider.php';
 
 /**
@@ -41,7 +39,7 @@ class Zend_XmlRpc_GeneratorTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testCreatingSingleElement(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testCreatingSingleElement(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         $generator->startElement('element');
         $generator->endElement('element');
@@ -51,7 +49,7 @@ class Zend_XmlRpc_GeneratorTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testCreatingSingleElementWithValue(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testCreatingSingleElementWithValue(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         $generator->startElement('element', 'value');
         $generator->endElement('element');
@@ -61,7 +59,7 @@ class Zend_XmlRpc_GeneratorTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testCreatingComplexXmlDocument(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testCreatingComplexXmlDocument(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         $generator->startElement('root');
         $generator->startElement('children');
@@ -78,7 +76,7 @@ class Zend_XmlRpc_GeneratorTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testFlushingGeneratorFlushesEverything(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testFlushingGeneratorFlushesEverything(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         $generator->startElement('test')->endElement('test');
         $this->assertXml('<test/>', $generator);
@@ -89,7 +87,7 @@ class Zend_XmlRpc_GeneratorTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testSpecialCharsAreEncoded(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testSpecialCharsAreEncoded(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         $generator->startElement('element', '<>&"\'€')->endElement('element');
         $variant1 = '<element>&lt;&gt;&amp;"\'€</element>';
@@ -104,7 +102,7 @@ class Zend_XmlRpc_GeneratorTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGeneratorsWithAlternateEncodings
      */
-    public function testDifferentEncodings(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testDifferentEncodings(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         $generator->startElement('element', '€')->endElement('element');
         $this->assertXml('<element>&#8364;</element>', $generator);
@@ -113,7 +111,7 @@ class Zend_XmlRpc_GeneratorTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testFluentInterfacesProvided(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testFluentInterfacesProvided(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         $this->assertSame($generator, $generator->startElement('foo'));
         $this->assertSame($generator, $generator->endElement('foo'));

tests/Zend/XmlRpc/TestProvider.php

@@ -19,21 +19,25 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version $Id: ValueTest.php 18442 2009-09-30 13:17:48Z lars $
  */
+
+require_once 'Zend/XmlRpc/Generator/DomDocument.php';
+require_once 'Zend/XmlRpc/Generator/XmlWriter.php';
+
 abstract class Zend_XmlRpc_TestProvider
 {
     public static function provideGenerators()
     {
         return array(
-            array(new Zend_XmlRpc_Generator_DOMDocument()),
-            array(new Zend_XmlRpc_Generator_XMLWriter()),
+            array(new Zend_XmlRpc_Generator_DomDocument()),
+            array(new Zend_XmlRpc_Generator_XmlWriter()),
         );
     }
 
     public static function provideGeneratorsWithAlternateEncodings()
     {
         return array(
-            array(new Zend_XmlRpc_Generator_DOMDocument('ISO-8859-1')),
-            array(new Zend_XmlRpc_Generator_XMLWriter('ISO-8859-1')),
+            array(new Zend_XmlRpc_Generator_DomDocument('ISO-8859-1')),
+            array(new Zend_XmlRpc_Generator_XmlWriter('ISO-8859-1')),
         );
     }
 }

tests/Zend/XmlRpc/ValueTest.php

@@ -36,8 +36,6 @@ require_once 'Zend/XmlRpc/Value/String.php';
 require_once 'Zend/XmlRpc/Value/Nil.php';
 require_once 'Zend/XmlRpc/Value/Struct.php';
 require_once 'Zend/Crypt/Math/BigInteger.php';
-require_once 'Zend/XmlRpc/Generator/DOMDocument.php';
-require_once 'Zend/XmlRpc/Generator/XMLWriter.php';
 require_once 'Zend/XmlRpc/TestProvider.php';
 require_once 'Zend/Date.php';
 
@@ -76,7 +74,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalBooleanFromXmlRpc(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalBooleanFromXmlRpc(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $xml = '<value><boolean>1</boolean></value>';
@@ -113,7 +111,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalIntegerFromXmlRpc(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalIntegerFromXmlRpc(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
 
@@ -155,7 +153,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
      * @group ZF-6445
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalBigIntegerFromFromXmlRpc(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalBigIntegerFromFromXmlRpc(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $bigInt = (string)(PHP_INT_MAX + 1);
@@ -217,7 +215,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalDoubleFromXmlRpc(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalDoubleFromXmlRpc(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = 1.1;
@@ -235,7 +233,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
      * @group ZF-7712
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshallingDoubleWithHigherPrecisionFromNative(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshallingDoubleWithHigherPrecisionFromNative(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         if (ini_get('precision') < 7) {
@@ -253,7 +251,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
      * @group ZF-7712
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshallingDoubleWithHigherPrecisionFromNativeWithTrailingZeros(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshallingDoubleWithHigherPrecisionFromNativeWithTrailingZeros(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         if (ini_get('precision') < 7) {
@@ -288,7 +286,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalStringFromXmlRpc(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalStringFromXmlRpc(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = 'foo<>';
@@ -305,7 +303,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalStringFromDefault(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalStringFromDefault(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = 'foo<br/>bar';
@@ -343,7 +341,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalNilFromXmlRpc(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalNilFromXmlRpc(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $xmls = array('<value><nil/></value>',
@@ -380,7 +378,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalArrayFromXmlRpc(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalArrayFromXmlRpc(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = array(0,1);
@@ -399,7 +397,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testEmptyXmlRpcArrayResultsInEmptyArray(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testEmptyXmlRpcArrayResultsInEmptyArray(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = array();
@@ -421,7 +419,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testArrayMustContainDataElement(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testArrayMustContainDataElement(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = array();
@@ -437,7 +435,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
      * @group ZF-5405
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalNilInStructWrappedInArray(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalNilInStructWrappedInArray(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $expected = array(array('id' => '1', 'name' => 'vertebra, caudal', 'description' => null));
@@ -477,7 +475,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalStructFromXmlRpc(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalStructFromXmlRpc(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = array('foo' => 0, 'bar' => 'foo<>bar');
@@ -497,7 +495,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshallingNestedStructFromXmlRpc(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshallingNestedStructFromXmlRpc(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = array('foo' => array('bar' => '<br/>'));
@@ -519,7 +517,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshallingStructWithMemberWithoutValue(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshallingStructWithMemberWithoutValue(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = array('foo' => 0, 'bar' => 1);
@@ -541,7 +539,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshallingStructWithMemberWithoutName(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshallingStructWithMemberWithoutName(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = array('foo' => 0, 'bar' => 1);
@@ -564,7 +562,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
      * @group ZF-7639
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalStructFromXmlRpcWithEntities(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalStructFromXmlRpcWithEntities(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = array('&nbsp;' => 0);
@@ -580,7 +578,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
      * @group ZF-3947
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshallingStructsWithEmptyValueFromXmlRpcShouldRetainKeys(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshallingStructsWithEmptyValueFromXmlRpcShouldRetainKeys(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = array('foo' => '');
@@ -599,7 +597,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshallingStructWithMultibyteValueFromXmlRpcRetainsMultibyteValue(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshallingStructWithMultibyteValueFromXmlRpcRetainsMultibyteValue(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = array('foo' => 'ß');
@@ -668,7 +666,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalDateTimeFromXmlRpc(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalDateTimeFromXmlRpc(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $iso8601 = '1997-07-16T19:20+01:00';
@@ -687,7 +685,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      * @group ZF-4249
      */
-    public function testMarshalDateTimeFromFromZendDate(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalDateTimeFromFromZendDate(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $date = new Zend_Date(array('year' => 2039, 'month' => 4, 'day' => 18,
@@ -707,7 +705,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      * @group ZF-4249
      */
-    public function testMarshalDateTimeFromZendDateAndAutodetectingType(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalDateTimeFromZendDateAndAutodetectingType(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $date = new Zend_Date(array('year' => 2039, 'month' => 4, 'day' => 18,
@@ -726,7 +724,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      * @group ZF-4249
      */
-    public function testMarshalDateTimeFromFromDateTime(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalDateTimeFromFromDateTime(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $dateString = '20390418T13:14:15';
@@ -746,7 +744,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      * @group ZF-4249
      */
-    public function testMarshalDateTimeFromDateTimeAndAutodetectingType(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalDateTimeFromDateTimeAndAutodetectingType(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $dateString = '20390418T13:14:15';
@@ -775,7 +773,7 @@ class Zend_XmlRpc_ValueTest extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider Zend_XmlRpc_TestProvider::provideGenerators
      */
-    public function testMarshalBase64FromXmlRpc(Zend_XmlRpc_Generator_Abstract $generator)
+    public function testMarshalBase64FromXmlRpc(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
     {
         Zend_XmlRpc_Value::setGenerator($generator);
         $native = 'foo';