Merge f9a8954 into a97fc91

zendframework · May 1, 2015 · 40a11d3 · 40a11d3
2 parents a97fc91 + f9a8954
commit 40a11d3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/library/Zend/Memory/Container/Movable.php b/library/Zend/Memory/Container/Movable.php
@@ -102,7 +102,7 @@ public function unlock()
      */
     public function isLocked()
     {
-        return $this->state & self::LOCKED;
+        return (bool) ($this->state & self::LOCKED);
     }
 
     /**

diff --git a/tests/ZendTest/Memory/AccessControllerTest.php b/tests/ZendTest/Memory/AccessControllerTest.php
@@ -79,9 +79,9 @@ public function testLock()
         $this->assertFalse((bool) $memObject->isLocked());
 
         $memObject->lock();
-        $this->assertTrue((bool) $memObject->isLocked());
+        $this->assertTrue($memObject->isLocked());
 
         $memObject->unlock();
-        $this->assertFalse((bool) $memObject->isLocked());
+        $this->assertFalse($memObject->isLocked());
     }
 }
diff --git a/tests/ZendTest/Memory/LockedTest.php b/tests/ZendTest/Memory/LockedTest.php
@@ -58,14 +58,14 @@ public function testLock()
         $memObject = new Container\Locked('0123456789');
 
         // It's always locked
-        $this->assertTrue((bool) $memObject->isLocked());
+        $this->assertTrue($memObject->isLocked());
 
         $memObject->lock();
-        $this->assertTrue((bool) $memObject->isLocked());
+        $this->assertTrue($memObject->isLocked());
 
         $memObject->unlock();
         // It's always locked
-        $this->assertTrue((bool) $memObject->isLocked());
+        $this->assertTrue($memObject->isLocked());
     }
 
     /**

diff --git a/tests/ZendTest/Memory/MovableTest.php b/tests/ZendTest/Memory/MovableTest.php
@@ -62,13 +62,13 @@ public function testLock()
         $memoryManager = new DummyMemoryManager();
         $memObject = new Container\Movable($memoryManager, 10, '0123456789');
 
-        $this->assertFalse((bool) $memObject->isLocked());
+        $this->assertFalse($memObject->isLocked());
 
         $memObject->lock();
-        $this->assertTrue((bool) $memObject->isLocked());
+        $this->assertTrue($memObject->isLocked());
 
         $memObject->unlock();
-        $this->assertFalse((bool) $memObject->isLocked());
+        $this->assertFalse($memObject->isLocked());
     }
 
     /**