Ffprobe streams additional commands

.github/ISSUE_TEMPLATE.md

@@ -2,8 +2,8 @@
 | -------------- | ---
 | Bug?           | no
 | New Feature?   | no
-| Version Used   | Specific tag or commit sha
-| FFmpeg Version | FFmpeg or AVConv and version
+| Version used   | Specific tag or commit sha
+| FFMpeg version | FFmpeg or AVConv and version
 | OS             | Your OS and version
 
 #### Actual Behavior

.gitignore

@@ -5,4 +5,5 @@ composer.phar
 composer.lock
 phpunit.xml
 sami.phar
-.idea/
+.idea/
+/build/coverage-report/

.travis.yml

@@ -5,25 +5,21 @@ dist: trusty
 branches:
   only:
     - master
-    - v1.x
+    - v1
 
 cache:
   directories:
     - $HOME/.composer/cache
     - $HOME/.cache
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
   - 7.3
 
 matrix:
   include:
-    - php: 5.4
+    - php: 7.1
       env: COMPOSER_FLAGS="--prefer-lowest"
 
 before_install:

README.md

@@ -72,12 +72,12 @@ paths explicitly, you can pass an array as configuration. A `Psr\Logger\LoggerIn
 can also be passed to log binary executions.
 
 ```php
-$ffmpeg = FFMpeg\FFMpeg::create(array(
+$ffmpeg = FFMpeg\FFMpeg::create([
     'ffmpeg.binaries'  => '/opt/local/ffmpeg/bin/ffmpeg',
     'ffprobe.binaries' => '/opt/local/ffmpeg/bin/ffprobe',
     'timeout'          => 3600, // The timeout for the underlying process
     'ffmpeg.threads'   => 12,   // The number of threads that FFMpeg should use
-), $logger);
+], $logger);
 ```
 
 ### Manipulate media
@@ -200,7 +200,7 @@ documentation below for more information.
 The output file MUST use the PNG extension.
 
 ```php
-$waveform = $audio->waveform(640, 120, array('#00FF00'));
+$waveform = $audio->waveform(640, 120, ['#00FF00']);
 $waveform->save('waveform.png');
 ```
 
@@ -293,11 +293,11 @@ Watermark a video with a given image.
 ```php
 $video
     ->filters()
-    ->watermark($watermarkPath, array(
+    ->watermark($watermarkPath, [
         'position' => 'relative',
         'bottom' => 50,
         'right' => 50,
-    ));
+    ]);
 ```
 
 The watermark filter takes two parameters:
@@ -308,11 +308,11 @@ The watermark filter takes two parameters:
 ```php
 $video
     ->filters()
-    ->watermark($watermarkPath, array(
+    ->watermark($watermarkPath, [
         'position' => 'absolute',
         'x' => 1180,
         'y' => 620,
-    ));
+    ]);
 ```
 
 ###### Framerate
@@ -326,7 +326,7 @@ $video->filters()->framerate($framerate, $gop);
 The framerate filter takes two parameters:
 
 - `$framerate`, an instance of `FFMpeg\Coordinate\Framerate`
-- `$gop`, a [GOP](https://wikipedia.org/wiki/Group_of_pictures) value (integer)
+- `$gop`, a [GOP](https://wikipedia.org/wiki/Group_of_pictures) value (int)
 
 ###### Synchronize
 
@@ -442,7 +442,7 @@ $audio->filters()->resample($rate);
 
 The resample filter takes two parameters :
 
-- `$rate`, a valid audio sample rate value (integer)
+- `$rate`, a valid audio sample rate value (int)
 
 #### Frame
 
@@ -497,8 +497,8 @@ To concatenate videos encoded with the same codec, do as follow:
 // We recommend that you put there the path of any of the video you want to use in this concatenation.
 $video = $ffmpeg->open( '/path/to/video' );
 $video
-    ->concat(array('/path/to/video1', '/path/to/video2'))
-    ->saveFromSameCodecs('/path/to/new_file', TRUE);
+    ->concat(['/path/to/video1', '/path/to/video2'])
+    ->saveFromSameCodecs('/path/to/new_file', true);
 ```
 
 The boolean parameter of the save function allows you to use the copy parameter which accelerates drastically the generation of the encoded file.
@@ -514,7 +514,7 @@ $format = new FFMpeg\Format\Video\X264();
 $format->setAudioCodec("libmp3lame");
 
 $video
-    ->concat(array('/path/to/video1', '/path/to/video2'))
+    ->concat(['/path/to/video1', '/path/to/video2'])
     ->saveFromDifferentCodecs($format, '/path/to/new_file');
 ```
 
@@ -550,7 +550,7 @@ The argument of the setAdditionalParameters method is an array.
 
 ```php
 $format = new FFMpeg\Format\Video\X264();
-$format->setAdditionalParameters(array('foo', 'bar'));
+$format->setAdditionalParameters(['foo', 'bar']);
 $video->save($format, 'video.avi');
 ```
 
@@ -577,12 +577,12 @@ class CustomWMVFormat extends FFMpeg\Format\Video\DefaultVideo
 
     public function getAvailableAudioCodecs()
     {
-        return array('wmav2');
+        return ['wmav2'];
     }
 
     public function getAvailableVideoCodecs()
     {
-        return array('wmv2');
+        return ['wmv2'];
     }
 }
 ```
@@ -628,32 +628,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).

composer.json

@@ -2,7 +2,16 @@
     "name": "php-ffmpeg/php-ffmpeg",
     "type": "library",
     "description": "FFMpeg PHP, an Object Oriented library to communicate with AVconv / ffmpeg",
-    "keywords": ["video processing", "video", "audio processing", "audio", "avconv", "ffmpeg", "avprobe", "ffprobe"],
+    "keywords": [
+        "video processing",
+        "video",
+        "audio processing",
+        "audio",
+        "avconv",
+        "ffmpeg",
+        "avprobe",
+        "ffprobe"
+    ],
     "license": "MIT",
     "authors": [
         {
@@ -32,19 +41,18 @@
         }
     ],
     "require": {
-        "php": "^5.3.9 || ^7.0",
-        "alchemy/binary-driver": "^1.5 || ~2.0.0 || ^5.0",
-        "doctrine/cache": "^1.0",
-        "evenement/evenement": "^2.0 || ^1.0",
-        "neutron/temporary-filesystem": "^2.1.1"
+        "php": "^7.1",
+        "alchemy/binary-driver": "^2.0.0",
+        "sabre/cache": "^1.0",
+        "evenement/evenement": "^2.0",
+        "neutron/temporary-filesystem": "^2.3"
     },
     "suggest": {
         "php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg"
     },
     "require-dev": {
-        "sami/sami": "~1.0",
-        "silex/silex": "~1.0",
-        "phpunit/phpunit": "^4.8.36"
+        "phpunit/phpunit": "^7",
+        "squizlabs/php_codesniffer": "3.*"
     },
     "autoload": {
         "psr-0": {
@@ -61,4 +69,4 @@
             "dev-master": "0.7-dev"
         }
     }
-}
+}