Rename UploadedFile::move to moveTo
This commit is contained in:
parent
dc2aecf3ff
commit
5eb30ccafb
|
|
@ -79,7 +79,7 @@ class UploadedFile implements UploadedFileInterface
|
||||||
* @throws \RuntimeException on any error during the move operation, or on
|
* @throws \RuntimeException on any error during the move operation, or on
|
||||||
* the second or subsequent call to the method.
|
* the second or subsequent call to the method.
|
||||||
*/
|
*/
|
||||||
public function move($path)
|
public function moveTo($path)
|
||||||
{
|
{
|
||||||
if ($this->tmpName === null || !file_exists($this->tmpName)) {
|
if ($this->tmpName === null || !file_exists($this->tmpName)) {
|
||||||
throw new \RuntimeException("File " . $this->tmpName . " does not exist.");
|
throw new \RuntimeException("File " . $this->tmpName . " does not exist.");
|
||||||
|
|
|
||||||
|
|
@ -74,13 +74,13 @@ class UploadedFileTest extends \PHPUnit_Framework_TestCase
|
||||||
* @covers WellRESTed\Message\UploadedFile::getStream
|
* @covers WellRESTed\Message\UploadedFile::getStream
|
||||||
* @expectedException \RuntimeException
|
* @expectedException \RuntimeException
|
||||||
*/
|
*/
|
||||||
public function testGetStreamThrowsExceptionAfterMove()
|
public function testGetStreamThrowsExceptionAfterMoveTo()
|
||||||
{
|
{
|
||||||
$content = "Hello, World!";
|
$content = "Hello, World!";
|
||||||
file_put_contents($this->tmpName, $content);
|
file_put_contents($this->tmpName, $content);
|
||||||
|
|
||||||
$file = new UploadedFile("", "", 0, $this->tmpName, "");
|
$file = new UploadedFile("", "", 0, $this->tmpName, "");
|
||||||
$file->move($this->movePath);
|
$file->moveTo($this->movePath);
|
||||||
$file->getStream();
|
$file->getStream();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -88,32 +88,32 @@ class UploadedFileTest extends \PHPUnit_Framework_TestCase
|
||||||
// move
|
// move
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @covers WellRESTed\Message\UploadedFile::move
|
* @covers WellRESTed\Message\UploadedFile::moveTo
|
||||||
*/
|
*/
|
||||||
public function testMoveRelocatesUploadedFileToDestiationIfExists()
|
public function testMoveToRelocatesUploadedFileToDestiationIfExists()
|
||||||
{
|
{
|
||||||
$content = "Hello, World!";
|
$content = "Hello, World!";
|
||||||
file_put_contents($this->tmpName, $content);
|
file_put_contents($this->tmpName, $content);
|
||||||
$originalMd5 = md5_file($this->tmpName);
|
$originalMd5 = md5_file($this->tmpName);
|
||||||
|
|
||||||
$file = new UploadedFile("", "", 0, $this->tmpName, "");
|
$file = new UploadedFile("", "", 0, $this->tmpName, "");
|
||||||
$file->move($this->movePath);
|
$file->moveTo($this->movePath);
|
||||||
|
|
||||||
$this->assertEquals($originalMd5, md5_file($this->movePath));
|
$this->assertEquals($originalMd5, md5_file($this->movePath));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @covers WellRESTed\Message\UploadedFile::move
|
* @covers WellRESTed\Message\UploadedFile::moveTo
|
||||||
* @expectedException \RuntimeException
|
* @expectedException \RuntimeException
|
||||||
*/
|
*/
|
||||||
public function testThrowsExcpetionOnSubsequentCallToMove()
|
public function testThrowsExcpetionOnSubsequentCallToMoveTo()
|
||||||
{
|
{
|
||||||
$content = "Hello, World!";
|
$content = "Hello, World!";
|
||||||
file_put_contents($this->tmpName, $content);
|
file_put_contents($this->tmpName, $content);
|
||||||
|
|
||||||
$file = new UploadedFile("", "", 0, $this->tmpName, "");
|
$file = new UploadedFile("", "", 0, $this->tmpName, "");
|
||||||
$file->move($this->movePath);
|
$file->moveTo($this->movePath);
|
||||||
$file->move($this->movePath);
|
$file->moveTo($this->movePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue