Merge remote-tracking branch 'upstream/master'

This commit is contained in:
CaliforniaMountainSnake 2020-02-26 09:43:23 +03:00
commit 580fb21d5a
45 changed files with 240 additions and 185 deletions

View file

@ -3,9 +3,9 @@
namespace Tests\FFMpeg\Functional;
use FFMpeg\FFMpeg;
use PHPUnit\Framework\TestCase;
use Tests\FFMpeg\BaseTestCase;
abstract class FunctionalTestCase extends TestCase
abstract class FunctionalTestCase extends BaseTestCase
{
/**
* @return FFMpeg