Check for $this->fileInfo and @depend on testData()
This commit is contained in:
parent
235638e5ab
commit
2d6a400381
|
@ -519,7 +519,7 @@ class OC_Image {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$this->resource = @imagecreatefromstring($str);
|
$this->resource = @imagecreatefromstring($str);
|
||||||
if (\OC_Util::fileInfoLoaded()) {
|
if ($this->fileInfo) {
|
||||||
$this->mimeType = $this->fileInfo->buffer($str);
|
$this->mimeType = $this->fileInfo->buffer($str);
|
||||||
}
|
}
|
||||||
if(is_resource($this->resource)) {
|
if(is_resource($this->resource)) {
|
||||||
|
@ -546,7 +546,7 @@ class OC_Image {
|
||||||
$data = base64_decode($str);
|
$data = base64_decode($str);
|
||||||
if($data) { // try to load from string data
|
if($data) { // try to load from string data
|
||||||
$this->resource = @imagecreatefromstring($data);
|
$this->resource = @imagecreatefromstring($data);
|
||||||
if (\OC_Util::fileInfoLoaded()) {
|
if ($this->fileInfo) {
|
||||||
$this->mimeType = $this->fileInfo->buffer($data);
|
$this->mimeType = $this->fileInfo->buffer($data);
|
||||||
}
|
}
|
||||||
if(!$this->resource) {
|
if(!$this->resource) {
|
||||||
|
|
|
@ -135,6 +135,9 @@ class Test_Image extends PHPUnit_Framework_TestCase {
|
||||||
$this->assertEquals($expected, $img->data());
|
$this->assertEquals($expected, $img->data());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @depends testData
|
||||||
|
*/
|
||||||
public function testToString() {
|
public function testToString() {
|
||||||
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
|
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
|
||||||
$expected = base64_encode($img->data());
|
$expected = base64_encode($img->data());
|
||||||
|
|
Loading…
Reference in New Issue