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/Barcode.php

@@ -147,7 +147,7 @@ public static function factory($barcode,
         try {
             $barcode  = self::makeBarcode($barcode, $barcodeConfig);
             $renderer = self::makeRenderer($renderer, $rendererConfig);
-        } catch (Exception $e) {
+        } catch (Exception\ExceptionInterface $e) {
             if ($automaticRenderError && !($e instanceof Exception\RendererCreationException)) {
                 $barcode  = self::makeBarcode('error', array( 'text' => $e->getMessage() ));
                 $renderer = self::makeRenderer($renderer, array());
@@ -169,7 +169,7 @@ public static function factory($barcode,
      */
     public static function makeBarcode($barcode, $barcodeConfig = array())
     {
-        if ($barcode instanceof Object) {
+        if ($barcode instanceof Object\ObjectInterface) {
             return $barcode;
         }
 
@@ -222,7 +222,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array())
      */
     public static function makeRenderer($renderer = 'image', $rendererConfig = array())
     {
-        if ($renderer instanceof Renderer) {
+        if ($renderer instanceof Renderer\RendererInterface) {
             return $renderer;
         }
 
@@ -267,7 +267,7 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array
     /**
      * Proxy to renderer render() method
      *
-     * @param string | Object | array | Traversable $barcode
+     * @param string | Object\ObjectInterface | array | Traversable $barcode
      * @param string | Renderer $renderer
      * @param array  | Traversable $barcodeConfig
      * @param array  | Traversable $rendererConfig
@@ -283,7 +283,7 @@ public static function render($barcode,
     /**
      * Proxy to renderer draw() method
      *
-     * @param string | Object | array | Traversable $barcode
+     * @param string | Object\ObjectInterface | array | Traversable $barcode
      * @param string | Renderer $renderer
      * @param array | Traversable $barcodeConfig
      * @param array | Traversable $rendererConfig

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

@@ -18,17 +18,18 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Barcode;
+namespace Zend\Barcode\Exception;
 
 /**
  * Exception for Zend_Barcode component.
  *
  * @uses       Zend\Exception
  * @category   Zend
  * @package    Zend_Barcode
+ * @subpackage Exception
  * @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

@@ -21,8 +21,6 @@
 
 namespace Zend\Barcode\Exception;
 
-use Zend\Barcode\Exception;
-
 /**
  * Exception for Zend_Barcode component.
  *
@@ -33,6 +31,6 @@
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements Exception
+    implements ExceptionInterface
 {
 }

src/Exception/RendererCreationException.php

@@ -21,8 +21,6 @@
 
 namespace Zend\Barcode\Exception;
 
-use Zend\Barcode\Exception;
-
 /**
  * Exception for Zend_Barcode component.
  *
@@ -33,6 +31,6 @@
  */
 class RendererCreationException
     extends \InvalidArgumentException
-    implements Exception
+    implements ExceptionInterface
 {
 }