1
0
mirror of https://github.com/Intervention/image.git synced 2025-08-06 22:06:36 +02:00

Fix merge conflicts

This commit is contained in:
Oliver Vogel
2024-02-29 15:16:14 +01:00
parent 18741c6b44
commit f83f37e551

View File

@@ -6,10 +6,9 @@ namespace Intervention\Image\Tests\Unit;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
use Intervention\Image\Collection; use Intervention\Image\Collection;
use Intervention\Image\Exceptions\RuntimeException;
use Intervention\Image\Tests\BaseTestCase; use Intervention\Image\Tests\BaseTestCase;
#[CoversClass(\Intervention\Image\Collection::class)] #[CoversClass(Collection::class)]
final class CollectionTest extends BaseTestCase final class CollectionTest extends BaseTestCase
{ {
public function testConstructor(): void public function testConstructor(): void
@@ -173,8 +172,9 @@ final class CollectionTest extends BaseTestCase
public function testSliceOutOfBounds(): void public function testSliceOutOfBounds(): void
{ {
$this->expectException(RuntimeException::class);
$collection = new Collection(['a', 'b', 'c']); $collection = new Collection(['a', 'b', 'c']);
$collection->slice(6); $result = $collection->slice(6);
$this->assertEquals(0, $result->count());
$this->assertEquals([], $result->toArray());
} }
} }