From 2bed29ffbce8fb279cf6963f9fb72ce2e1714dda Mon Sep 17 00:00:00 2001 From: Fran Moreno Date: Mon, 17 May 2021 03:07:36 +0200 Subject: [PATCH] Remove silex support Silex was abandoned 3 years ago, removing its support will allow to bump some dependencies. --- README.md | 26 ------------------------ composer.json | 1 - src/FFMpeg/FFMpegServiceProvider.php | 3 +++ tests/Unit/FFMpegServiceProviderTest.php | 7 +++++++ 4 files changed, 10 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 911fb64..d8f98d4 100644 --- a/README.md +++ b/README.md @@ -714,32 +714,6 @@ $ffprobe = FFMpeg\FFProbe::create(); $ffprobe->isValid('/path/to/file/to/check'); // returns bool ``` -## Using with Silex Microframework - -The service provider is easy to set up: - -```php -$app = new Silex\Application(); -$app->register(new FFMpeg\FFMpegServiceProvider()); - -$video = $app['ffmpeg']->open('video.mpeg'); -``` - -Available options are as follow: - -```php -$app->register(new FFMpeg\FFMpegServiceProvider(), array( - 'ffmpeg.configuration' => array( - 'ffmpeg.threads' => 4, - 'ffmpeg.timeout' => 300, - 'ffmpeg.binaries' => '/opt/local/ffmpeg/bin/ffmpeg', - 'ffprobe.timeout' => 30, - 'ffprobe.binaries' => '/opt/local/ffmpeg/bin/ffprobe', - ), - 'ffmpeg.logger' => $logger, -)); -``` - ## License This project is licensed under the [MIT license](http://opensource.org/licenses/MIT). diff --git a/composer.json b/composer.json index 804bef9..c5e5b09 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,6 @@ "php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg" }, "require-dev": { - "silex/silex": "~1.0", "symfony/phpunit-bridge": "^5.0.4", "symfony/process": "2.8 || 3.3" }, diff --git a/src/FFMpeg/FFMpegServiceProvider.php b/src/FFMpeg/FFMpegServiceProvider.php index 6aa9735..2ada76d 100644 --- a/src/FFMpeg/FFMpegServiceProvider.php +++ b/src/FFMpeg/FFMpegServiceProvider.php @@ -15,6 +15,9 @@ use Doctrine\Common\Cache\ArrayCache; use Silex\Application; use Silex\ServiceProviderInterface; +/** + * @deprecated + */ class FFMpegServiceProvider implements ServiceProviderInterface { public function register(Application $app) diff --git a/tests/Unit/FFMpegServiceProviderTest.php b/tests/Unit/FFMpegServiceProviderTest.php index a15e679..405ed90 100644 --- a/tests/Unit/FFMpegServiceProviderTest.php +++ b/tests/Unit/FFMpegServiceProviderTest.php @@ -7,6 +7,13 @@ use Silex\Application; class FFMpegServiceProviderTest extends TestCase { + protected function setUp() + { + if (!class_exists('\Application\Silex')) { + $this->markTestSkipped('You must have silex/silex installed.'); + } + } + public function testWithConfig() { $app = new Application();