dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #445 from gabriel-caruso/phpunit

Browse source 
Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase
This commit is contained in:
Jens Hausdorf 2017-11-09 17:43:24 +01:00 • committed by GitHub
commit a99804b6b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

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

3
tests/Functional/FunctionalTestCase.php
View file

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

3
tests/Unit/FFMpegServiceProviderTest.php
View file

@ -4,8 +4,9 @@ namespace Tests\FFMpeg\Unit;
use FFMpeg\FFMpegServiceProvider;
use Silex\Application;
use PHPUnit\Framework\TestCase as BaseTestCase;
class FFMpegServiceProviderTest extends \PHPUnit_Framework_TestCase
class FFMpegServiceProviderTest extends BaseTestCase
{
public function testWithConfig()
{

4
tests/Unit/TestCase.php
View file

@ -2,7 +2,9 @@
namespace Tests\FFMpeg\Unit;
class TestCase extends \PHPUnit_Framework_TestCase
use PHPUnit\Framework\TestCase as BaseTestCase;
class TestCase extends BaseTestCase
{
public function assertScalar($value)
{