Merge branch 'master' into feature/db-story-35

[zen-35]

Conflicts:
	library/Zend/Db/Sql/Select.php
	tests/Zend/Db/Sql/SelectTest.php

.travis/run-tests.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+travisdir=$(dirname $(readlink /proc/$$/fd/255))
+testdir="$travisdir/../tests"
+testedcomponents=(`cat "$travisdir/tested-components"`)
+result=0
+
+for tested in "${testedcomponents[@]}"
+    do
+        echo "$tested:"
+        phpunit -c $testdir/phpunit.xml $testdir/$tested
+        let "result = $result || $?"
+done
+
+exit $result

.travis/skipped-components

@@ -0,0 +1,9 @@
+Zend/Amf
+Zend/Barcode
+Zend/Date
+Zend/Feed
+Zend/Queue
+Zend/Service
+Zend/Test
+Zend/Translator
+Zend/Wildfire

.travis/tested-components

@@ -0,0 +1,58 @@
+Zend/Acl
+Zend/Authentication
+Zend/Cache
+Zend/Captcha
+Zend/Cloud
+Zend/Code
+Zend/Config
+Zend/Console
+Zend/Crypt
+Zend/Currency
+Zend/Db
+Zend/Di
+Zend/Docbook
+Zend/Dojo
+Zend/Dom
+Zend/EventManager
+Zend/Feed/Reader
+Zend/Feed/Writer
+Zend/File
+Zend/Filter
+Zend/Form
+Zend/GData
+Zend/Http
+Zend/InfoCard
+Zend/Json
+Zend/Ldap
+Zend/Loader
+Zend/Locale
+Zend/Log
+Zend/Mail
+Zend/Markup
+Zend/Measure
+Zend/Memory
+Zend/Mime
+Zend/Module
+Zend/Mvc
+Zend/Navigation
+Zend/OAuth
+Zend/OpenId
+Zend/Paginator
+Zend/Pdf
+Zend/ProgressBar
+Zend/RegistryTest.php
+Zend/Rest
+Zend/Search
+Zend/Serializer
+Zend/Server
+Zend/Session
+Zend/Soap
+Zend/Stdlib
+Zend/Tag
+Zend/Text
+Zend/TimeSync
+Zend/Uri
+Zend/Validator
+Zend/VersionTest.php
+Zend/View
+Zend/XmlRpc

src/Client.php

@@ -275,7 +275,7 @@ public function call($method, $params=array())
             $success = true;
             try {
                 $signatures = $this->getIntrospector()->getMethodSignature($method);
-            } catch (\Zend\XmlRpc\Exception $e) {
+            } catch (\Zend\XmlRpc\Exception\ExceptionInterface $e) {
                 $success = false;
             }
             if ($success) {

src/Client/Exception.php → src/Client/Exception/ExceptionInterface.php

@@ -19,17 +19,17 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\XmlRpc\Client;
+namespace Zend\XmlRpc\Client\Exception;
 
 /**
  * Base class for all Zend_XmlRpc_Client_* exceptions
  *
- * @uses       Zend\XmlRpc\Exception
+ * @uses       Zend\XmlRpc\Exception\ExceptionInterface
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Exception extends \Zend\XmlRpc\Exception
+interface ExceptionInterface extends \Zend\XmlRpc\Exception\ExceptionInterface
 {}

src/Client/Exception/FaultException.php

@@ -33,5 +33,5 @@
  */
 class FaultException
     extends \BadMethodCallException
-    implements \Zend\XmlRpc\Client\Exception
+    implements \Zend\XmlRpc\Client\Exception\ExceptionInterface
 {}

src/Client/Exception/IntrospectException.php

@@ -33,5 +33,5 @@
  */
 class IntrospectException
     extends \InvalidArgumentException
-    implements \Zend\XmlRpc\Client\Exception
+    implements \Zend\XmlRpc\Client\Exception\ExceptionInterface
 {}

src/Client/Exception/InvalidArgumentException.php

@@ -4,5 +4,5 @@
 
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\XmlRpc\Exception
+    implements \Zend\XmlRpc\Exception\ExceptionInterface
 {}

src/Client/Exception/RuntimeException.php

@@ -4,6 +4,6 @@
 
 class RuntimeException
     extends \RuntimeException
-    implements \Zend\XmlRpc\Client\Exception
+    implements \Zend\XmlRpc\Client\Exception\ExceptionInterface
 {}
 

src/Exception.php → src/Exception/ExceptionInterface.php

@@ -18,13 +18,13 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\XmlRpc;
+namespace Zend\XmlRpc\Exception;
 
 /**
  * @category   Zend
  * @package    Zend_XmlRpc
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Exception
+interface ExceptionInterface
 {}

src/Exception/InvalidArgumentException.php

@@ -4,6 +4,6 @@
 
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\XmlRpc\Exception
+    implements \Zend\XmlRpc\Exception\ExceptionInterface
 {}
 

src/Exception/RuntimeException.php

@@ -4,6 +4,6 @@
 
 class RuntimeException
     extends \RuntimeException
-    implements \Zend\XmlRpc\Exception
+    implements \Zend\XmlRpc\Exception\ExceptionInterface
 {}
 

src/Exception/ValueException.php

@@ -22,7 +22,7 @@
 namespace Zend\XmlRpc\Exception;
 
 /**
- * @uses       \Zend\XmlRpc\Exception
+ * @uses       Zend\XmlRpc\Exception\ExceptionInterface
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
@@ -31,6 +31,6 @@
  */
 class ValueException
     extends \LogicException
-    implements \Zend\XmlRpc\Exception
+    implements \Zend\XmlRpc\Exception\ExceptionInterface
 {}
 

src/Fault.php

@@ -31,7 +31,7 @@
  * to instantiate a Zend_XmlRpc_Server_Fault.
  *
  * @uses       SimpleXMLElement
- * @uses       Zend\XmlRpc\Exception
+ * @uses       Zend\XmlRpc\Exception\ExceptionInterface
  * @uses       Zend\XmlRpc\Value\Value
  * @category   Zend
  * @package    Zend_XmlRpc
@@ -118,7 +118,7 @@ public function __construct($code = 404, $message = '')
      * Set the fault code
      *
      * @param int $code
-     * @return Zend\XmlRpc\Fault
+     * @return Fault
      */
     public function setCode($code)
     {
@@ -140,7 +140,7 @@ public function getCode()
      * Retrieve fault message
      *
      * @param string
-     * @return Zend\XmlRpc\Fault
+     * @return Fault
      */
     public function setMessage($message)
     {
@@ -162,7 +162,7 @@ public function getMessage()
      * Set encoding to use in fault response
      *
      * @param string $encoding
-     * @return Zend\XmlRpc\Fault
+     * @return Fault
      */
     public function setEncoding($encoding)
     {
@@ -187,7 +187,7 @@ public function getEncoding()
      * @param string $fault
      * @return boolean Returns true if successfully loaded fault response, false
      * if response was not a fault response
-     * @throws Zend\XmlRpc\Exception if no or faulty XML provided, or if fault
+     * @throws \Zend\XmlRpc\Exception\ExceptionInterface if no or faulty XML provided, or if fault
      * response does not contain either code or message
      */
     public function loadXml($fault)
@@ -258,7 +258,7 @@ public static function isFault($xml)
         $fault = new self();
         try {
             $isFault = $fault->loadXml($xml);
-        } catch (Exception $e) {
+        } catch (Exception\ExceptionInterface $e) {
             $isFault = false;
         }
 

src/Generator/AbstractGenerator.php

@@ -21,14 +21,12 @@
 
 namespace Zend\XmlRpc\Generator;
 
-use Zend\XmlRpc\Generator as GeneratorAdapter;
-
 /**
  * Abstract XML generator adapter
  *
- * @uses Zend\XmlRpc\Generator
+ * @uses Zend\XmlRpc\Generator\GeneratorInterface
  */
-abstract class AbstractGenerator implements GeneratorAdapter
+abstract class AbstractGenerator implements GeneratorInterface
 {
     /**
      * XML encoding string
@@ -62,7 +60,7 @@ abstract protected function _init();
      * 
      * @param string $name XML tag name
      * @param string $value Optional value of the XML tag
-     * @return Zend_XmlRpc_Generator_Abstract Fluent interface
+     * @return AbstractGenerator Fluent interface
      */
     public function openElement($name, $value = null)
     {
@@ -80,7 +78,7 @@ public function openElement($name, $value = null)
      * Method marks the end of an XML element
      *
      * @param string $name XML tag name
-     * @return Zend_XmlRpc_Generator_Abstract Fluent interface
+     * @return AbstractGenerator Fluent interface
      */
     public function closeElement($name)
     {
@@ -103,7 +101,7 @@ public function getEncoding()
      * Set XML encoding
      * 
      * @param  string $encoding 
-     * @return Zend\XmlRpc\Generator\AbstractGenerator
+     * @return AbstractGenerator
      */
     public function setEncoding($encoding)
     {

src/Generator.php → src/Generator/GeneratorInterface.php

@@ -18,12 +18,12 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\XmlRpc;
+namespace Zend\XmlRpc\Generator;
 
 /**
  * XML generator adapter interface
  */
-interface Generator
+interface GeneratorInterface
 {
     public function getEncoding();
     public function setEncoding($encoding);

src/Generator/XmlWriter.php

@@ -78,7 +78,7 @@ protected function _writeTextData($text)
      * Close an previously opened XML element
      *
      * @param string $name
-     * @return void
+     * @return XmlWriter
      */
     protected function _closeElement($name)
     {

src/Server/Exception/BadMethodCallException.php

@@ -4,5 +4,5 @@
 
 class BadMethodCallException
     extends \BadMethodCallException
-    implements \Zend\XmlRpc\Server\Exception
+    implements \Zend\XmlRpc\Server\Exception\ExceptionInterface
 {}

src/Server/Exception.php → src/Server/Exception/ExceptionInterface.php

@@ -19,19 +19,19 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\XmlRpc\Server;
+namespace Zend\XmlRpc\Server\Exception;
 
 /**
  * Zend_XmlRpc_Server_Exception
  *
- * @uses       \Zend\XmlRpc\Exception
+ * @uses       Zend\XmlRpc\Exception\ExceptionInterface
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Server
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Exception extends \Zend\XmlRpc\Exception
+interface ExceptionInterface extends \Zend\XmlRpc\Exception\ExceptionInterface
 {
 }
 

src/Server/Exception/InvalidArgumentException.php

@@ -4,5 +4,5 @@
 
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\XmlRpc\Server\Exception
+    implements \Zend\XmlRpc\Server\Exception\ExceptionInterface
 {}

src/Server/Exception/RuntimeException.php

@@ -4,5 +4,5 @@
 
 class RuntimeException
     extends \RuntimeException
-    implements \Zend\XmlRpc\Server\Exception
+    implements \Zend\XmlRpc\Server\Exception\ExceptionInterface
 {}