Merge branch 'master' into rfc/escaper

src/ArraySerializableInterface.php

@@ -0,0 +1,45 @@
+<?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_Stdlib
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace Zend\Stdlib;
+
+/**
+ * @category   Zend
+ * @package    Zend_Stdlib
+ * @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 ArraySerializableInterface
+{
+    /**
+     * Exchange internal values from provided array
+     * 
+     * @param  array $array 
+     * @return void
+     */
+    public function exchangeArray(array $array);
+
+    /**
+     * Return an array representation of the object
+     * 
+     * @return array
+     */
+    public function getArrayCopy();
+}

src/ArrayStack.php

@@ -18,13 +18,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib;
 
-use ArrayIterator,
-    ArrayObject;
+use ArrayIterator;
+use ArrayObject;
 
 /**
  * ArrayObject that acts as a stack with regards to iteration

src/CallbackHandler.php

@@ -18,14 +18,11 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib;
 
-use Closure,
-    ReflectionClass,
-    WeakRef;
+use Closure;
+use ReflectionClass;
+use WeakRef;
 
 /**
  * CallbackHandler
@@ -166,6 +163,11 @@ public function call(array $args = array())
     {
         $callback = $this->getCallback();
 
+        // WeakRef object will return null if the real object was disposed
+        if (null === $callback) {
+            return null;
+        }
+
         $isPhp54 = version_compare(PHP_VERSION, '5.4.0rc1', '>=');
 
         if ($isPhp54 && is_string($callback)) {

src/DispatchableInterface.php

@@ -0,0 +1,10 @@
+<?php
+namespace Zend\Stdlib;
+
+use Zend\Stdlib\ResponseInterface as Response,
+    Zend\Stdlib\RequestInterface as Request;
+
+interface DispatchableInterface
+{
+    public function dispatch(Request $request, Response $response = null);
+}

src/Exception/BadMethodCallException.php

@@ -18,13 +18,8 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib\Exception;
 
-use Zend\Stdlib\Exception;
-
 /**
  * Bad method call exception
  *
@@ -33,7 +28,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 BadMethodCallException extends \BadMethodCallException
-    implements Exception
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 }

src/Exception/DomainException.php

@@ -2,8 +2,6 @@
 
 namespace Zend\Stdlib\Exception;
 
-use Zend\Stdlib\Exception;
-
-class DomainException extends \DomainException implements Exception
+class DomainException extends \DomainException implements ExceptionInterface
 {
 }

src/Exception/ExceptionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Zend\Stdlib\Exception;
+
+interface ExceptionInterface
+{
+}

src/Exception/InvalidArgumentException.php

@@ -2,10 +2,6 @@
 
 namespace Zend\Stdlib\Exception;
 
-use Zend\Stdlib\Exception;
-
-class InvalidArgumentException 
-    extends \InvalidArgumentException 
-    implements Exception
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }

src/Exception/InvalidCallbackException.php

@@ -18,25 +18,16 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib\Exception;
 
-use Zend\Stdlib\Exception;
-
 /**
  * Invalid callback exception
  *
- * @uses       Exception
- * @uses       Zend\Stdlib\Exception
  * @category   Zend
  * @package    Zend_Stdlib
  * @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 InvalidCallbackException
-    extends DomainException
-    implements Exception
+class InvalidCallbackException extends DomainException implements ExceptionInterface
 {
 }

src/Exception/LogicException.php

@@ -18,13 +18,8 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib\Exception;
 
-use Zend\Stdlib\Exception;
-
 /**
  * logic exception
  *
@@ -33,6 +28,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 LogicException extends \LogicException implements Exception
+class LogicException extends \LogicException implements ExceptionInterface
 {
 }