rename method

taylorotwell · taylorotwell · commit fd03dd44b9f4 · 2018-07-27T11:34:44.000-05:00
diff --git a/src/Illuminate/Http/UploadedFile.php b/src/Illuminate/Http/UploadedFile.php
@@ -91,15 +91,16 @@ public function storeAs($path, $name, $options = [])
      * Get the contents of the uploaded file.
      *
      * @return bool|string
+     *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function getContents()
+    public function get()
     {
-        if ($this->isValid()) {
-            return file_get_contents($this->getPathname());
+        if (! $this->isValid()) {
+            throw new FileNotFoundException("File does not exist at path {$this->getPathname()}");
         }
 
-        throw new FileNotFoundException("File does not exist at path {$this->getPathname()}");
+        return file_get_contents($this->getPathname());
     }
 
     /**
diff --git a/tests/Http/HttpUploadedFileTest.php b/tests/Http/HttpUploadedFileTest.php
@@ -18,6 +18,6 @@ public function testUploadedFileCanRetrieveContentsFromTextFile()
             true
         );
 
-        $this->assertEquals('This is a story about something that happened long ago when your grandfather was a child.', trim($file->getContents()));
+        $this->assertEquals('This is a story about something that happened long ago when your grandfather was a child.', trim($file->get()));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -91,15 +91,16 @@ public function storeAs($path, $name, $options = [])`
`91`	`91`	`* Get the contents of the uploaded file.`
`92`	`92`	`*`
`93`	`93`	`* @return bool\|string`
	`94`	`+ *`
`94`	`95`	`* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException`
`95`	`96`	`*/`
`96`		`- public function getContents()`
	`97`	`+ public function get()`
`97`	`98`	`{`
`98`		`- if ($this->isValid()) {`
`99`		`- return file_get_contents($this->getPathname());`
	`99`	`+ if (! $this->isValid()) {`
	`100`	`+ throw new FileNotFoundException("File does not exist at path {$this->getPathname()}");`
`100`	`101`	`}`
`101`	`102`
`102`		`- throw new FileNotFoundException("File does not exist at path {$this->getPathname()}");`
	`103`	`+ return file_get_contents($this->getPathname());`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ public function testUploadedFileCanRetrieveContentsFromTextFile()`
`18`	`18`	`true`
`19`	`19`	`);`
`20`	`20`
`21`		`- $this->assertEquals('This is a story about something that happened long ago when your grandfather was a child.', trim($file->getContents()));`
	`21`	`+ $this->assertEquals('This is a story about something that happened long ago when your grandfather was a child.', trim($file->get()));`
`22`	`22`	`}`
`23`	`23`	`}`