diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 21d57da59..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "tools/phptools"]
-	path = tools/phptools
-	url = git://github.com/ralphschindler/PHPTools.git
diff --git a/composer.json b/composer.json
index 213b99dbe..d9f079955 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-stdlib",
-    "description": "Zend\\Stdlib component",
+    "description": " ",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
@@ -9,11 +9,11 @@
     "homepage": "https://github.com/zendframework/zend-stdlib",
     "autoload": {
         "psr-4": {
-            "Zend\\Stdlib\\": "src/"
+            "Zend\\Stdlib": "src/"
         }
     },
     "require": {
-        "php": ">=5.3.23"
+        "php": ">=5.3.3"
     },
     "require-dev": {
         "zendframework/zend-eventmanager": "self.version",
diff --git a/src/Options.php b/src/AbstractOptions.php
similarity index 58%
rename from src/Options.php
rename to src/AbstractOptions.php
index d69ca8c3a..b0c074146 100644
--- a/src/Options.php
+++ b/src/AbstractOptions.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -25,14 +15,20 @@
 /**
  * @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
  */
-abstract class Options implements ParameterObjectInterface
+abstract class AbstractOptions implements ParameterObjectInterface
 {
+    /**
+     * We use the __ prefix to avoid collisions with properties in
+     * user-implmentations.
+     *
+     * @var bool
+     */
+    protected $__strictMode__ = true;
+
     /**
      * @param  array|Traversable|null $options
-     * @return Options
+     * @return AbstractOptions
      * @throws Exception\InvalidArgumentException
      */
     public function __construct($options = null)
@@ -61,43 +57,23 @@ public function setFromArray($options)
     }
 
     /**
-     * @param string $key name of option with underscore
-     * @return string name of setter method
-     * @throws Exception\BadMethodCallException if setter method is undefined
+     * Cast to array
+     *
+     * @return array
      */
-    protected function assembleSetterNameFromKey($key)
+    public function toArray()
     {
-        $parts = explode('_', $key);
-        $parts = array_map('ucfirst', $parts);
-        $setter = 'set' . implode('', $parts);
-        if (!method_exists($this, $setter)) {
-            throw new Exception\BadMethodCallException(
-                'The option "' . $key . '" does not '
-                . 'have a matching ' . $setter . ' setter method '
-                . 'which must be defined'
-            );
+        $array = array();
+        $transform = function($letters) {
+            $letter = array_shift($letters);
+            return '_' . strtolower($letter);
+        };
+        foreach ($this as $key => $value) {
+            if ($key === '__strictMode__') continue;
+            $normalizedKey = preg_replace_callback('/([A-Z])/', $transform, $key);
+            $array[$normalizedKey] = $value;
         }
-        return $setter;
-    }
-
-    /**
-     * @param string $key name of option with underscore
-     * @return string name of getter method
-     * @throws Exception\BadMethodCallException if getter method is undefined
-     */
-    protected function assembleGetterNameFromKey($key)
-    {
-        $parts = explode('_', $key);
-        $parts = array_map('ucfirst', $parts);
-        $getter = 'get' . implode('', $parts);
-        if (!method_exists($this, $getter)) {
-            throw new Exception\BadMethodCallException(
-                'The option "' . $key . '" does not '
-                . 'have a matching ' . $getter . ' getter method '
-                . 'which must be defined'
-            );
-        }
-        return $getter;
+        return $array;
     }
 
     /**
@@ -108,7 +84,16 @@ protected function assembleGetterNameFromKey($key)
      */
     public function __set($key, $value)
     {
-        $setter = $this->assembleSetterNameFromKey($key);
+        $setter = 'set' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
+        if ($this->__strictMode__ && !method_exists($this, $setter)) {
+            throw new Exception\BadMethodCallException(
+                'The option "' . $key . '" does not '
+                . 'have a matching ' . $setter . ' setter method '
+                . 'which must be defined'
+            );
+        } elseif (!$this->__strictMode__ && !method_exists($this, $setter)) {
+            return;
+        }
         $this->{$setter}($value);
     }
 
@@ -119,7 +104,14 @@ public function __set($key, $value)
      */
     public function __get($key)
     {
-        $getter = $this->assembleGetterNameFromKey($key);
+        $getter = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
+        if (!method_exists($this, $getter)) {
+            throw new Exception\BadMethodCallException(
+                'The option "' . $key . '" does not '
+                . 'have a matching ' . $getter . ' getter method '
+                . 'which must be defined'
+            );
+        }
         return $this->{$getter}();
     }
 
diff --git a/src/ArraySerializableInterface.php b/src/ArraySerializableInterface.php
index d943e5774..20dd4633c 100644
--- a/src/ArraySerializableInterface.php
+++ b/src/ArraySerializableInterface.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -23,22 +13,20 @@
 /**
  * @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 
+     *
+     * @param  array $array
      * @return void
      */
     public function exchangeArray(array $array);
 
     /**
      * Return an array representation of the object
-     * 
+     *
      * @return array
      */
     public function getArrayCopy();
diff --git a/src/ArrayStack.php b/src/ArrayStack.php
index d21a509bd..013ff262d 100644
--- a/src/ArrayStack.php
+++ b/src/ArrayStack.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -28,17 +18,15 @@
  *
  * @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 ArrayStack extends ArrayObject
 {
     /**
      * Retrieve iterator
      *
-     * Retrieve an array copy of the object, reverse its order, and return an 
+     * Retrieve an array copy of the object, reverse its order, and return an
      * ArrayIterator with that reversed array.
-     * 
+     *
      * @return ArrayIterator
      */
     public function getIterator()
diff --git a/src/ArrayUtils.php b/src/ArrayUtils.php
index f3a9be7de..866b784f6 100644
--- a/src/ArrayUtils.php
+++ b/src/ArrayUtils.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -29,8 +19,6 @@
  *
  * @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
  */
 abstract class ArrayUtils
 {
@@ -45,7 +33,7 @@ public static function hasStringKeys($value, $allowEmpty = false)
     {
         if (!is_array($value)) {
             return false;
-        } 
+        }
 
         if (!$value) {
             return $allowEmpty;
@@ -65,7 +53,7 @@ public static function hasIntegerKeys($value, $allowEmpty = false)
     {
         if (!is_array($value)) {
             return false;
-        } 
+        }
 
         if (!$value) {
             return $allowEmpty;
@@ -92,8 +80,8 @@ public static function hasNumericKeys($value, $allowEmpty = false)
     {
         if (!is_array($value)) {
             return false;
-        } 
-        
+        }
+
         if (!$value) {
             return $allowEmpty;
         }
@@ -125,8 +113,8 @@ public static function isList($value, $allowEmpty = false)
     {
         if (!is_array($value)) {
             return false;
-        } 
-        
+        }
+
         if (!$value) {
             return $allowEmpty;
         }
@@ -167,8 +155,8 @@ public static function isHashTable($value, $allowEmpty = false)
     {
         if (!is_array($value)) {
             return false;
-        } 
-        
+        }
+
         if (!$value) {
             return $allowEmpty;
         }
diff --git a/src/CallbackHandler.php b/src/CallbackHandler.php
index 829781122..ca12f9244 100644
--- a/src/CallbackHandler.php
+++ b/src/CallbackHandler.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -33,8 +23,6 @@
  *
  * @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 CallbackHandler
 {
@@ -49,11 +37,17 @@ class CallbackHandler
      */
     protected $metadata;
 
+    /**
+     * PHP version is greater as 5.4rc1?
+     * @var boolean
+     */
+    protected static $isPhp54;
+
     /**
      * Constructor
-     * 
+     *
      * @param  string $event Event to which slot is subscribed
-     * @param  string|array|object $callback PHP callback 
+     * @param  string|array|object $callback PHP callback
      * @param  array $options Options used by the callback handler (e.g., priority)
      * @return void
      */
@@ -66,14 +60,14 @@ public function __construct($callback, array $metadata = array())
     /**
      * Registers the callback provided in the constructor
      *
-     * If you have pecl/weakref {@see http://pecl.php.net/weakref} installed, 
+     * If you have pecl/weakref {@see http://pecl.php.net/weakref} installed,
      * this method provides additional behavior.
      *
-     * If a callback is a functor, or an array callback composing an object 
+     * If a callback is a functor, or an array callback composing an object
      * instance, this method will pass the object to a WeakRef instance prior
      * to registering the callback.
-     * 
-     * @param  callback $callback 
+     *
+     * @param  callable $callback
      * @return void
      */
     protected function registerCallback($callback)
@@ -105,7 +99,7 @@ protected function registerCallback($callback)
 
         list($target, $method) = $callback;
 
-        // If we have an array callback, and the first argument is not an 
+        // If we have an array callback, and the first argument is not an
         // object, register as-is
         if (!is_object($target)) {
             $this->callback = $callback;
@@ -120,8 +114,8 @@ protected function registerCallback($callback)
 
     /**
      * Retrieve registered callback
-     * 
-     * @return Callback
+     *
+     * @return callable
      */
     public function getCallback()
     {
@@ -142,7 +136,7 @@ public function getCallback()
             return $callback;
         }
 
-        // Array callback with WeakRef object -- retrieve the object first, and 
+        // Array callback with WeakRef object -- retrieve the object first, and
         // then return
         list($target, $method) = $callback;
         if ($target instanceof WeakRef) {
@@ -155,7 +149,7 @@ public function getCallback()
 
     /**
      * Invoke handler
-     * 
+     *
      * @param  array $args Arguments to pass to callback
      * @return mixed
      */
@@ -168,29 +162,41 @@ public function call(array $args = array())
             return null;
         }
 
-        $isPhp54 = version_compare(PHP_VERSION, '5.4.0rc1', '>=');
+        // Minor performance tweak, if the callback gets called more than once
+        if (!isset(self::$isPhp54)) {
+            self::$isPhp54 = version_compare(PHP_VERSION, '5.4.0rc1', '>=');
+        }
+
+        $argCount = count($args);
+
+        if (self::$isPhp54 && is_string($callback)) {
+            $result = $this->validateStringCallbackFor54($callback);
 
-        if ($isPhp54 && is_string($callback)) {
-            $this->validateStringCallbackFor54($callback);
+            if ($result !== true && $argCount <= 3) {
+                $callback       = $result;
+                // Minor performance tweak, if the callback gets called more
+                // than once
+                $this->callback = $result;
+            }
         }
 
-        // Minor performance tweak; use call_user_func() until > 3 arguments 
+        // Minor performance tweak; use call_user_func() until > 3 arguments
         // reached
-        switch (count($args)) {
+        switch ($argCount) {
             case 0:
-                if ($isPhp54) {
+                if (self::$isPhp54) {
                     return $callback();
                 }
                 return call_user_func($callback);
             case 1:
-                if ($isPhp54) {
+                if (self::$isPhp54) {
                     return $callback(array_shift($args));
                 }
                 return call_user_func($callback, array_shift($args));
             case 2:
                 $arg1 = array_shift($args);
                 $arg2 = array_shift($args);
-                if ($isPhp54) {
+                if (self::$isPhp54) {
                     return $callback($arg1, $arg2);
                 }
                 return call_user_func($callback, $arg1, $arg2);
@@ -198,7 +204,7 @@ public function call(array $args = array())
                 $arg1 = array_shift($args);
                 $arg2 = array_shift($args);
                 $arg3 = array_shift($args);
-                if ($isPhp54) {
+                if (self::$isPhp54) {
                     return $callback($arg1, $arg2, $arg3);
                 }
                 return call_user_func($callback, $arg1, $arg2, $arg3);
@@ -209,7 +215,7 @@ public function call(array $args = array())
 
     /**
      * Invoke as functor
-     * 
+     *
      * @return mixed
      */
     public function __invoke()
@@ -219,7 +225,7 @@ public function __invoke()
 
     /**
      * Get all callback metadata
-     * 
+     *
      * @return array
      */
     public function getMetadata()
@@ -229,8 +235,8 @@ public function getMetadata()
 
     /**
      * Retrieve a single metadatum
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @return mixed
      */
     public function getMetadatum($name)
@@ -245,9 +251,9 @@ public function getMetadatum($name)
      * Validate a static method call
      *
      * Validates that a static method call in PHP 5.4 will actually work
-     * 
-     * @param  string $callback 
-     * @return true
+     *
+     * @param  string $callback
+     * @return true|array
      * @throws Exception\InvalidCallbackException if invalid
      */
     protected function validateStringCallbackFor54($callback)
@@ -280,6 +286,9 @@ protected function validateStringCallbackFor54($callback)
             ));
         }
 
-        return true;
+        // returning a non boolean value may not be nice for a validate method,
+        // but that allows the usage of a static string callback without using
+        // the call_user_func function.
+        return array($class, $method);
     }
 }
diff --git a/src/DispatchableInterface.php b/src/DispatchableInterface.php
index 794227074..33b0d1980 100644
--- a/src/DispatchableInterface.php
+++ b/src/DispatchableInterface.php
@@ -1,8 +1,17 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
+
 namespace Zend\Stdlib;
 
-use Zend\Stdlib\ResponseInterface as Response,
-    Zend\Stdlib\RequestInterface as Request;
+use Zend\Stdlib\RequestInterface as Request;
+use Zend\Stdlib\ResponseInterface as Response;
 
 interface DispatchableInterface
 {
diff --git a/src/ErrorHandler.php b/src/ErrorHandler.php
index ad56b6919..91dcf3119 100644
--- a/src/ErrorHandler.php
+++ b/src/ErrorHandler.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -28,8 +18,6 @@
  *
  * @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
  */
 abstract class ErrorHandler
 {
diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
index 1e10d34d0..dbe419fa3 100644
--- a/src/Exception/BadMethodCallException.php
+++ b/src/Exception/BadMethodCallException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib\Exception;
@@ -25,8 +15,6 @@
  *
  * @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 BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
diff --git a/src/Exception/DomainException.php b/src/Exception/DomainException.php
index 8d8d1743a..8e85e4d2f 100644
--- a/src/Exception/DomainException.php
+++ b/src/Exception/DomainException.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace Zend\Stdlib\Exception;
 
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index ac14250c2..a45dd92a4 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace Zend\Stdlib\Exception;
 
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 45f430b40..87d8eaac2 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace Zend\Stdlib\Exception;
 
diff --git a/src/Exception/InvalidCallbackException.php b/src/Exception/InvalidCallbackException.php
index 70ec8b62e..ab97b5ddb 100644
--- a/src/Exception/InvalidCallbackException.php
+++ b/src/Exception/InvalidCallbackException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib\Exception;
@@ -25,8 +15,6 @@
  *
  * @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 ExceptionInterface
 {
diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php
index cedd26617..b39a4432f 100644
--- a/src/Exception/LogicException.php
+++ b/src/Exception/LogicException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib\Exception;
@@ -25,8 +15,6 @@
  *
  * @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 LogicException extends \LogicException implements ExceptionInterface
 {
diff --git a/src/Glob.php b/src/Glob.php
index 16750e47e..09679c2c7 100644
--- a/src/Glob.php
+++ b/src/Glob.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -25,8 +15,6 @@
  *
  * @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
  */
 abstract class Glob
 {
@@ -39,12 +27,12 @@ abstract class Glob
     const GLOB_NOESCAPE = 0x08;
     const GLOB_BRACE    = 0x10;
     const GLOB_ONLYDIR  = 0x20;
-    const GLOB_ERR      = 0x30;
+    const GLOB_ERR      = 0x40;
     /**#@-*/
-    
+
     /**
      * Find pathnames matching a pattern.
-     * 
+     *
      * @see    http://docs.php.net/glob
      * @param  string  $pattern
      * @param  integer $flags
@@ -59,10 +47,10 @@ public static function glob($pattern, $flags, $forceFallback = false)
             return self::systemGlob($pattern, $flags);
         }
     }
-    
+
     /**
      * Use the glob function provided by the system.
-     * 
+     *
      * @param  string  $pattern
      * @param  integer $flags
      * @return array|false
@@ -93,10 +81,10 @@ protected static function systemGlob($pattern, $flags)
 
         return glob($pattern, $globFlags);
     }
-    
+
     /**
      * Expand braces manually, then use the system glob.
-     * 
+     *
      * @param  string  $pattern
      * @param  integer $flags
      * @return array|false
@@ -106,26 +94,26 @@ protected static function fallbackGlob($pattern, $flags)
         if (!$flags & self::GLOB_BRACE) {
             return self::systemGlob($pattern, $flags);
         }
-        
+
         $flags &= ~self::GLOB_BRACE;
         $length = strlen($pattern);
         $paths  = array();
-        
+
         if ($flags & self::GLOB_NOESCAPE) {
             $begin = strpos($pattern, '{');
         } else {
             $begin = 0;
-            
+
             while (true) {
                 if ($begin === $length) {
                     $begin = false;
                     break;
-                } else if ($pattern[$begin] === '\\' && ($begin + 1) < $length) {
+                } elseif ($pattern[$begin] === '\\' && ($begin + 1) < $length) {
                     $begin++;
-                } else if ($pattern[$begin] === '{') {
+                } elseif ($pattern[$begin] === '{') {
                     break;
                 }
-                
+
                 $begin++;
             }
         }
@@ -133,7 +121,7 @@ protected static function fallbackGlob($pattern, $flags)
         if ($begin === false) {
             return self::systemGlob($pattern, $flags);
         }
-        
+
         $next = self::nextBraceSub($pattern, $begin + 1, $flags);
 
         if ($next === null) {
@@ -152,7 +140,7 @@ protected static function fallbackGlob($pattern, $flags)
 
         $p = $begin + 1;
 
-        while (true) {           
+        while (true) {
             $subPattern = substr($pattern, 0, $begin)
                         . substr($pattern, $p, $next - $p)
                         . substr($pattern, $rest + 1);
@@ -162,7 +150,7 @@ protected static function fallbackGlob($pattern, $flags)
             if ($result) {
                 $paths = array_merge($paths, $result);
             }
-            
+
             if ($pattern[$next] === '}') {
                 break;
             }
@@ -170,17 +158,17 @@ protected static function fallbackGlob($pattern, $flags)
             $p    = $next + 1;
             $next = self::nextBraceSub($pattern, $p, $flags);
         }
-        
+
         return array_unique($paths);
     }
-    
+
     /**
      * Find the end of the sub-pattern in a brace expression.
-     * 
+     *
      * @param  string  $pattern
      * @param  integer $begin
      * @param  integer $flags
-     * @return integer|null 
+     * @return integer|null
      */
     protected static function nextBraceSub($pattern, $begin, $flags)
     {
@@ -193,12 +181,12 @@ protected static function nextBraceSub($pattern, $begin, $flags)
                 if (++$current === $length) {
                     break;
                 }
-                
+
                 $current++;
-            } else {               
+            } else {
                 if (($pattern[$current] === '}' && $depth-- === 0) || ($pattern[$current] === ',' && $depth === 0)) {
                     break;
-                } else if ($pattern[$current++] === '{') {
+                } elseif ($pattern[$current++] === '{') {
                     $depth++;
                 }
             }
diff --git a/src/Hydrator/ArraySerializable.php b/src/Hydrator/ArraySerializable.php
index da5ed9c61..41dd7ab61 100644
--- a/src/Hydrator/ArraySerializable.php
+++ b/src/Hydrator/ArraySerializable.php
@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
- * @subpackage Hydrator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib\Hydrator;
@@ -27,17 +16,15 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage Hydrator
- * @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 ArraySerializable implements HydratorInterface
 {
     /**
      * Extract values from the provided object
-     * 
+     *
      * Extracts values via the object's getArrayCopy() method.
-     * 
-     * @param  object $object 
+     *
+     * @param  object $object
      * @return array
      * @throws Exception\BadMethodCallException for an $object not implementing getArrayCopy()
      */
@@ -55,11 +42,11 @@ public function extract($object)
     /**
      * Hydrate an object
      *
-     * Hydrates an object by passing $data to either its exchangeArray() or 
+     * Hydrates an object by passing $data to either its exchangeArray() or
      * populate() method.
-     * 
-     * @param  array $data 
-     * @param  object $object 
+     *
+     * @param  array $data
+     * @param  object $object
      * @return object
      * @throws Exception\BadMethodCallException for an $object not implementing exchangeArray() or populate()
      */
@@ -67,7 +54,7 @@ public function hydrate(array $data, $object)
     {
         if (is_callable(array($object, 'exchangeArray'))) {
             $object->exchangeArray($data);
-        } else if (is_callable(array($object, 'populate'))) {
+        } elseif (is_callable(array($object, 'populate'))) {
             $object->populate($data);
         } else {
             throw new Exception\BadMethodCallException(sprintf(
diff --git a/src/Hydrator/ClassMethods.php b/src/Hydrator/ClassMethods.php
index 3ee8da8dd..136aa5725 100644
--- a/src/Hydrator/ClassMethods.php
+++ b/src/Hydrator/ClassMethods.php
@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
- * @subpackage Hydrator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib\Hydrator;
@@ -27,32 +16,30 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage Hydrator
- * @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 ClassMethods implements HydratorInterface
 {
     /**
-     * CamelCase usage to extract attribute with getter/setter method name
+     * Flag defining whether array keys are underscore-separated (true) or camel case (false)
      * @var boolean
      */
-    protected $useCamelCase;
-    
+    protected $underscoreSeparatedKeys;
+
     /**
      * Define if extract values will use camel case or name with underscore
-     * @param boolean $useCamelCase 
+     * @param boolean $underscoreSeparatedKeys
      */
-    public function __construct($useCamelCase = true)
+    public function __construct($underscoreSeparatedKeys = true)
     {
-        $this->useCamelCase = $useCamelCase;
+        $this->underscoreSeparatedKeys = $underscoreSeparatedKeys;
     }
-    
+
     /**
      * Extract values from an object with class methods
      *
      * Extracts the getter/setter of the given $object.
-     * 
-     * @param  object $object 
+     *
+     * @param  object $object
      * @return array
      * @throws Exception\BadMethodCallException for a non-object $object
      */
@@ -64,9 +51,8 @@ public function extract($object)
                 __METHOD__
             ));
         }
-        
-        $transform = function($letters)
-        {
+
+        $transform = function($letters) {
             $letter = array_shift($letters);
             return '_' . strtolower($letter);
         };
@@ -81,13 +67,14 @@ public function extract($object)
                 }
                 $attribute = substr($method, 3);
                 $attribute = lcfirst($attribute);
-                if (!$this->useCamelCase) {
+                if ($this->underscoreSeparatedKeys) {
                     $attribute = preg_replace_callback('/([A-Z])/', $transform, $attribute);
                 }
-                 $attributes[$attribute] = $object->$method();
+
+                $attributes[$attribute] = $object->$method();
             }
         }
-        
+
         return $attributes;
     }
 
@@ -95,9 +82,9 @@ public function extract($object)
      * Hydrate an object by populating getter/setter methods
      *
      * Hydrates an object by getter/setter methods of the object.
-     * 
-     * @param  array $data 
-     * @param  object $object 
+     *
+     * @param  array $data
+     * @param  object $object
      * @return object
      * @throws Exception\BadMethodCallException for a non-object $object
      */
@@ -109,14 +96,14 @@ public function hydrate(array $data, $object)
                 __METHOD__
             ));
         }
-        
-        $transform = function($letters)
-        {   
+
+        $transform = function($letters) {
             $letter = substr(array_shift($letters), 1, 1);
             return ucfirst($letter);
         };
+
         foreach ($data as $property => $value) {
-            if (!$this->useCamelCase) {
+            if ($this->underscoreSeparatedKeys) {
                 $property = preg_replace_callback('/(_[a-z])/', $transform, $property);
             }
             $method = 'set' . ucfirst($property);
diff --git a/src/Hydrator/HydratorInterface.php b/src/Hydrator/HydratorInterface.php
index a97db30e5..d014b3fdc 100644
--- a/src/Hydrator/HydratorInterface.php
+++ b/src/Hydrator/HydratorInterface.php
@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
- * @subpackage Hydrator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib\Hydrator;
@@ -25,24 +14,22 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage Hydrator
- * @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 HydratorInterface
 {
     /**
      * Extract values from an object
-     * 
-     * @param  object $object 
+     *
+     * @param  object $object
      * @return array
      */
     public function extract($object);
 
     /**
      * Hydrate $object with the provided $data.
-     * 
-     * @param  array $data 
-     * @param  object $object 
+     *
+     * @param  array $data
+     * @param  object $object
      * @return object
      */
     public function hydrate(array $data, $object);
diff --git a/src/Hydrator/ObjectProperty.php b/src/Hydrator/ObjectProperty.php
index e0619bba5..c78ea76e8 100644
--- a/src/Hydrator/ObjectProperty.php
+++ b/src/Hydrator/ObjectProperty.php
@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
- * @subpackage Hydrator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib\Hydrator;
@@ -27,8 +16,6 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage Hydrator
- * @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 ObjectProperty implements HydratorInterface
 {
@@ -36,8 +23,8 @@ class ObjectProperty implements HydratorInterface
      * Extract values from an object
      *
      * Extracts the accessible non-static properties of the given $object.
-     * 
-     * @param  object $object 
+     *
+     * @param  object $object
      * @return array
      * @throws Exception\BadMethodCallException for a non-object $object
      */
@@ -57,9 +44,9 @@ public function extract($object)
      * Hydrate an object by populating public properties
      *
      * Hydrates an object by setting public properties of the object.
-     * 
-     * @param  array $data 
-     * @param  object $object 
+     *
+     * @param  array $data
+     * @param  object $object
      * @return object
      * @throws Exception\BadMethodCallException for a non-object $object
      */
diff --git a/src/Hydrator/Reflection.php b/src/Hydrator/Reflection.php
index 7bc9908fc..b79f8600c 100644
--- a/src/Hydrator/Reflection.php
+++ b/src/Hydrator/Reflection.php
@@ -1,10 +1,18 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace Zend\Stdlib\Hydrator;
 
 use ReflectionClass;
-use Zend\Stdlib\Hydrator\HydratorInterface;
 use Zend\Stdlib\Exception;
+use Zend\Stdlib\Hydrator\HydratorInterface;
 
 class Reflection implements HydratorInterface
 {
@@ -12,7 +20,7 @@ class Reflection implements HydratorInterface
      * Simple in-memory array cache of ReflectionProperties used.
      * @var array
      */
-    static protected $reflProperties = array();
+    protected static $reflProperties = array();
 
     /**
      * Extract values from an object
@@ -60,7 +68,7 @@ protected static function getReflProperties($input)
     {
         if (is_object($input)) {
             $input = get_class($input);
-        } else if (!is_string($input)) {
+        } elseif (!is_string($input)) {
             throw new Exception\InvalidArgumentException('Input must be a string or an object.');
         }
 
@@ -76,4 +84,4 @@ protected static function getReflProperties($input)
 
         return self::$reflProperties[$input];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Message.php b/src/Message.php
index 7a6bf8cdd..e5e8f088a 100644
--- a/src/Message.php
+++ b/src/Message.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace Zend\Stdlib;
 
@@ -17,13 +25,13 @@ class Message implements MessageInterface
     protected $content = '';
 
     /**
-     * Set message metadata 
+     * Set message metadata
      *
-     * Non-destructive setting of message metadata; always adds to the metadata, never overwrites 
+     * Non-destructive setting of message metadata; always adds to the metadata, never overwrites
      * the entire metadata container.
-     * 
-     * @param  string|int|array|Traversable $spec 
-     * @param  mixed $value 
+     *
+     * @param  string|int|array|Traversable $spec
+     * @param  mixed $value
      * @return Message
      */
     public function setMetadata($spec, $value = null)
@@ -46,8 +54,8 @@ public function setMetadata($spec, $value = null)
 
     /**
      * Retrieve all metadata or a single metadatum as specified by key
-     * 
-     * @param  null|string|int $key 
+     *
+     * @param  null|string|int $key
      * @param  null|mixed $default
      * @return mixed
      */
@@ -70,8 +78,8 @@ public function getMetadata($key = null, $default = null)
 
     /**
      * Set message content
-     * 
-     * @param  mixed $value 
+     *
+     * @param  mixed $value
      * @return Message
      */
     public function setContent($value)
@@ -82,7 +90,7 @@ public function setContent($value)
 
     /**
      * Get message content
-     * 
+     *
      * @return mixed
      */
     public function getContent()
diff --git a/src/MessageInterface.php b/src/MessageInterface.php
index 4be91949c..067ce262f 100644
--- a/src/MessageInterface.php
+++ b/src/MessageInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace Zend\Stdlib;
 
diff --git a/src/ParameterObjectInterface.php b/src/ParameterObjectInterface.php
index 095ba21bb..d173fe443 100644
--- a/src/ParameterObjectInterface.php
+++ b/src/ParameterObjectInterface.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -23,8 +13,6 @@
 /**
  * @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 ParameterObjectInterface
 {
diff --git a/src/Parameters.php b/src/Parameters.php
index aedc7ad2c..de67fe7b8 100644
--- a/src/Parameters.php
+++ b/src/Parameters.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace Zend\Stdlib;
 
@@ -11,8 +19,8 @@ class Parameters extends ArrayObject implements ParametersInterface
      *
      * Enforces that we have an array, and enforces parameter access to array
      * elements.
-     * 
-     * @param  array $values 
+     *
+     * @param  array $values
      * @return void
      */
     public function __construct(array $values = null)
@@ -25,8 +33,8 @@ public function __construct(array $values = null)
 
     /**
      * Populate from native PHP array
-     * 
-     * @param  array $values 
+     *
+     * @param  array $values
      * @return void
      */
     public function fromArray(array $values)
@@ -36,8 +44,8 @@ public function fromArray(array $values)
 
     /**
      * Populate from query string
-     * 
-     * @param  string $string 
+     *
+     * @param  string $string
      * @return void
      */
     public function fromString($string)
@@ -49,7 +57,7 @@ public function fromString($string)
 
     /**
      * Serialize to native PHP array
-     * 
+     *
      * @return array
      */
     public function toArray()
@@ -59,7 +67,7 @@ public function toArray()
 
     /**
      * Serialize to query string
-     * 
+     *
      * @return string
      */
     public function toString()
@@ -71,8 +79,8 @@ public function toString()
      * Retrieve by key
      *
      * Returns null if the key does not exist.
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @return mixed
      */
     public function offsetGet($name)
@@ -82,7 +90,7 @@ public function offsetGet($name)
         }
         return null;
     }
-    
+
     /**
      * @param string $name
      * @param mixed $default optional default value
@@ -95,7 +103,7 @@ public function get($name, $default = null)
         }
         return $default;
     }
-    
+
     /**
      * @param string $name
      * @param mixed $value
diff --git a/src/ParametersInterface.php b/src/ParametersInterface.php
index 5e8beccd6..42d309540 100644
--- a/src/ParametersInterface.php
+++ b/src/ParametersInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace Zend\Stdlib;
 
@@ -7,7 +15,7 @@
 use Serializable;
 use Traversable;
 
-/* 
+/*
  * Basically, an ArrayObject. You could simply define something like:
  *     class QueryParams extends ArrayObject implements Parameters {}
  * and have 90% of the functionality
@@ -27,8 +35,8 @@ public function toArray();
 
     /* Allow serialization to query format; e.g., for PUT or POST requests */
     public function toString();
-    
+
     public function get($name, $default = null);
-    
+
     public function set($name, $value);
 }
diff --git a/src/PriorityQueue.php b/src/PriorityQueue.php
index 2d2fe8ff2..372233f09 100644
--- a/src/PriorityQueue.php
+++ b/src/PriorityQueue.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -38,8 +28,6 @@
  *
  * @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 PriorityQueue implements Countable, IteratorAggregate, Serializable
 {
diff --git a/src/Request.php b/src/Request.php
index 4a474e7bb..b445e8a54 100644
--- a/src/Request.php
+++ b/src/Request.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace Zend\Stdlib;
 
diff --git a/src/RequestInterface.php b/src/RequestInterface.php
index e0ecf0442..0f72de7f1 100644
--- a/src/RequestInterface.php
+++ b/src/RequestInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace Zend\Stdlib;
 
diff --git a/src/Response.php b/src/Response.php
index 359b4034f..316b00325 100644
--- a/src/Response.php
+++ b/src/Response.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace Zend\Stdlib;
 
diff --git a/src/ResponseInterface.php b/src/ResponseInterface.php
index b669fd20e..5476f6a7f 100644
--- a/src/ResponseInterface.php
+++ b/src/ResponseInterface.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace Zend\Stdlib;
 
diff --git a/src/SplPriorityQueue.php b/src/SplPriorityQueue.php
index cceef40c0..a960d72a3 100644
--- a/src/SplPriorityQueue.php
+++ b/src/SplPriorityQueue.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -30,8 +20,6 @@
  *
  * @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 SplPriorityQueue extends \SplPriorityQueue implements Serializable
 {
@@ -43,11 +31,11 @@ class SplPriorityQueue extends \SplPriorityQueue implements Serializable
     /**
      * Insert a value with a given priority
      *
-     * Utilizes {@var $serial} to ensure that values of equal priority are 
+     * Utilizes {@var $serial} to ensure that values of equal priority are
      * emitted in the same order in which they are inserted.
-     * 
-     * @param  mixed $datum 
-     * @param  mixed $priority 
+     *
+     * @param  mixed $datum
+     * @param  mixed $priority
      * @return void
      */
     public function insert($datum, $priority)
@@ -62,7 +50,7 @@ public function insert($datum, $priority)
      * Serialize to an array
      *
      * Array will be priority => data pairs
-     * 
+     *
      * @return array
      */
     public function toArray()
@@ -91,7 +79,7 @@ public function toArray()
 
     /**
      * Serialize
-     * 
+     *
      * @return string
      */
     public function serialize()
@@ -114,7 +102,7 @@ public function serialize()
 
     /**
      * Deserialize
-     * 
+     *
      * @param  string $data
      * @return void
      */
diff --git a/src/SplQueue.php b/src/SplQueue.php
index ef7d6a4b9..e753201d8 100644
--- a/src/SplQueue.php
+++ b/src/SplQueue.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -27,14 +17,12 @@
  *
  * @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 SplQueue extends \SplQueue implements Serializable
 {
     /**
      * Return an array representing the queue
-     * 
+     *
      * @return array
      */
     public function toArray()
@@ -48,7 +36,7 @@ public function toArray()
 
     /**
      * Serialize
-     * 
+     *
      * @return string
      */
     public function serialize()
@@ -58,7 +46,7 @@ public function serialize()
 
     /**
      * Unserialize
-     * 
+     *
      * @param  string $data
      * @return void
      */
diff --git a/src/SplStack.php b/src/SplStack.php
index 139908ad2..be3c76a42 100644
--- a/src/SplStack.php
+++ b/src/SplStack.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -27,14 +17,12 @@
  *
  * @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 SplStack extends \SplStack implements Serializable
 {
     /**
      * Serialize to an array representing the stack
-     * 
+     *
      * @return array
      */
     public function toArray()
@@ -48,7 +36,7 @@ public function toArray()
 
     /**
      * Serialize
-     * 
+     *
      * @return string
      */
     public function serialize()
@@ -58,7 +46,7 @@ public function serialize()
 
     /**
      * Unserialize
-     * 
+     *
      * @param  string $data
      * @return void
      */
diff --git a/test/ArrayUtilsTest.php b/test/ArrayUtilsTest.php
index 01c73e5f6..15333bb1d 100644
--- a/test/ArrayUtilsTest.php
+++ b/test/ArrayUtilsTest.php
@@ -1,32 +1,20 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace ZendTest\Stdlib;
 
-use PHPUnit_Framework_TestCase as TestCase,
-    stdClass,
-    \ArrayObject,
-    Zend\Stdlib\ArrayUtils,
-    Zend\Config\Config;
+use PHPUnit_Framework_TestCase as TestCase;
+use stdClass;
+use ArrayObject;
+use Zend\Stdlib\ArrayUtils;
+use Zend\Config\Config;
 
 class ArrayUtilsTest extends TestCase
 {
diff --git a/test/CallbackHandlerTest.php b/test/CallbackHandlerTest.php
index c30507dfe..124be3a90 100644
--- a/test/CallbackHandlerTest.php
+++ b/test/CallbackHandlerTest.php
@@ -1,23 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace ZendTest\Stdlib;
@@ -29,8 +17,6 @@
  * @package    Zend_Stdlib
  * @subpackage UnitTests
  * @group      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 CallbackHandlerTest extends \PHPUnit_Framework_TestCase
 {
@@ -127,6 +113,40 @@ public function testStringCallbackConsistingOfNonStaticMethodShouldRaiseExceptio
         }
     }
 
+    public function testStringStaticCallbackForPhp54()
+    {
+        if (version_compare(PHP_VERSION, '5.4.0rc1', '<=')) {
+            $this->markTestSkipped('Requires PHP 5.4');
+        }
+
+        $handler = new CallbackHandler('ZendTest\\Stdlib\\SignalHandlers\\InstanceMethod::staticHandler');
+        $error   = false;
+        set_error_handler(function ($errno, $errstr) use (&$error) {
+            $error = true;
+        }, E_STRICT);
+        $result = $handler->call();
+        restore_error_handler();
+        $this->assertFalse($error);
+        $this->assertSame('staticHandler', $result);
+    }
+
+    public function testStringStaticCallbackForPhp54WithMoreThan3Args()
+    {
+        if (version_compare(PHP_VERSION, '5.4.0rc1', '<=')) {
+            $this->markTestSkipped('Requires PHP 5.4');
+        }
+
+        $handler = new CallbackHandler('ZendTest\\Stdlib\\SignalHandlers\\InstanceMethod::staticHandler');
+        $error   = false;
+        set_error_handler(function ($errno, $errstr) use (&$error) {
+            $error = true;
+        }, E_STRICT);
+        $result = $handler->call(array(1, 2, 3, 4));
+        restore_error_handler();
+        $this->assertFalse($error);
+        $this->assertSame('staticHandler', $result);
+    }
+
     public function testCallbackToClassImplementingOverloadingButNotInvocableShouldRaiseException()
     {
         $this->setExpectedException('Zend\Stdlib\Exception\InvalidCallbackException');
diff --git a/test/ErrorHandlerTest.php b/test/ErrorHandlerTest.php
index 0c53059bd..f1613d4e1 100644
--- a/test/ErrorHandlerTest.php
+++ b/test/ErrorHandlerTest.php
@@ -1,9 +1,17 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace ZendTest\Stdlib;
 
-use PHPUnit_Framework_TestCase as TestCase,
-    Zend\Stdlib\ErrorHandler;
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Stdlib\ErrorHandler;
 
 class ErrorHandlerTest extends TestCase
 {
diff --git a/test/GlobTest.php b/test/GlobTest.php
index 0ea85c51d..6eca47add 100644
--- a/test/GlobTest.php
+++ b/test/GlobTest.php
@@ -1,29 +1,17 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace ZendTest\Stdlib;
 
-use PHPUnit_Framework_TestCase as TestCase,
-    Zend\Stdlib\Glob;
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Stdlib\Glob;
 
 class GlobTest extends TestCase
 {
@@ -32,10 +20,16 @@ public function testFallback()
         if (!defined('GLOB_BRACE')) {
             $this->markTestSkipped('GLOB_BRACE not available');
         }
-        
+
         $this->assertEquals(
             glob(__DIR__ . '/_files/{alph,bet}a', GLOB_BRACE),
             Glob::glob(__DIR__ . '/_files/{alph,bet}a', Glob::GLOB_BRACE, true)
         );
     }
+
+    public function testNonMatchingGlobReturnsArray()
+    {
+        $result = Glob::glob('/some/path/{,*.}{this,orthis}.php', Glob::GLOB_BRACE);
+        $this->assertInternalType('array', $result);
+    }
 }
diff --git a/test/HydratorTest.php b/test/HydratorTest.php
index d6fd41d23..10fae389e 100644
--- a/test/HydratorTest.php
+++ b/test/HydratorTest.php
@@ -1,23 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace ZendTest\Stdlib;
@@ -34,8 +22,6 @@
  * @package    Zend_Stdlib
  * @subpackage UnitTests
  * @group      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 HydratorTest extends \PHPUnit_Framework_TestCase
 {
@@ -67,7 +53,7 @@ public function setUp()
         $this->classMethodsUnderscore = new ClassMethodsUnderscore();
         $this->reflection = new ReflectionAsset;
     }
-    
+
     public function testInitiateValues()
     {
         $this->assertEquals($this->classMethodsCamelCase->getFooBar(), '1');
@@ -95,7 +81,7 @@ public function testHydratorReflection()
 
     public function testHydratorClassMethodsCamelCase()
     {
-        $hydrator = new ClassMethods(true);
+        $hydrator = new ClassMethods(false);
         $datas = $hydrator->extract($this->classMethodsCamelCase);
         $this->assertTrue(isset($datas['fooBar']));
         $this->assertEquals($datas['fooBar'], '1');
@@ -106,10 +92,10 @@ public function testHydratorClassMethodsCamelCase()
         $this->assertEquals($test->getFooBar(), 'foo');
         $this->assertEquals($test->getFooBarBaz(), 'bar');
     }
-    
+
     public function testHydratorClassMethodsCamelCaseWithSetterMissing()
     {
-        $hydrator = new ClassMethods(true);
+        $hydrator = new ClassMethods(false);
         $datas = $hydrator->extract($this->classMethodsCamelCaseMissing);
         $this->assertTrue(isset($datas['fooBar']));
         $this->assertEquals($datas['fooBar'], '1');
@@ -120,10 +106,10 @@ public function testHydratorClassMethodsCamelCaseWithSetterMissing()
         $this->assertEquals($test->getFooBar(), 'foo');
         $this->assertEquals($test->getFooBarBaz(), '2');
     }
-    
+
     public function testHydratorClassMethodsUnderscore()
     {
-        $hydrator = new ClassMethods(false);
+        $hydrator = new ClassMethods(true);
         $datas = $hydrator->extract($this->classMethodsUnderscore);
         $this->assertTrue(isset($datas['foo_bar']));
         $this->assertEquals($datas['foo_bar'], '1');
@@ -137,7 +123,7 @@ public function testHydratorClassMethodsUnderscore()
 
     public function testHydratorClassMethodsIgnoresInvalidValues()
     {
-        $hydrator = new ClassMethods(false);
+        $hydrator = new ClassMethods(true);
         $data = array(
             'foo_bar' => '1',
             'foo_bar_baz' => '2',
@@ -146,4 +132,18 @@ public function testHydratorClassMethodsIgnoresInvalidValues()
         $test = $hydrator->hydrate($data, $this->classMethodsUnderscore);
         $this->assertSame($this->classMethodsUnderscore, $test);
     }
+
+    public function testHydratorClassMethodsDefaultBehaviorIsConvertUnderscoreToCamelCase()
+    {
+        $hydrator = new ClassMethods();
+        $datas = $hydrator->extract($this->classMethodsUnderscore);
+        $this->assertTrue(isset($datas['foo_bar']));
+        $this->assertEquals($datas['foo_bar'], '1');
+        $this->assertTrue(isset($datas['foo_bar_baz']));
+        $this->assertFalse(isset($datas['fooBar']));
+        $test = $hydrator->hydrate(array('foo_bar' => 'foo', 'foo_bar_baz' => 'bar'), $this->classMethodsUnderscore);
+        $this->assertSame($this->classMethodsUnderscore, $test);
+        $this->assertEquals($test->getFooBar(), 'foo');
+        $this->assertEquals($test->getFooBarBaz(), 'bar');
+    }
 }
diff --git a/test/MessageTest.php b/test/MessageTest.php
index 6060bb31d..9f81add04 100644
--- a/test/MessageTest.php
+++ b/test/MessageTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace ZendTest\Http;
 
@@ -13,7 +21,7 @@ public function testMessageCanSetAndGetContent()
         $this->assertInstanceOf('Zend\Stdlib\Message', $ret);
         $this->assertEquals('I can set content', $message->getContent());
     }
-    
+
     public function testMessageCanSetAndGetMetadataKeyAsString()
     {
         $message = new Message();
@@ -22,7 +30,7 @@ public function testMessageCanSetAndGetMetadataKeyAsString()
         $this->assertEquals('bar', $message->getMetadata('foo'));
         $this->assertEquals(array('foo' => 'bar'), $message->getMetadata());
     }
-    
+
     public function testMessageCanSetAndGetMetadataKeyAsArray()
     {
         $message = new Message();
@@ -30,29 +38,29 @@ public function testMessageCanSetAndGetMetadataKeyAsArray()
         $this->assertInstanceOf('Zend\Stdlib\Message', $ret);
         $this->assertEquals('bar', $message->getMetadata('foo'));
     }
-    
+
     public function testMessageGetMetadataWillUseDefaultValueIfNoneExist()
     {
         $message = new Message();
         $this->assertEquals('bar', $message->getMetadata('foo', 'bar'));
     }
-    
+
     public function testMessageThrowsExceptionOnInvalidKeyForMetadataSet()
     {
         $message = new Message();
-        
+
         $this->setExpectedException('Zend\Stdlib\Exception\InvalidArgumentException');
         $message->setMetadata(new \stdClass());
     }
-    
+
     public function testMessageThrowsExceptionOnInvalidKeyForMetadataGet()
     {
         $message = new Message();
-        
+
         $this->setExpectedException('Zend\Stdlib\Exception\InvalidArgumentException');
         $message->getMetadata(new \stdClass());
     }
-    
+
     public function testMessageToStringWorks()
     {
         $message = new Message();
diff --git a/test/OptionsTest.php b/test/OptionsTest.php
index 2678f24f1..a834bde93 100644
--- a/test/OptionsTest.php
+++ b/test/OptionsTest.php
@@ -1,29 +1,54 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace ZendTest\Stdlib;
 
-use ArrayObject,
-    ZendTest\Stdlib\TestAsset\TestOptions,
-    ZendTest\Stdlib\TestAsset\TestTraversable,
-    Zend\Stdlib\Exception\InvalidArgumentException;
+use ArrayObject;
+use ZendTest\Stdlib\TestAsset\TestOptions;
+use ZendTest\Stdlib\TestAsset\TestOptionsNoStrict;
+use ZendTest\Stdlib\TestAsset\TestTraversable;
+use Zend\Stdlib\Exception\InvalidArgumentException;
 
 class OptionsTest extends \PHPUnit_Framework_TestCase
 {
     public function testConstructionWithArray()
     {
         $options = new TestOptions(array('test_field' => 1));
-        
+
         $this->assertEquals(1, $options->test_field);
     }
-    
+
     public function testConstructionWithTraversable()
     {
         $config = new ArrayObject(array('test_field' => 1));
         $options = new TestOptions($config);
-        
+
         $this->assertEquals(1, $options->test_field);
     }
-    
+
+    public function testInvalidFieldThrowsException()
+    {
+        $this->setExpectedException('BadMethodCallException');
+        $options = new TestOptions(array('foo' => 'bar'));
+    }
+
+    public function testNonStrictOptionsDoesNotThrowException()
+    {
+        try {
+            $options = new TestOptionsNoStrict(array('foo' => 'bar'));
+        } catch (\Exception $e) {
+            $this->fail('Nonstrict options should not throw an exception');
+        }
+    }
+
+
     public function testConstructionWithNull()
     {
         try {
@@ -32,14 +57,13 @@ public function testConstructionWithNull()
             $this->fail("Unexpected InvalidArgumentException raised");
         }
     }
-    
+
     public function testUnsetting()
     {
         $options = new TestOptions(array('test_field' => 1));
-        
+
         $this->assertEquals(true, isset($options->test_field));
         unset($options->testField);
         $this->assertEquals(false, isset($options->test_field));
-        
     }
 }
diff --git a/test/ParametersTest.php b/test/ParametersTest.php
index 7f4e1cb61..5ebba9b14 100644
--- a/test/ParametersTest.php
+++ b/test/ParametersTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace ZendTest\Stdlib;
 
diff --git a/test/PriorityQueueTest.php b/test/PriorityQueueTest.php
index efe464577..47373fa04 100644
--- a/test/PriorityQueueTest.php
+++ b/test/PriorityQueueTest.php
@@ -1,36 +1,23 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace ZendTest\Stdlib;
 
-use Zend\Stdlib\PriorityQueue,
-    SplPriorityQueue;
+use Zend\Stdlib\PriorityQueue;
+use SplPriorityQueue;
 
 /**
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage UnitTests
  * @group      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 PriorityQueueTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/test/SignalHandlers/InstanceMethod.php b/test/SignalHandlers/InstanceMethod.php
index 393d32710..f0a37fd1c 100644
--- a/test/SignalHandlers/InstanceMethod.php
+++ b/test/SignalHandlers/InstanceMethod.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
+
 namespace ZendTest\Stdlib\SignalHandlers;
 
 class InstanceMethod
@@ -7,4 +16,9 @@ public function handler()
     {
         return __FUNCTION__;
     }
+
+    static public function staticHandler()
+    {
+        return __FUNCTION__;
+    }
 }
diff --git a/test/SignalHandlers/Invokable.php b/test/SignalHandlers/Invokable.php
index c1e164200..f894fd23a 100644
--- a/test/SignalHandlers/Invokable.php
+++ b/test/SignalHandlers/Invokable.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
+
 namespace ZendTest\Stdlib\SignalHandlers;
 
 class Invokable
diff --git a/test/SignalHandlers/ObjectCallback.php b/test/SignalHandlers/ObjectCallback.php
index 1aafaddbe..1948a2a1d 100644
--- a/test/SignalHandlers/ObjectCallback.php
+++ b/test/SignalHandlers/ObjectCallback.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
+
 namespace ZendTest\Stdlib\SignalHandlers;
 
 class ObjectCallback
diff --git a/test/SignalHandlers/Overloadable.php b/test/SignalHandlers/Overloadable.php
index aa8e03d26..8e17b45e7 100644
--- a/test/SignalHandlers/Overloadable.php
+++ b/test/SignalHandlers/Overloadable.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
+
 namespace ZendTest\Stdlib\SignalHandlers;
 
 class Overloadable
diff --git a/test/SplPriorityQueueTest.php b/test/SplPriorityQueueTest.php
index fe8a987ff..40a3c4ea6 100644
--- a/test/SplPriorityQueueTest.php
+++ b/test/SplPriorityQueueTest.php
@@ -1,23 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace ZendTest\Stdlib;
@@ -29,8 +17,6 @@
  * @package    Zend_Stdlib
  * @subpackage UnitTests
  * @group      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 SplPriorityQueueTest extends \PHPUnit_Framework_TestCase
 {
@@ -80,9 +66,9 @@ public function testSerializationAndDeserializationShouldMaintainState()
     public function testCanRetrieveQueueAsArray()
     {
         $expected = array(
-            'bar', 
-            'foo', 
-            'baz', 
+            'bar',
+            'foo',
+            'baz',
             'bat',
         );
         $test     = $this->queue->toArray();
diff --git a/test/SplQueueTest.php b/test/SplQueueTest.php
index 7412a68e0..5eb3af1ac 100644
--- a/test/SplQueueTest.php
+++ b/test/SplQueueTest.php
@@ -1,23 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace ZendTest\Stdlib;
@@ -29,8 +17,6 @@
  * @package    Zend_Stdlib
  * @subpackage UnitTests
  * @group      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 SplQueueTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/test/SplStackTest.php b/test/SplStackTest.php
index 3fbb6a842..18c2ea0db 100644
--- a/test/SplStackTest.php
+++ b/test/SplStackTest.php
@@ -1,23 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
  */
 
 namespace ZendTest\Stdlib;
@@ -29,8 +17,6 @@
  * @package    Zend_Stdlib
  * @subpackage UnitTests
  * @group      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 SplStackTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/test/TestAsset/ClassMethodsCamelCase.php b/test/TestAsset/ClassMethodsCamelCase.php
index 2e9fc6ce6..4371637ca 100644
--- a/test/TestAsset/ClassMethodsCamelCase.php
+++ b/test/TestAsset/ClassMethodsCamelCase.php
@@ -1,32 +1,40 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace ZendTest\Stdlib\TestAsset;
 
 class ClassMethodsCamelCase
 {
     protected $fooBar = '1';
-    
+
     protected $fooBarBaz = '2';
-    
+
     public function getFooBar()
     {
         return $this->fooBar;
     }
-    
+
     public function setFooBar($value)
     {
         $this->fooBar = $value;
         return $this;
     }
-    
+
     public function getFooBarBaz()
     {
         return $this->fooBarBaz;
     }
-    
+
     public function setFooBarBaz($value)
     {
         $this->fooBarBaz = $value;
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/test/TestAsset/ClassMethodsCamelCaseMissing.php b/test/TestAsset/ClassMethodsCamelCaseMissing.php
index 03ffb4ee4..7ad333e26 100644
--- a/test/TestAsset/ClassMethodsCamelCaseMissing.php
+++ b/test/TestAsset/ClassMethodsCamelCaseMissing.php
@@ -1,36 +1,44 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace ZendTest\Stdlib\TestAsset;
 
 class ClassMethodsCamelCaseMissing
 {
     protected $fooBar = '1';
-    
+
     protected $fooBarBaz = '2';
-    
+
     public function getFooBar()
     {
         return $this->fooBar;
     }
-    
+
     public function setFooBar($value)
     {
         $this->fooBar = $value;
         return $this;
     }
-    
+
     public function getFooBarBaz()
     {
         return $this->fooBarBaz;
     }
-    
+
     /*
      * comment to detection verification
-     * 
+     *
     public function setFooBarBaz($value)
     {
         $this->fooBarBaz = $value;
         return $this;
     }
     */
-}
\ No newline at end of file
+}
diff --git a/test/TestAsset/ClassMethodsUnderscore.php b/test/TestAsset/ClassMethodsUnderscore.php
index 35c4c0baa..47d5cf1bb 100644
--- a/test/TestAsset/ClassMethodsUnderscore.php
+++ b/test/TestAsset/ClassMethodsUnderscore.php
@@ -1,32 +1,40 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace ZendTest\Stdlib\TestAsset;
 
 class ClassMethodsUnderscore
 {
     protected $foo_bar = '1';
-    
+
     protected $foo_bar_baz = '2';
-    
+
     public function getFooBar()
     {
         return $this->foo_bar;
     }
-    
+
     public function setFooBar($value)
     {
         $this->foo_bar = $value;
         return $this;
     }
-    
+
     public function getFooBarBaz()
     {
         return $this->foo_bar_baz;
     }
-    
+
     public function setFooBarBaz($value)
     {
         $this->foo_bar_baz = $value;
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/test/TestAsset/Reflection.php b/test/TestAsset/Reflection.php
index 9d23e285b..97ddc1b12 100644
--- a/test/TestAsset/Reflection.php
+++ b/test/TestAsset/Reflection.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace ZendTest\Stdlib\TestAsset;
 
@@ -19,4 +27,4 @@ public function getFooBarBaz()
     {
         return $this->fooBarBaz;
     }
-}
\ No newline at end of file
+}
diff --git a/test/TestAsset/TestOptions.php b/test/TestAsset/TestOptions.php
index 85bcf5f0c..a2fbe9842 100644
--- a/test/TestAsset/TestOptions.php
+++ b/test/TestAsset/TestOptions.php
@@ -1,21 +1,29 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
 
 namespace ZendTest\Stdlib\TestAsset;
 
-use Zend\Stdlib\Options;
+use Zend\Stdlib\AbstractOptions;
 
 /**
  * Dummy TestOptions used to test Stdlib\Options
  */
-class TestOptions extends Options
+class TestOptions extends AbstractOptions
 {
     protected $testField;
-    
-    public function setTestField($value) 
+
+    public function setTestField($value)
     {
         $this->testField = $value;
     }
-    
+
     public function getTestField()
     {
         return $this->testField;
diff --git a/test/TestAsset/TestOptionsNoStrict.php b/test/TestAsset/TestOptionsNoStrict.php
new file mode 100644
index 000000000..cd1a557ba
--- /dev/null
+++ b/test/TestAsset/TestOptionsNoStrict.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
+
+namespace ZendTest\Stdlib\TestAsset;
+
+use Zend\Stdlib\AbstractOptions;
+
+/**
+ * Dummy TestOptions used to test Stdlib\Options
+ */
+class TestOptionsNoStrict extends AbstractOptions
+{
+    protected $__strictMode__ = false;
+
+    protected $testField;
+
+    public function setTestField($value)
+    {
+        $this->testField = $value;
+    }
+
+    public function getTestField()
+    {
+        return $this->testField;
+    }
+}