Merge branch 'master' of git://github.com/zendframework/zf2 into cach…

…e_interfaces
zendframework · May 31, 2012 · d11d08b · d11d08b
commit d11d08b
Show file tree

Hide file tree

Showing 19 changed files with 144 additions and 35 deletions.
diff --git a/.travis/run-tests.sh b/.travis/run-tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-travisdir=$(dirname $(readlink /proc/$$/fd/255))
+travisdir=$(dirname "$0")
 testdir="$travisdir/../tests"
 testedcomponents=(`cat "$travisdir/tested-components"`)
 result=0

diff --git a/.travis/skipped-components b/.travis/skipped-components
@@ -1,5 +1,6 @@
 Zend/Amf
 Zend/Date
+Zend/Dojo
 Zend/Queue
 Zend/Service
 Zend/Test

diff --git a/.travis/tested-components b/.travis/tested-components
@@ -22,17 +22,19 @@ Zend/Form
 Zend/GData
 Zend/Http
 Zend/InfoCard
+Zend/InputFilter
 Zend/Json
 Zend/Ldap
 Zend/Loader
 Zend/Locale
 Zend/Log
 Zend/Mail
 Zend/Markup
+Zend/Math
 Zend/Measure
 Zend/Memory
 Zend/Mime
-Zend/Module
+Zend/ModuleManager
 Zend/Mvc
 Zend/Navigation
 Zend/OAuth

diff --git a/src/Exception/OutOfRangeException.php b/src/Exception/OutOfRangeException.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Barcode
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace Zend\Barcode\Exception;
+
+/**
+ * Exception for Zend_Barcode component.
+ *
+ * @category   Zend
+ * @package    Zend_Barcode
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class OutOfRangeException extends \OutOfRangeException implements ExceptionInterface
+{
+}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Barcode
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace Zend\Barcode\Exception;
+
+/**
+ * Exception for Zend_Barcode component.
+ *
+ * @category   Zend
+ * @package    Zend_Barcode
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Barcode
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace Zend\Barcode\Exception;
+
+/**
+ * Exception for Zend_Barcode component.
+ *
+ * @category   Zend
+ * @package    Zend_Barcode
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class UnexpectedValueException extends \UnexpectedValueException implements 
+    ExceptionInterface
+{
+}
diff --git a/src/Object/AbstractObject.php b/src/Object/AbstractObject.php
@@ -226,7 +226,7 @@ public function __construct($options = null)
         if (is_array($options)) {
             $this->setOptions($options);
         }
-        $this->type = strtolower(substr(get_class($this), strlen($this->barcodeNamespace) + 1));
+        $this->type = strtolower(substr(get_called_class(), strlen($this->barcodeNamespace) + 1));
         if ($this->mandatoryChecksum) {
             $this->withChecksum = true;
             $this->withChecksumInText = true;

diff --git a/src/Object/Ean13.php b/src/Object/Ean13.php
@@ -172,7 +172,7 @@ public function getChecksum($text)
      */
     protected function drawText()
     {
-        if (get_class($this) == 'Zend\Barcode\Object\Ean13') {
+        if (get_called_class() == 'Zend\Barcode\Object\Ean13') {
             $this->drawEan13Text();
         } else {
             parent::drawText();

diff --git a/src/Object/Exception/BarcodeValidationException.php b/src/Object/Exception/BarcodeValidationException.php
@@ -29,8 +29,6 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class BarcodeValidationException
-    extends \Exception
-    implements ExceptionInterface
+class BarcodeValidationException extends InvalidArgumentException
 {
 }
diff --git a/src/Object/Exception/ExceptionInterface.php b/src/Object/Exception/ExceptionInterface.php
@@ -21,7 +21,7 @@
 
 namespace Zend\Barcode\Object\Exception;
 
-use Zend\Barcode\Exception\ExceptionInterface as BarcodeException;
+use Zend\Barcode\Exception\ExceptionInterface as Exception;
 
 /**
  * Base exception interface for barcode objects
@@ -32,6 +32,6 @@
  * @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 ExceptionInterface extends BarcodeException
+interface ExceptionInterface extends Exception
 {
-}
+}
diff --git a/src/Object/Exception/ExtensionNotLoadedException.php b/src/Object/Exception/ExtensionNotLoadedException.php
@@ -29,8 +29,6 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class ExtensionNotLoadedException
-    extends \RuntimeException
-    implements ExceptionInterface
+class ExtensionNotLoadedException extends RuntimeException
 {
 }
diff --git a/src/Object/Exception/InvalidArgumentException.php b/src/Object/Exception/InvalidArgumentException.php
@@ -21,6 +21,8 @@
 
 namespace Zend\Barcode\Object\Exception;
 
+use Zend\Barcode\Exception;
+
 /**
  * Exception for Zend_Barcode component.
  *
@@ -29,8 +31,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements 
+    ExceptionInterface
 {
 }
diff --git a/src/Object/Exception/OutOfRangeException.php b/src/Object/Exception/OutOfRangeException.php
@@ -21,6 +21,8 @@
 
 namespace Zend\Barcode\Object\Exception;
 
+use Zend\Barcode\Exception;
+
 /**
  * Exception for Zend_Barcode component.
  *
@@ -29,8 +31,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class OutOfRangeException
-    extends \OutOfRangeException
-    implements ExceptionInterface
+class OutOfRangeException extends Exception\OutOfRangeException implements 
+    ExceptionInterface
 {
 }
diff --git a/src/Object/Exception/RuntimeException.php b/src/Object/Exception/RuntimeException.php
@@ -21,6 +21,8 @@
 
 namespace Zend\Barcode\Object\Exception;
 
+use Zend\Barcode\Exception;
+
 /**
  * Exception for Zend_Barcode component.
  *
@@ -29,8 +31,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements 
+    ExceptionInterface
 {
 }
diff --git a/src/Renderer/AbstractRenderer.php b/src/Renderer/AbstractRenderer.php
@@ -110,7 +110,7 @@ public function __construct($options = null)
             $this->setOptions($options);
         }
         $this->type = strtolower(substr(
-            get_class($this),
+            get_called_class(),
             strlen($this->rendererNamespace) + 1
         ));
     }

diff --git a/src/Renderer/Exception/InvalidArgumentException.php b/src/Renderer/Exception/InvalidArgumentException.php
@@ -21,6 +21,8 @@
 
 namespace Zend\Barcode\Renderer\Exception;
 
+use Zend\Barcode\Exception;
+
 /**
  * Exception for Zend_Barcode component.
  *
@@ -29,8 +31,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements 
+    ExceptionInterface
 {
 }
diff --git a/src/Renderer/Exception/OutOfRangeException.php b/src/Renderer/Exception/OutOfRangeException.php
@@ -21,6 +21,8 @@
 
 namespace Zend\Barcode\Renderer\Exception;
 
+use Zend\Barcode\Exception;
+
 /**
  * Exception for Zend_Barcode component.
  *
@@ -29,8 +31,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class OutOfRangeException
-    extends \OutOfRangeException
-    implements ExceptionInterface
+class OutOfRangeException extends Exception\OutOfRangeException implements 
+    ExceptionInterface
 {
 }
diff --git a/src/Renderer/Exception/RuntimeException.php b/src/Renderer/Exception/RuntimeException.php
@@ -21,6 +21,8 @@
 
 namespace Zend\Barcode\Renderer\Exception;
 
+use Zend\Barcode\Exception;
+
 /**
  * Exception for Zend_Barcode component.
  *
@@ -29,8 +31,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements 
+    ExceptionInterface
 {
 }
diff --git a/src/Renderer/Exception/UnexpectedValueException.php b/src/Renderer/Exception/UnexpectedValueException.php
@@ -21,6 +21,8 @@
 
 namespace Zend\Barcode\Renderer\Exception;
 
+use Zend\Barcode\Exception;
+
 /**
  * Exception for Zend_Barcode component.
  *
@@ -29,8 +31,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class UnexpectedValueException
-    extends \UnexpectedValueException
-    implements ExceptionInterface
+class UnexpectedValueException extends Exception\UnexpectedValueException implements 
+    ExceptionInterface
 {
 }