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

zendframework · Aug 13, 2012 · e375cf4 · e375cf4
3 parents 7cb373f + d917e2a + e1d5120
commit e375cf4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Container/Movable.php b/src/Container/Movable.php
@@ -76,7 +76,7 @@ public function __construct(Memory\MemoryManager $memoryManager, $id, $value)
      */
     public function lock()
     {
-        if ( !($this->state & self::LOADED) ) {
+        if (!($this->state & self::LOADED)) {
             $this->memManager->load($this, $this->id);
             $this->state |= self::LOADED;
         }
@@ -125,7 +125,7 @@ public function __get($property)
             throw new Exception\InvalidArgumentException('Unknown property: \Zend\Memory\Container\Movable::$' . $property);
         }
 
-        if ( !($this->state & self::LOADED) ) {
+        if (!($this->state & self::LOADED)) {
             $this->memManager->load($this, $this->id);
             $this->state |= self::LOADED;
         }
@@ -163,7 +163,7 @@ public function __set($property, $value)
      */
     public function &getRef()
     {
-        if ( !($this->state & self::LOADED) ) {
+        if (!($this->state & self::LOADED)) {
             $this->memManager->load($this, $this->id);
             $this->state |= self::LOADED;
         }
@@ -202,7 +202,7 @@ public function processUpdate()
      */
     public function startTrace()
     {
-        if ( !($this->state & self::LOADED) ) {
+        if (!($this->state & self::LOADED)) {
             $this->memManager->load($this, $this->id);
             $this->state |= self::LOADED;
         }

diff --git a/src/MemoryManager.php b/src/MemoryManager.php
@@ -320,7 +320,7 @@ public function processUpdate(Container\Movable $container, $id)
         }
 
         // Remove just updated object from list of candidates to unload
-        if( isset($this->unloadCandidates[$id])) {
+        if ( isset($this->unloadCandidates[$id])) {
             unset($this->unloadCandidates[$id]);
         }