Merge remote-tracking branch 'upstream/master'

Conflicts: library/Zend/Soap/Wsdl.php tests/Zend/Soap/Server/DocumentLiteralWrapperTest.php tests/Zend/Soap/WsdlTest.php
zendframework · Jan 25, 2013 · 12f1dca · 12f1dca
commit 12f1dca
Show file tree

Hide file tree

Showing 17 changed files with 258 additions and 453 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-memory",
-    "description": "Zend\\Memory component",
+    "description": " ",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.3.23"
+        "php": ">=5.3.3"
     },
     "require-dev": {
         "zendframework/zend-cache": "self.version",

diff --git a/src/Container/AbstractContainer.php b/src/Container/AbstractContainer.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_Memory
- * @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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Memory
  */
 
 namespace Zend\Memory\Container;
@@ -25,8 +15,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @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 AbstractContainer implements ContainerInterface
 {

diff --git a/src/Container/AccessController.php b/src/Container/AccessController.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_Memory
- * @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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Memory
  */
 
 namespace Zend\Memory\Container;
@@ -27,15 +17,13 @@
  * So container objects always have at least one reference and can't be automatically destroyed.
  *
  * This class is intended to be an userland proxy to memory container object.
- * It's not referenced by memory manager and class destructor is invoked immidiately after gouing
+ * It's not referenced by memory manager and class destructor is invoked immediately after going
  * out of scope or unset operation.
  *
  * Class also provides Zend\Memory\Container interface and works as proxy for such cases.
  *
  * @category   Zend
  * @package    Zend_Memory
- * @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 AccessController implements ContainerInterface
 {
@@ -44,7 +32,7 @@ class AccessController implements ContainerInterface
      *
      * @var Movable
      */
-    private $_memContainer;
+    private $memContainer;
 
 
     /**
@@ -54,15 +42,15 @@ class AccessController implements ContainerInterface
      */
     public function __construct(Movable $memContainer)
     {
-        $this->_memContainer = $memContainer;
+        $this->memContainer = $memContainer;
     }
 
     /**
      * Object destructor
      */
     public function __destruct()
     {
-        $this->_memContainer->destroy();
+        $this->memContainer->destroy();
     }
 
 
@@ -76,7 +64,7 @@ public function __destruct()
      */
     public function &getRef()
     {
-        return $this->_memContainer->getRef();
+        return $this->memContainer->getRef();
     }
 
     /**
@@ -86,15 +74,15 @@ public function &getRef()
      */
     public function touch()
     {
-        $this->_memContainer->touch();
+        $this->memContainer->touch();
     }
 
     /**
      * Lock object in memory.
      */
     public function lock()
     {
-        $this->_memContainer->lock();
+        $this->memContainer->lock();
     }
 
 
@@ -103,17 +91,17 @@ public function lock()
      */
     public function unlock()
     {
-        $this->_memContainer->unlock();
+        $this->memContainer->unlock();
     }
 
     /**
      * Return true if object is locked
      *
-     * @return boolean
+     * @return bool
      */
     public function isLocked()
     {
-        return $this->_memContainer->isLocked();
+        return $this->memContainer->isLocked();
     }
 
     /**
@@ -127,7 +115,7 @@ public function isLocked()
      */
     public function __get($property)
     {
-        return $this->_memContainer->$property;
+        return $this->memContainer->$property;
     }
 
     /**
@@ -138,6 +126,6 @@ public function __get($property)
      */
     public function __set($property, $value)
     {
-        $this->_memContainer->$property = $value;
+        $this->memContainer->$property = $value;
     }
 }
diff --git a/src/Container/ContainerInterface.php b/src/Container/ContainerInterface.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_Memory
- * @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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Memory
  */
 
 namespace Zend\Memory\Container;
@@ -25,8 +15,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @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 ContainerInterface
 {
@@ -60,8 +48,7 @@ public function unlock();
     /**
      * Return true if object is locked
      *
-     * @return boolean
+     * @return bool
      */
     public function isLocked();
 }
-
diff --git a/src/Container/Locked.php b/src/Container/Locked.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_Memory
- * @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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Memory
  */
 
 namespace Zend\Memory\Container;
@@ -27,8 +17,6 @@
  *
  * @category   Zend
  * @package    Zend_Memory
- * @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 Locked extends AbstractContainer
 {
@@ -69,7 +57,7 @@ public function unlock()
     /**
      * Return true if object is locked
      *
-     * @return boolean
+     * @return bool
      */
     public function isLocked()
     {