Merge pull request #102 from hskrasek/master

Update RackspaceAdapter->has() to catch OpenCloud ObjectNotFoundExceptio...
thephpleague · Mar 4, 2014 · 2cd198f · 2cd198f
2 parents ee607ae + dfaf088
commit 2cd198f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/Adapter/Rackspace.php b/src/Adapter/Rackspace.php
@@ -5,6 +5,7 @@
 use League\Flysystem\Util;
 use OpenCloud\ObjectStore\Resource\Container;
 use OpenCloud\ObjectStore\Resource\DataObject;
+use OpenCloud\ObjectStore\Exception\ObjectNotFoundException;
 use Guzzle\Http\Exception\ClientErrorResponseException;
 
 class Rackspace extends AbstractAdapter
@@ -163,6 +164,8 @@ public function has($path)
             $object = $this->getObject($path);
         } catch(ClientErrorResponseException $e) {
             return false;
+        } catch(ObjectNotFoundException $e) {
+            return false;
         }
 
         return $this->normalizeObject($object);

diff --git a/tests/RackspaceTests.php b/tests/RackspaceTests.php
@@ -49,6 +49,14 @@ public function testHasFail()
         $this->assertFalse($adapter->has('filename.ext'));
     }
 
+    public function testHasNotFound()
+    {
+        $container = $this->getContainerMock();
+        $container->shouldReceive('getObject')->andThrow('OpenCloud\ObjectStore\Exception\ObjectNotFoundException');
+        $adapter = new Rackspace($container);
+        $this->assertFalse($adapter->has('filename.ext'));
+    }
+
     public function testWrite()
     {
         $container = $this->getContainerMock();