Merge pull request aws#681 from dstevenson/bugfix/issue-639

bugfix(S3/StreamWrapper) Init protocol from passed path. Protocols are
casualuser · Jul 9, 2015 · c5ac2e4 · c5ac2e4
2 parents d553ae4 + 6db66f4
commit c5ac2e4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/S3/StreamWrapper.php b/src/S3/StreamWrapper.php
@@ -515,6 +515,9 @@ private function formatKey($key)
      */
     public function rename($path_from, $path_to)
     {
+        // PHP will not allow rename across wrapper types, so we can safely
+        // assume $path_from and $path_to have the same protocol
+        $this->initProtocol($path_from);
         $partsFrom = $this->withPath($path_from);
         $partsTo = $this->withPath($path_to);
         $this->clearCacheKey($path_from);

diff --git a/tests/S3/StreamWrapperTest.php b/tests/S3/StreamWrapperTest.php
@@ -407,6 +407,16 @@ public function testCanDeleteNestedFolderWithRmDir()
         $this->assertEquals('/foo/bar/', $entries[1]['request']->getUri()->getPath());
     }
 
+    /**
+     * @expectedException \PHPUnit_Framework_Error_Warning
+     * @expectedExceptionMessage rename(): Cannot rename a file across wrapper types
+     */
+    public function testRenameEnsuresProtocolsMatch()
+    {
+        StreamWrapper::register($this->client, 'baz');
+        rename('s3://foo/bar', 'baz://qux/quux');
+    }
+
     /**
      * @expectedException \PHPUnit_Framework_Error_Warning
      * @expectedExceptionMessage The Amazon S3 stream wrapper only supports copying objects