Merge branch 'master' of https://github.com/zendframework/zf2

composer.json

@@ -10,10 +10,7 @@
     "autoload": {
         "psr-4": {
             "Zend\\Session\\": "src/"
-        },
-        "files": [
-            "Zend/Session/compatibility/autoload.php"
-        ]
+        }
     },
     "require": {
         "php": ">=5.3.3",

src/Container.php

@@ -9,6 +9,12 @@
 
 namespace Zend\Session;
 
+if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
+    class_alias('Zend\Session\AbstractContainer', 'Zend\Session\AbstractBaseContainer');
+} else {
+    class_alias('Zend\Session\Container\PhpReferenceCompatibility', 'Zend\Session\AbstractBaseContainer');
+}
+
 /**
  * Session storage container
  *
@@ -17,24 +23,6 @@
  * Additionally, expiries may be absolute TTLs or measured in "hops", which
  * are based on how many times the key or container were accessed.
  */
-class Container extends AbstractContainer
+class Container extends AbstractBaseContainer
 {
-    /**
-     * Retrieve a specific key in the container
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function &offsetGet($key)
-    {
-        $ret = null;
-        if (!$this->offsetExists($key)) {
-            return $ret;
-        }
-        $storage = $this->getStorage();
-        $name    = $this->getName();
-        $ret =& $storage[$name][$key];
-
-        return $ret;
-    }
 }

src/Container/PhpReferenceCompatibility.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Session\Container;
+
+use Zend\Session\AbstractContainer;
+
+/**
+ * Session storage container for PHP 5.3.4 and above.
+ */
+abstract class PhpReferenceCompatibility extends AbstractContainer
+{
+    /**
+     * Retrieve a specific key in the container
+     *
+     * @param  string $key
+     * @return mixed
+     */
+    public function &offsetGet($key)
+    {
+        $ret = null;
+        if (!$this->offsetExists($key)) {
+            return $ret;
+        }
+        $storage = $this->getStorage();
+        $name    = $this->getName();
+        $ret =& $storage[$name][$key];
+
+        return $ret;
+    }
+}

src/Storage/AbstractSessionArrayStorage.php

@@ -25,8 +25,6 @@ abstract class AbstractSessionArrayStorage implements IteratorAggregate, Storage
      * Constructor
      *
      * @param array|null $input
-     * @param int        $flags
-     * @param string     $iteratorClass
      */
     public function __construct($input = null)
     {
@@ -169,6 +167,7 @@ public function serialize()
     /**
      * Unserialize
      *
+     * @param  string $session
      * @return mixed
      */
     public function unserialize($session)
@@ -448,8 +447,7 @@ protected function setRequestAccessTime($time)
     /**
      * Cast the object to an array
      *
-     * Returns data only, no metadata.
-     *
+     * @param  bool $metaData Whether to include metadata
      * @return array
      */
     public function toArray($metaData = false)

src/Storage/ArrayStorage.php

@@ -342,8 +342,7 @@ public function fromArray(array $array)
     /**
      * Cast the object to an array
      *
-     * Returns data only, no metadata.
-     *
+     * @param  bool $metaData Whether to include metadata
      * @return array
      */
     public function toArray($metaData = false)

src/Storage/SessionArrayStorage.php

@@ -9,30 +9,15 @@
 
 namespace Zend\Session\Storage;
 
+if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
+    class_alias('Zend\Session\Storage\AbstractSessionArrayStorage', 'Zend\Session\Storage\AbstractBaseSessionArrayStorage');
+} else {
+    class_alias('Zend\Session\Storage\SessionArrayStorage\PhpReferenceCompatibility', 'Zend\Session\Storage\AbstractBaseSessionArrayStorage');
+}
+
 /**
  * Session storage in $_SESSION
  */
-class SessionArrayStorage extends AbstractSessionArrayStorage
+class SessionArrayStorage extends AbstractBaseSessionArrayStorage
 {
-    /**
-     * Get Offset
-     *
-     * @param  mixed $key
-     * @return mixed
-     */
-    public function &__get($key)
-    {
-        return $_SESSION[$key];
-    }
-
-    /**
-     * Offset Get
-     *
-     * @param  mixed $key
-     * @return mixed
-     */
-    public function &offsetGet($key)
-    {
-        return $_SESSION[$key];
-    }
 }

src/Storage/SessionArrayStorage/PhpReferenceCompatibility.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Session\Storage\SessionArrayStorage;
+
+use Zend\Session\Storage\AbstractSessionArrayStorage;
+
+/**
+ * PHP 5.3.4 and greater variant of SessionArrayStorage
+ */
+abstract class PhpReferenceCompatibility extends AbstractSessionArrayStorage
+{
+    /**
+     * Get Offset
+     *
+     * @param  mixed $key
+     * @return mixed
+     */
+    public function &__get($key)
+    {
+        return $_SESSION[$key];
+    }
+
+    /**
+     * Offset Get
+     *
+     * @param  mixed $key
+     * @return mixed
+     */
+    public function &offsetGet($key)
+    {
+        return $_SESSION[$key];
+    }
+}

src/compatibility/autoload.php

@@ -1,5 +1,14 @@
 <?php
-if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
-    require_once __DIR__ . '/Container.php';
-    require_once __DIR__ . '/Storage/SessionArrayStorage.php';
-}
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @deprecated
+ */
+
+/**
+ * Legacy purposes only, to prevent code that references it from breaking.
+ */
+trigger_error('Polyfill autoload support (file library/Zend/Session/compatibility/autoload.php) is no longer necessary; please remove your require statement referencing this file', E_USER_DEPRECATED);