Merge branch 'master' into pr/789
This commit is contained in:
commit
d3a0dde89a
20 changed files with 177 additions and 169 deletions
|
|
@ -695,12 +695,13 @@ class VideoTest extends AbstractStreamableTestCase
|
|||
->method('getConfiguration')
|
||||
->will($this->returnValue($configuration));
|
||||
|
||||
$self = $this;
|
||||
|
||||
$driver->expects($this->exactly(1))
|
||||
->method('command')
|
||||
->with($this->isType('array'), false, $this->anything())
|
||||
->will($this->returnCallback(function ($commands, $errors, $listeners) {
|
||||
var_dump($commands);
|
||||
$this->assertTrue(!in_array('-b:v', $commands));
|
||||
->will($this->returnCallback(function ($commands, $errors, $listeners) use ($self) {
|
||||
$self->assertTrue(!in_array('-b:v', $commands));
|
||||
}));
|
||||
|
||||
$video = new Video(__FILE__, $driver, $ffprobe);
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ class WaveformTest extends AbstractMediaTestCase
|
|||
->method('command')
|
||||
->with($commands);
|
||||
|
||||
$waveform = new Waveform($this->getAudioMock(__FILE__), $driver, $ffprobe, 640, 120, ['#FFFFFF']);
|
||||
$waveform = new Waveform($this->getAudioMock(__FILE__), $driver, $ffprobe, 640, 120, array('#FFFFFF'));
|
||||
$this->assertSame($waveform, $waveform->save($pathfile));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue