Fix mocking of objects for newer phpunit version

This commit is contained in:
Alexander Schranz 2020-02-13 00:23:11 +01:00
commit 537f61095f
29 changed files with 87 additions and 84 deletions

3
.gitignore vendored
View file

@ -4,5 +4,6 @@
composer.phar composer.phar
composer.lock composer.lock
phpunit.xml phpunit.xml
.phpunit.result.cache
sami.phar sami.phar
.idea/ .idea/

View file

@ -20,6 +20,7 @@ php:
- 7.1 - 7.1
- 7.2 - 7.2
- 7.3 - 7.3
- 7.4
matrix: matrix:
include: include:
@ -37,4 +38,4 @@ install:
- composer update --prefer-dist $COMPOSER_FLAGS - composer update --prefer-dist $COMPOSER_FLAGS
script: script:
- vendor/bin/phpunit --verbose - vendor/bin/simple-phpunit --verbose

View file

@ -44,7 +44,7 @@
"require-dev": { "require-dev": {
"sami/sami": "~1.0", "sami/sami": "~1.0",
"silex/silex": "~1.0", "silex/silex": "~1.0",
"phpunit/phpunit": "^4.8.36" "symfony/phpunit-bridge": "^5.0.4"
}, },
"autoload": { "autoload": {
"psr-0": { "psr-0": {

View file

@ -7,10 +7,13 @@
convertWarningsToExceptions="true" convertWarningsToExceptions="true"
processIsolation="false" processIsolation="false"
stopOnFailure="false" stopOnFailure="false"
syntaxCheck="true"
verbose="false" verbose="false"
bootstrap="tests/bootstrap.php" bootstrap="tests/bootstrap.php"
> >
<php>
<env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="true"/>
</php>
<testsuites> <testsuites>
<testsuite name="unit"> <testsuite name="unit">
<directory>tests/Unit</directory> <directory>tests/Unit</directory>
@ -21,10 +24,9 @@
</testsuites> </testsuites>
<filter> <filter>
<blacklist> <whitelist processUncoveredFilesFromWhitelist="true">
<directory>vendor</directory> <directory suffix=".php">src/</directory>
<directory>tests</directory> </whitelist>
</blacklist>
</filter> </filter>
</phpunit> </phpunit>

View file

@ -25,11 +25,10 @@ class FFProbeTest extends FunctionalTestCase
$this->assertFalse($ffprobe->isValid(__DIR__ . '/../files/WrongFile.mp4')); $this->assertFalse($ffprobe->isValid(__DIR__ . '/../files/WrongFile.mp4'));
} }
/**
* @expectedException FFMpeg\Exception\RuntimeException
*/
public function testProbeOnNonExistantFile() public function testProbeOnNonExistantFile()
{ {
$this->expectException('\FFMpeg\Exception\RuntimeException');
$ffprobe = FFProbe::create(); $ffprobe = FFProbe::create();
$ffprobe->streams('/path/to/no/file'); $ffprobe->streams('/path/to/no/file');
} }

View file

@ -18,7 +18,7 @@ class AudioClipTest extends TestCase {
->will($this->returnCallback(function ($filter) use (&$capturedFilter) { ->will($this->returnCallback(function ($filter) use (&$capturedFilter) {
$capturedFilter = $filter; $capturedFilter = $filter;
})); }));
$format = $this->getMock('FFMpeg\Format\AudioInterface'); $format = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$filters = new AudioFilters($audio); $filters = new AudioFilters($audio);
@ -36,7 +36,7 @@ class AudioClipTest extends TestCase {
->will($this->returnCallback(function ($filter) use (&$capturedFilter) { ->will($this->returnCallback(function ($filter) use (&$capturedFilter) {
$capturedFilter = $filter; $capturedFilter = $filter;
})); }));
$format = $this->getMock('FFMpeg\Format\AudioInterface'); $format = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$filters = new AudioFilters($audio); $filters = new AudioFilters($audio);
@ -44,4 +44,4 @@ class AudioClipTest extends TestCase {
$this->assertEquals(array(0 => '-ss', 1 => '00:00:05.00', 2 => '-t', 3 => '00:00:05.00', 4 => '-acodec', 5 => 'copy'), $capturedFilter->apply($audio, $format)); $this->assertEquals(array(0 => '-ss', 1 => '00:00:05.00', 2 => '-t', 3 => '00:00:05.00', 4 => '-acodec', 5 => 'copy'), $capturedFilter->apply($audio, $format));
} }
} }

View file

@ -18,7 +18,7 @@ class AudioMetadataTest extends TestCase
->will($this->returnCallback(function ($filter) use (&$capturedFilter) { ->will($this->returnCallback(function ($filter) use (&$capturedFilter) {
$capturedFilter = $filter; $capturedFilter = $filter;
})); }));
$format = $this->getMock('FFMpeg\Format\AudioInterface'); $format = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$filters = new AudioFilters($audio); $filters = new AudioFilters($audio);
$filters->addMetadata(array('title' => "Hello World")); $filters->addMetadata(array('title' => "Hello World"));
@ -36,7 +36,7 @@ class AudioMetadataTest extends TestCase
->will($this->returnCallback(function ($filter) use (&$capturedFilter) { ->will($this->returnCallback(function ($filter) use (&$capturedFilter) {
$capturedFilter = $filter; $capturedFilter = $filter;
})); }));
$format = $this->getMock('FFMpeg\Format\AudioInterface'); $format = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$filters = new AudioFilters($audio); $filters = new AudioFilters($audio);
$filters->addMetadata(array('genre' => 'Some Genre', 'artwork' => "/path/to/file.jpg")); $filters->addMetadata(array('genre' => 'Some Genre', 'artwork' => "/path/to/file.jpg"));
@ -55,7 +55,7 @@ class AudioMetadataTest extends TestCase
->will($this->returnCallback(function ($filter) use (&$capturedFilter) { ->will($this->returnCallback(function ($filter) use (&$capturedFilter) {
$capturedFilter = $filter; $capturedFilter = $filter;
})); }));
$format = $this->getMock('FFMpeg\Format\AudioInterface'); $format = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$filters = new AudioFilters($audio); $filters = new AudioFilters($audio);
$filters->addMetadata(); $filters->addMetadata();

View file

@ -16,7 +16,7 @@ class AudioResamplableFilterTest extends TestCase
public function testApply() public function testApply()
{ {
$audio = $this->getAudioMock(); $audio = $this->getAudioMock();
$format = $this->getMock('FFMpeg\Format\AudioInterface'); $format = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$filter = new AudioResamplableFilter(500); $filter = new AudioResamplableFilter(500);
$this->assertEquals(array('-ac', 2, '-ar', 500), $filter->apply($audio, $format)); $this->assertEquals(array('-ac', 2, '-ar', 500), $filter->apply($audio, $format));

View file

@ -12,7 +12,7 @@ class CustomFilterTest extends TestCase
public function testApplyCustomFilter() public function testApplyCustomFilter()
{ {
$audio = $this->getAudioMock(); $audio = $this->getAudioMock();
$format = $this->getMock('FFMpeg\Format\AudioInterface'); $format = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$filter = new CustomFilter('whatever i put would end up as a filter'); $filter = new CustomFilter('whatever i put would end up as a filter');
$this->assertEquals(array('-af', 'whatever i put would end up as a filter'), $filter->apply($audio, $format)); $this->assertEquals(array('-af', 'whatever i put would end up as a filter'), $filter->apply($audio, $format));

View file

@ -13,18 +13,18 @@ class FiltersCollectionTest extends TestCase
$coll = new FiltersCollection(); $coll = new FiltersCollection();
$this->assertCount(0, $coll); $this->assertCount(0, $coll);
$coll->add($this->getMock('FFMpeg\Filters\FilterInterface')); $coll->add($this->getMockBuilder('FFMpeg\Filters\FilterInterface')->getMock());
$this->assertCount(1, $coll); $this->assertCount(1, $coll);
$coll->add($this->getMock('FFMpeg\Filters\FilterInterface')); $coll->add($this->getMockBuilder('FFMpeg\Filters\FilterInterface')->getMock());
$this->assertCount(2, $coll); $this->assertCount(2, $coll);
} }
public function testIterator() public function testIterator()
{ {
$coll = new FiltersCollection(); $coll = new FiltersCollection();
$coll->add($this->getMock('FFMpeg\Filters\FilterInterface')); $coll->add($this->getMockBuilder('FFMpeg\Filters\FilterInterface')->getMock());
$coll->add($this->getMock('FFMpeg\Filters\FilterInterface')); $coll->add($this->getMockBuilder('FFMpeg\Filters\FilterInterface')->getMock());
$this->assertInstanceOf('\ArrayIterator', $coll->getIterator()); $this->assertInstanceOf('\ArrayIterator', $coll->getIterator());
$this->assertCount(2, $coll->getIterator()); $this->assertCount(2, $coll->getIterator());
@ -51,7 +51,7 @@ class FiltersCollectionTest extends TestCase
$data = array(); $data = array();
$video = $this->getVideoMock(); $video = $this->getVideoMock();
$format = $this->getMock('FFMpeg\Format\AudioInterface'); $format = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
foreach ($coll as $filter) { foreach ($coll as $filter) {
$data = array_merge($data, $filter->apply($video, $format)); $data = array_merge($data, $filter->apply($video, $format));

View file

@ -22,7 +22,7 @@ class CropFilterTest extends TestCase
->method('getStreams') ->method('getStreams')
->will($this->returnValue($streams)); ->will($this->returnValue($streams));
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$dimension = new Dimension(200, 150); $dimension = new Dimension(200, 150);
$point = new Point(25, 35); $point = new Point(25, 35);

View file

@ -12,7 +12,7 @@ class CustomFilterTest extends TestCase
public function testApplyCustomFilter() public function testApplyCustomFilter()
{ {
$video = $this->getVideoMock(); $video = $this->getVideoMock();
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$filter = new CustomFilter('whatever i put would end up as a filter'); $filter = new CustomFilter('whatever i put would end up as a filter');
$this->assertEquals(array('-vf', 'whatever i put would end up as a filter'), $filter->apply($video, $format)); $this->assertEquals(array('-vf', 'whatever i put would end up as a filter'), $filter->apply($video, $format));

View file

@ -17,7 +17,7 @@ class ExtractMultipleFramesFilterTest extends TestCase
$video = $this->getVideoMock(); $video = $this->getVideoMock();
$pathfile = '/path/to/file'.mt_rand(); $pathfile = '/path/to/file'.mt_rand();
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('getModulus') ->method('getModulus')
->will($this->returnValue($modulus)); ->will($this->returnValue($modulus));

View file

@ -14,7 +14,7 @@ class FrameRateFilterTest extends TestCase
$gop = 42; $gop = 42;
$video = $this->getVideoMock(); $video = $this->getVideoMock();
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('supportBFrames') ->method('supportBFrames')
->will($this->returnValue(true)); ->will($this->returnValue(true));
@ -31,7 +31,7 @@ class FrameRateFilterTest extends TestCase
$gop = 42; $gop = 42;
$video = $this->getVideoMock(); $video = $this->getVideoMock();
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('supportBFrames') ->method('supportBFrames')
->will($this->returnValue(false)); ->will($this->returnValue(false));

View file

@ -18,7 +18,7 @@ class PadFilterTest extends TestCase
$video = $this->getVideoMock(); $video = $this->getVideoMock();
$pathfile = '/path/to/file'.mt_rand(); $pathfile = '/path/to/file'.mt_rand();
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$streams = new StreamCollection(array( $streams = new StreamCollection(array(
new Stream(array( new Stream(array(

View file

@ -18,7 +18,7 @@ class ResizeFilterTest extends TestCase
$video = $this->getVideoMock(); $video = $this->getVideoMock();
$pathfile = '/path/to/file'.mt_rand(); $pathfile = '/path/to/file'.mt_rand();
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('getModulus') ->method('getModulus')
->will($this->returnValue($modulus)); ->will($this->returnValue($modulus));

View file

@ -22,7 +22,7 @@ class RotateFilterTest extends TestCase
->method('getStreams') ->method('getStreams')
->will($this->returnValue($streams)); ->will($this->returnValue($streams));
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$filter = new RotateFilter($value); $filter = new RotateFilter($value);
$this->assertEquals(array('-vf', $value, '-metadata:s:v:0', 'rotate=0'), $filter->apply($video, $format)); $this->assertEquals(array('-vf', $value, '-metadata:s:v:0', 'rotate=0'), $filter->apply($video, $format));
@ -48,7 +48,7 @@ class RotateFilterTest extends TestCase
$video->expects($this->never()) $video->expects($this->never())
->method('getStreams'); ->method('getStreams');
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$filter = new RotateFilter($value); $filter = new RotateFilter($value);
$this->assertEquals(array('-vf', $value, '-metadata:s:v:0', 'rotate=0'), $filter->apply($video, $format)); $this->assertEquals(array('-vf', $value, '-metadata:s:v:0', 'rotate=0'), $filter->apply($video, $format));

View file

@ -10,7 +10,7 @@ class SynchronizeFilterTest extends TestCase
public function testApply() public function testApply()
{ {
$video = $this->getVideoMock(); $video = $this->getVideoMock();
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$filter = new SynchronizeFilter(); $filter = new SynchronizeFilter();
$this->assertEquals(array('-async', '1', '-metadata:s:v:0', 'start_time=0'), $filter->apply($video, $format)); $this->assertEquals(array('-async', '1', '-metadata:s:v:0', 'start_time=0'), $filter->apply($video, $format));

View file

@ -17,7 +17,7 @@ class WatermarkFilterTest extends TestCase
$video = $this->getVideoMock(); $video = $this->getVideoMock();
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png'); $filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png');
$this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../files/watermark.png [watermark]; [in][watermark] overlay=0:0 [out]'), $filter->apply($video, $format)); $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../files/watermark.png [watermark]; [in][watermark] overlay=0:0 [out]'), $filter->apply($video, $format));
@ -30,7 +30,7 @@ class WatermarkFilterTest extends TestCase
public function testDifferentCoordinaates() public function testDifferentCoordinaates()
{ {
$video = $this->getVideoMock(); $video = $this->getVideoMock();
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
// test position absolute // test position absolute
$filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png', array( $filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png', array(

View file

@ -101,7 +101,7 @@ abstract class AudioTestCase extends TestCase
public function testCreateProgressListener() public function testCreateProgressListener()
{ {
$media = $this->getMock('FFMpeg\Media\MediaTypeInterface'); $media = $this->getMockBuilder('FFMpeg\Media\MediaTypeInterface')->getMock();
$media->expects($this->any()) $media->expects($this->any())
->method('getPathfile') ->method('getPathfile')
->will($this->returnValue(__FILE__)); ->will($this->returnValue(__FILE__));

View file

@ -54,7 +54,7 @@ abstract class VideoTestCase extends AudioTestCase
public function testCreateProgressListener() public function testCreateProgressListener()
{ {
$media = $this->getMock('FFMpeg\Media\MediaTypeInterface'); $media = $this->getMockBuilder('FFMpeg\Media\MediaTypeInterface')->getMock();
$media->expects($this->any()) $media->expects($this->any())
->method('getPathfile') ->method('getPathfile')
->will($this->returnValue(__FILE__)); ->will($this->returnValue(__FILE__));

View file

@ -29,7 +29,7 @@ class AudioTest extends AbstractStreamableTestCase
$audio = new Audio(__FILE__, $driver, $ffprobe); $audio = new Audio(__FILE__, $driver, $ffprobe);
$audio->setFiltersCollection($filters); $audio->setFiltersCollection($filters);
$filter = $this->getMock('FFMpeg\Filters\Audio\AudioFilterInterface'); $filter = $this->getMockBuilder('FFMpeg\Filters\Audio\AudioFilterInterface')->getMock();
$filters->expects($this->once()) $filters->expects($this->once())
->method('add') ->method('add')
@ -50,7 +50,7 @@ class AudioTest extends AbstractStreamableTestCase
$audio = new Audio(__FILE__, $driver, $ffprobe); $audio = new Audio(__FILE__, $driver, $ffprobe);
$audio->setFiltersCollection($filters); $audio->setFiltersCollection($filters);
$filter = $this->getMock('FFMpeg\Filters\Video\VideoFilterInterface'); $filter = $this->getMockBuilder('FFMpeg\Filters\Video\VideoFilterInterface')->getMock();
$filters->expects($this->never()) $filters->expects($this->never())
->method('add'); ->method('add');
@ -65,7 +65,7 @@ class AudioTest extends AbstractStreamableTestCase
$ffprobe = $this->getFFProbeMock(); $ffprobe = $this->getFFProbeMock();
$outputPathfile = '/target/file'; $outputPathfile = '/target/file';
$format = $this->getMock('FFMpeg\Format\AudioInterface'); $format = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
@ -91,12 +91,12 @@ class AudioTest extends AbstractStreamableTestCase
$driver = $this->getFFMpegDriverMock(); $driver = $this->getFFMpegDriverMock();
$ffprobe = $this->getFFProbeMock(); $ffprobe = $this->getFFProbeMock();
$outputPathfile = '/target/file'; $outputPathfile = '/target/file';
$format = $this->getMock('FFMpeg\Format\AudioInterface'); $format = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
$configuration = $this->getMock('Alchemy\BinaryDriver\ConfigurationInterface'); $configuration = $this->getMockBuilder('Alchemy\BinaryDriver\ConfigurationInterface')->getMock();
$driver->expects($this->any()) $driver->expects($this->any())
->method('getConfiguration') ->method('getConfiguration')
@ -104,7 +104,7 @@ class AudioTest extends AbstractStreamableTestCase
$audio = new Audio(__FILE__, $driver, $ffprobe); $audio = new Audio(__FILE__, $driver, $ffprobe);
$filter = $this->getMock('FFMpeg\Filters\Audio\AudioFilterInterface'); $filter = $this->getMockBuilder('FFMpeg\Filters\Audio\AudioFilterInterface')->getMock();
$filter->expects($this->once()) $filter->expects($this->once())
->method('apply') ->method('apply')
->with($audio, $format) ->with($audio, $format)
@ -138,7 +138,7 @@ class AudioTest extends AbstractStreamableTestCase
$driver = $this->getFFMpegDriverMock(); $driver = $this->getFFMpegDriverMock();
$ffprobe = $this->getFFProbeMock(); $ffprobe = $this->getFFProbeMock();
$configuration = $this->getMock('Alchemy\BinaryDriver\ConfigurationInterface'); $configuration = $this->getMockBuilder('Alchemy\BinaryDriver\ConfigurationInterface')->getMock();
$driver->expects($this->any()) $driver->expects($this->any())
->method('getConfiguration') ->method('getConfiguration')
@ -180,7 +180,7 @@ class AudioTest extends AbstractStreamableTestCase
public function provideSaveData() public function provideSaveData()
{ {
$format = $this->getMock('FFMpeg\Format\AudioInterface'); $format = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
@ -191,7 +191,7 @@ class AudioTest extends AbstractStreamableTestCase
->method('getAudioChannels') ->method('getAudioChannels')
->will($this->returnValue(5)); ->will($this->returnValue(5));
$audioFormat = $this->getMock('FFMpeg\Format\AudioInterface'); $audioFormat = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$audioFormat->expects($this->any()) $audioFormat->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
@ -205,7 +205,7 @@ class AudioTest extends AbstractStreamableTestCase
->method('getAudioCodec') ->method('getAudioCodec')
->will($this->returnValue('patati-patata-audio')); ->will($this->returnValue('patati-patata-audio'));
$formatExtra = $this->getMock('FFMpeg\Format\AudioInterface'); $formatExtra = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$formatExtra->expects($this->any()) $formatExtra->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array('extra', 'param'))); ->will($this->returnValue(array('extra', 'param')));
@ -216,7 +216,7 @@ class AudioTest extends AbstractStreamableTestCase
->method('getAudioChannels') ->method('getAudioChannels')
->will($this->returnValue(5)); ->will($this->returnValue(5));
$listeners = array($this->getMock('Alchemy\BinaryDriver\Listeners\ListenerInterface')); $listeners = array($this->getMockBuilder('Alchemy\BinaryDriver\Listeners\ListenerInterface')->getMock());
$progressableFormat = $this->getMockBuilder('Tests\FFMpeg\Unit\Media\AudioProg') $progressableFormat = $this->getMockBuilder('Tests\FFMpeg\Unit\Media\AudioProg')
->disableOriginalConstructor()->getMock(); ->disableOriginalConstructor()->getMock();
@ -290,7 +290,7 @@ class AudioTest extends AbstractStreamableTestCase
$driver = $this->getFFMpegDriverMock(); $driver = $this->getFFMpegDriverMock();
$ffprobe = $this->getFFProbeMock(); $ffprobe = $this->getFFProbeMock();
$configuration = $this->getMock('Alchemy\BinaryDriver\ConfigurationInterface'); $configuration = $this->getMockBuilder('Alchemy\BinaryDriver\ConfigurationInterface')->getMock();
$driver->expects($this->any()) $driver->expects($this->any())
->method('getConfiguration') ->method('getConfiguration')
@ -317,7 +317,7 @@ class AudioTest extends AbstractStreamableTestCase
$outputPathfile = '/target/file'; $outputPathfile = '/target/file';
$format = $this->getMock('FFMpeg\Format\AudioInterface'); $format = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array('param'))); ->will($this->returnValue(array('param')));

View file

@ -35,7 +35,7 @@ class ClipTest extends AbstractMediaTestCase
$outputPathfile = '/target/file'; $outputPathfile = '/target/file';
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('getPasses') ->method('getPasses')
->will($this->returnValue(1)); ->will($this->returnValue(1));

View file

@ -34,7 +34,7 @@ class ConcatTest extends AbstractMediaTestCase
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$filter = $this->getMock('FFMpeg\Filters\Concat\ConcatFilterInterface'); $filter = $this->getMockBuilder('FFMpeg\Filters\Concat\ConcatFilterInterface')->getMock();
$filters->expects($this->once()) $filters->expects($this->once())
->method('add') ->method('add')
@ -115,7 +115,7 @@ class ConcatTest extends AbstractMediaTestCase
array_push($commands, $pathfile); array_push($commands, $pathfile);
$configuration = $this->getMock('Alchemy\BinaryDriver\ConfigurationInterface'); $configuration = $this->getMockBuilder('Alchemy\BinaryDriver\ConfigurationInterface')->getMock();
$driver->expects($this->any()) $driver->expects($this->any())
->method('getConfiguration') ->method('getConfiguration')
@ -136,9 +136,9 @@ class ConcatTest extends AbstractMediaTestCase
array( array(
'-i', __FILE__, '-i', __FILE__,
'-i', 'concat-2.mp4', '-i', 'concat-2.mp4',
'-filter_complex', '-filter_complex',
'[0:v:0] [0:a:0] [1:v:0] [1:a:0] concat=n=2:v=1:a=1 [v] [a]', '[0:v:0] [0:a:0] [1:v:0] [1:a:0] concat=n=2:v=1:a=1 [v] [a]',
'-map', '[v]', '-map', '[v]',
'-map', '[a]' '-map', '[a]'
), ),
), ),

View file

@ -36,7 +36,7 @@ class FrameTest extends AbstractMediaTestCase
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$filter = $this->getMock('FFMpeg\Filters\Frame\FrameFilterInterface'); $filter = $this->getMockBuilder('FFMpeg\Filters\Frame\FrameFilterInterface')->getMock();
$filters->expects($this->once()) $filters->expects($this->once())
->method('add') ->method('add')
@ -78,7 +78,7 @@ class FrameTest extends AbstractMediaTestCase
$frame->save($pathfile, $accurate, $base64); $frame->save($pathfile, $accurate, $base64);
} }
} }
public function provideSaveOptions() public function provideSaveOptions()
{ {
return array( return array(

View file

@ -51,7 +51,7 @@ class GifTest extends AbstractMediaTestCase
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$filter = $this->getMock('FFMpeg\Filters\Gif\GifFilterInterface'); $filter = $this->getMockBuilder('FFMpeg\Filters\Gif\GifFilterInterface')->getMock();
$filters->expects($this->once()) $filters->expects($this->once())
->method('add') ->method('add')

View file

@ -29,7 +29,7 @@ class VideoTest extends AbstractStreamableTestCase
$video = new Video(__FILE__, $driver, $ffprobe); $video = new Video(__FILE__, $driver, $ffprobe);
$video->setFiltersCollection($filters); $video->setFiltersCollection($filters);
$filter = $this->getMock('FFMpeg\Filters\Video\VideoFilterInterface'); $filter = $this->getMockBuilder('FFMpeg\Filters\Video\VideoFilterInterface')->getMock();
$filters->expects($this->once()) $filters->expects($this->once())
->method('add') ->method('add')
@ -50,7 +50,7 @@ class VideoTest extends AbstractStreamableTestCase
$video = new Video(__FILE__, $driver, $ffprobe); $video = new Video(__FILE__, $driver, $ffprobe);
$video->setFiltersCollection($filters); $video->setFiltersCollection($filters);
$filter = $this->getMock('FFMpeg\Filters\Audio\AudioFilterInterface'); $filter = $this->getMockBuilder('FFMpeg\Filters\Audio\AudioFilterInterface')->getMock();
$filters->expects($this->once()) $filters->expects($this->once())
->method('add') ->method('add')
@ -79,7 +79,7 @@ class VideoTest extends AbstractStreamableTestCase
$driver = $this->getFFMpegDriverMock(); $driver = $this->getFFMpegDriverMock();
$ffprobe = $this->getFFProbeMock(); $ffprobe = $this->getFFProbeMock();
$outputPathfile = '/target/file'; $outputPathfile = '/target/file';
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('getPasses') ->method('getPasses')
->will($this->returnValue(1)); ->will($this->returnValue(1));
@ -87,7 +87,7 @@ class VideoTest extends AbstractStreamableTestCase
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
$configuration = $this->getMock('Alchemy\BinaryDriver\ConfigurationInterface'); $configuration = $this->getMockBuilder('Alchemy\BinaryDriver\ConfigurationInterface')->getMock();
$driver->expects($this->any()) $driver->expects($this->any())
->method('getConfiguration') ->method('getConfiguration')
@ -108,7 +108,7 @@ class VideoTest extends AbstractStreamableTestCase
$driver = $this->getFFMpegDriverMock(); $driver = $this->getFFMpegDriverMock();
$ffprobe = $this->getFFProbeMock(); $ffprobe = $this->getFFProbeMock();
$outputPathfile = '/target/file'; $outputPathfile = '/target/file';
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
@ -116,7 +116,7 @@ class VideoTest extends AbstractStreamableTestCase
->method('getPasses') ->method('getPasses')
->will($this->returnValue(2)); ->will($this->returnValue(2));
$configuration = $this->getMock('Alchemy\BinaryDriver\ConfigurationInterface'); $configuration = $this->getMockBuilder('Alchemy\BinaryDriver\ConfigurationInterface')->getMock();
$driver->expects($this->any()) $driver->expects($this->any())
->method('getConfiguration') ->method('getConfiguration')
@ -124,7 +124,7 @@ class VideoTest extends AbstractStreamableTestCase
$video = new Video(__FILE__, $driver, $ffprobe); $video = new Video(__FILE__, $driver, $ffprobe);
$filter = $this->getMock('FFMpeg\Filters\Video\VideoFilterInterface'); $filter = $this->getMockBuilder('FFMpeg\Filters\Video\VideoFilterInterface')->getMock();
$filter->expects($this->once()) $filter->expects($this->once())
->method('apply') ->method('apply')
->with($video, $format) ->with($video, $format)
@ -158,7 +158,7 @@ class VideoTest extends AbstractStreamableTestCase
$driver = $this->getFFMpegDriverMock(); $driver = $this->getFFMpegDriverMock();
$ffprobe = $this->getFFProbeMock(); $ffprobe = $this->getFFProbeMock();
$configuration = $this->getMock('Alchemy\BinaryDriver\ConfigurationInterface'); $configuration = $this->getMockBuilder('Alchemy\BinaryDriver\ConfigurationInterface')->getMock();
$driver->expects($this->any()) $driver->expects($this->any())
->method('getConfiguration') ->method('getConfiguration')
@ -233,7 +233,7 @@ class VideoTest extends AbstractStreamableTestCase
public function provideSaveData() public function provideSaveData()
{ {
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
@ -253,7 +253,7 @@ class VideoTest extends AbstractStreamableTestCase
->method('getAdditionalParameters') ->method('getAdditionalParameters')
->will($this->returnValue(array('foo', 'bar'))); ->will($this->returnValue(array('foo', 'bar')));
$format2 = $this->getMock('FFMpeg\Format\VideoInterface'); $format2 = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$format2->expects($this->any()) $format2->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
@ -273,7 +273,7 @@ class VideoTest extends AbstractStreamableTestCase
->method('getAdditionalParameters') ->method('getAdditionalParameters')
->will($this->returnValue(array('foo', 'bar'))); ->will($this->returnValue(array('foo', 'bar')));
$audioFormat = $this->getMock('FFMpeg\Format\AudioInterface'); $audioFormat = $this->getMockBuilder('FFMpeg\Format\AudioInterface')->getMock();
$audioFormat->expects($this->any()) $audioFormat->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
@ -290,7 +290,7 @@ class VideoTest extends AbstractStreamableTestCase
->method('getPasses') ->method('getPasses')
->will($this->returnValue(1)); ->will($this->returnValue(1));
$audioVideoFormat = $this->getMock('FFMpeg\Format\VideoInterface'); $audioVideoFormat = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$audioVideoFormat->expects($this->any()) $audioVideoFormat->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
@ -316,7 +316,7 @@ class VideoTest extends AbstractStreamableTestCase
->method('getAdditionalParameters') ->method('getAdditionalParameters')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
$audioVideoFormatSinglePass = $this->getMock('FFMpeg\Format\VideoInterface'); $audioVideoFormatSinglePass = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$audioVideoFormatSinglePass->expects($this->any()) $audioVideoFormatSinglePass->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
@ -342,7 +342,7 @@ class VideoTest extends AbstractStreamableTestCase
->method('getAdditionalParameters') ->method('getAdditionalParameters')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
$formatExtra = $this->getMock('FFMpeg\Format\VideoInterface'); $formatExtra = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$formatExtra->expects($this->any()) $formatExtra->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array('extra', 'param'))); ->will($this->returnValue(array('extra', 'param')));
@ -362,7 +362,7 @@ class VideoTest extends AbstractStreamableTestCase
->method('getAdditionalParameters') ->method('getAdditionalParameters')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
$formatExtra2 = $this->getMock('FFMpeg\Format\VideoInterface'); $formatExtra2 = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$formatExtra2->expects($this->any()) $formatExtra2->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array('extra', 'param'))); ->will($this->returnValue(array('extra', 'param')));
@ -382,7 +382,7 @@ class VideoTest extends AbstractStreamableTestCase
->method('getAdditionalParameters') ->method('getAdditionalParameters')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
$listeners = array($this->getMock('Alchemy\BinaryDriver\Listeners\ListenerInterface')); $listeners = array($this->getMockBuilder('Alchemy\BinaryDriver\Listeners\ListenerInterface')->getMock());
$progressableFormat = $this->getMockBuilder('Tests\FFMpeg\Unit\Media\Prog') $progressableFormat = $this->getMockBuilder('Tests\FFMpeg\Unit\Media\Prog')
->disableOriginalConstructor()->getMock(); ->disableOriginalConstructor()->getMock();
@ -585,7 +585,7 @@ class VideoTest extends AbstractStreamableTestCase
$driver = $this->getFFMpegDriverMock(); $driver = $this->getFFMpegDriverMock();
$ffprobe = $this->getFFProbeMock(); $ffprobe = $this->getFFProbeMock();
$configuration = $this->getMock('Alchemy\BinaryDriver\ConfigurationInterface'); $configuration = $this->getMockBuilder('Alchemy\BinaryDriver\ConfigurationInterface')->getMock();
$driver->expects($this->any()) $driver->expects($this->any())
->method('getConfiguration') ->method('getConfiguration')
@ -612,7 +612,7 @@ class VideoTest extends AbstractStreamableTestCase
$outputPathfile = '/target/file'; $outputPathfile = '/target/file';
$format = $this->getMock('FFMpeg\Format\VideoInterface'); $format = $this->getMockBuilder('FFMpeg\Format\VideoInterface')->getMock();
$format->expects($this->any()) $format->expects($this->any())
->method('getExtraParams') ->method('getExtraParams')
->will($this->returnValue(array('param'))); ->will($this->returnValue(array('param')));

View file

@ -25,7 +25,7 @@ class WaveformTest extends AbstractMediaTestCase
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$filter = $this->getMock('FFMpeg\Filters\Waveform\WaveformFilterInterface'); $filter = $this->getMockBuilder('FFMpeg\Filters\Waveform\WaveformFilterInterface')->getMock();
$filters->expects($this->once()) $filters->expects($this->once())
->method('add') ->method('add')

View file

@ -13,12 +13,12 @@ class TestCase extends BaseTestCase
public function getLoggerMock() public function getLoggerMock()
{ {
return $this->getMock('Psr\Log\LoggerInterface'); return $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
} }
public function getCacheMock() public function getCacheMock()
{ {
return $this->getMock('Doctrine\Common\Cache\Cache'); return $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock();
} }
public function getTimeCodeMock() public function getTimeCodeMock()
@ -86,17 +86,17 @@ class TestCase extends BaseTestCase
public function getFFProbeParserMock() public function getFFProbeParserMock()
{ {
return $this->getMock('FFMpeg\FFProbe\OutputParserInterface'); return $this->getMockBuilder('FFMpeg\FFProbe\OutputParserInterface')->getMock();
} }
public function getFFProbeOptionsTesterMock() public function getFFProbeOptionsTesterMock()
{ {
return $this->getMock('FFMpeg\FFProbe\OptionsTesterInterface'); return $this->getMockBuilder('FFMpeg\FFProbe\OptionsTesterInterface')->getMock();
} }
public function getFFProbeMapperMock() public function getFFProbeMapperMock()
{ {
return $this->getMock('FFMpeg\FFProbe\MapperInterface'); return $this->getMockBuilder('FFMpeg\FFProbe\MapperInterface')->getMock();
} }
public function getFFProbeOptionsTesterMockWithOptions(array $options) public function getFFProbeOptionsTesterMockWithOptions(array $options)
@ -114,7 +114,7 @@ class TestCase extends BaseTestCase
public function getConfigurationMock() public function getConfigurationMock()
{ {
return $this->getMock('Alchemy\BinaryDriver\ConfigurationInterface'); return $this->getMockBuilder('Alchemy\BinaryDriver\ConfigurationInterface')->getMock();
} }
public function getFormatMock() public function getFormatMock()