mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-08-21 05:01:20 +02:00
Code Issues Releases Wiki Activity

Merge branch 'diarmuidie-fix-isencoded-return-value'

Browse Source
This commit is contained in:
Oliver Vogel
2015-08-16 17:21:45 +02:00
parent 156f9d6f8a 005c563112
commit 3bb5c6044f
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Intervention/Image/Image.php
View File

@@ -268,7 +268,7 @@ class Image extends File
*/ */
public function isEncoded() public function isEncoded()
{ {
return ! is_null($this->encoded); return ! empty($this->encoded);
} }
/** /**

9
tests/ImageTest.php
View File

@@ -43,6 +43,15 @@ class ImageTest extends PHPUnit_Framework_TestCase
@unlink($save_as); @unlink($save_as);
} }
public function testIsEncoded()
{
$image = $this->getTestImage();
$this->assertFalse($image->isEncoded());
$image->setEncoded('foo');
$this->assertTrue($image->isEncoded());
}
public function testFilter() public function testFilter()
{ {
$demoFilter = Mockery::mock('\Intervention\Image\Filters\DemoFilter', array(15)); $demoFilter = Mockery::mock('\Intervention\Image\Filters\DemoFilter', array(15));