Merge branch 'master' of github.com:PHP-FFMpeg/PHP-FFMpeg

# Conflicts:
#	composer.json

.github/workflows/test.yaml

@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-20.04]
-                php: [8.3, 8.2, 8.1, 8.0]
+                php: [8.4, 8.3, 8.2, 8.1, 8.0]
                 ffmpeg: [5.0, 4.4]
                 dependency-version: [prefer-lowest, prefer-stable]
 

composer.json

@@ -46,7 +46,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0",
+        "php": "^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4",
         "evenement/evenement": "^3.0",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "spatie/temporary-directory": "^2.0",
@@ -57,7 +57,7 @@
         "php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.10",
+        "phpunit/phpunit": "^9.5.10 || ^10.0",
         "mockery/mockery": "^1.5"
     },
     "autoload": {
@@ -72,4 +72,4 @@
             "Tests\\FFMpeg\\": "tests/FFMpeg"
         }
     }
-}
+}

src/Alchemy/BinaryDriver/AbstractBinary.php

@@ -139,7 +139,7 @@ public function command($command, $bypassErrors = false, $listeners = null)
     /**
      * {@inheritdoc}
      */
-    public static function load($binaries, LoggerInterface $logger = null, $configuration = array())
+    public static function load($binaries, ?LoggerInterface $logger = null, $configuration = array())
     {
         $finder = new ExecutableFinder();
         $binary = null;

src/Alchemy/BinaryDriver/BinaryInterface.php

@@ -63,5 +63,5 @@ public function command($command, $bypassErrors = false, $listeners = null);
      *
      * @return BinaryInterface
      */
-    public static function load($binaries, LoggerInterface $logger = null, $configuration = array());
+    public static function load($binaries, ?LoggerInterface $logger = null, $configuration = array());
 }

src/Alchemy/BinaryDriver/Listeners/Listeners.php

@@ -30,7 +30,7 @@ public function __clone()
      *
      * @return ListenersInterface
      */
-    public function register(ListenerInterface $listener, EventEmitter $target = null)
+    public function register(ListenerInterface $listener, ?EventEmitter $target = null)
     {
         $EElisteners = array();
 

src/Alchemy/BinaryDriver/ProcessRunner.php

@@ -88,7 +88,7 @@ private function buildCallback(SplObjectStorage $listeners)
         };
     }
 
-    private function doExecutionFailure($command, $errorOutput, \Exception $e = null)
+    private function doExecutionFailure($command, $errorOutput, ?\Exception $e = null)
     {
         $this->logger->error($this->createErrorMessage($command, $errorOutput));
         throw new ExecutionFailureException(

src/FFMpeg/Driver/FFMpegDriver.php

@@ -34,7 +34,7 @@ public function getName(): string
      *
      * @return FFMpegDriver
      */
-    public static function create(LoggerInterface $logger = null, $configuration = [])
+    public static function create(?LoggerInterface $logger = null, $configuration = [])
     {
         if (!$configuration instanceof ConfigurationInterface) {
             $configuration = new Configuration($configuration);

src/FFMpeg/Driver/FFProbeDriver.php

@@ -33,7 +33,7 @@ public function getName(): string
      *
      * @return FFProbeDriver
      */
-    public static function create($configuration, LoggerInterface $logger = null)
+    public static function create($configuration, ?LoggerInterface $logger = null)
     {
         if (!$configuration instanceof ConfigurationInterface) {
             $configuration = new Configuration($configuration);

src/FFMpeg/FFMpeg.php

@@ -124,7 +124,7 @@ public function openAdvanced($inputs)
      *
      * @return FFMpeg
      */
-    public static function create($configuration = [], LoggerInterface $logger = null, FFProbe $probe = null)
+    public static function create($configuration = [], ?LoggerInterface $logger = null, ?FFProbe $probe = null)
     {
         if (null === $probe) {
             $probe = FFProbe::create($configuration, $logger, null);

src/FFMpeg/FFProbe.php

@@ -211,7 +211,7 @@ public function streams($pathfile)
      *
      * @return FFProbe
      */
-    public static function create($configuration = [], LoggerInterface $logger = null, CacheItemPoolInterface $cache = null)
+    public static function create($configuration = [], ?LoggerInterface $logger = null, ?CacheItemPoolInterface $cache = null)
     {
         if (null === $cache) {
             $cache = new ArrayAdapter();

src/FFMpeg/Filters/Audio/AudioClipFilter.php

@@ -32,7 +32,7 @@ class AudioClipFilter implements AudioFilterInterface
      */
     private $priority;
 
-    public function __construct(TimeCode $start, TimeCode $duration = null, $priority = 0)
+    public function __construct(TimeCode $start, ?TimeCode $duration = null, $priority = 0)
     {
         $this->start = $start;
         $this->duration = $duration;

src/FFMpeg/Filters/Video/ClipFilter.php

@@ -24,7 +24,7 @@ class ClipFilter implements VideoFilterInterface
     /** @var int */
     private $priority;
 
-    public function __construct(TimeCode $start, TimeCode $duration = null, $priority = 0)
+    public function __construct(TimeCode $start, ?TimeCode $duration = null, $priority = 0)
     {
         $this->start = $start;
         $this->duration = $duration;

src/FFMpeg/Media/Clip.php

@@ -23,7 +23,7 @@ class Clip extends Video
     /** @var Video Parrent video */
     private $video;
 
-    public function __construct(Video $video, FFMpegDriver $driver, FFProbe $ffprobe, TimeCode $start, TimeCode $duration = null)
+    public function __construct(Video $video, FFMpegDriver $driver, FFProbe $ffprobe, TimeCode $start, ?TimeCode $duration = null)
     {
         $this->start = $start;
         $this->duration = $duration;

src/FFMpeg/Media/Video.php

@@ -58,7 +58,7 @@ public function concat($sources)
      *
      * @return \FFMpeg\Media\Clip
      */
-    public function clip(TimeCode $start, TimeCode $duration = null)
+    public function clip(TimeCode $start, ?TimeCode $duration = null)
     {
         return new Clip($this, $this->driver, $this->ffprobe, $start, $duration);
     }

tests/Alchemy/BinaryDriver/AbstractProcessBuilderFactoryTest.php → tests/Alchemy/BinaryDriver/AbstractProcessBuilderFactoryTrait.php

@@ -7,7 +7,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Process\ExecutableFinder;
 
-abstract class AbstractProcessBuilderFactoryTest extends TestCase
+trait AbstractProcessBuilderFactoryTrait
 {
     public static $phpBinary;
 

tests/Alchemy/BinaryDriver/LTSProcessBuilderFactoryTest.php

@@ -3,9 +3,13 @@
 namespace Alchemy\Tests\BinaryDriver;
 
 use Alchemy\BinaryDriver\ProcessBuilderFactory;
+use Alchemy\Tests\BinaryDriver\AbstractProcessBuilderFactoryTrait;
+use Tests\FFMpeg\Unit\TestCase;
 
-class LTSProcessBuilderFactoryTest extends AbstractProcessBuilderFactoryTest
+class LTSProcessBuilderFactoryTest extends TestCase
 {
+    use AbstractProcessBuilderFactoryTrait;
+
     public function setUp(): void
     {
         if (!class_exists('Symfony\Component\Process\ProcessBuilder')) {

tests/Alchemy/BinaryDriver/NONLTSProcessBuilderFactoryTest.php

@@ -3,9 +3,13 @@
 namespace Alchemy\Tests\BinaryDriver;
 
 use Alchemy\BinaryDriver\ProcessBuilderFactory;
+use Alchemy\Tests\BinaryDriver\AbstractProcessBuilderFactoryTrait;
+use Tests\FFMpeg\Unit\TestCase;
 
-class NONLTSProcessBuilderFactoryTest extends AbstractProcessBuilderFactoryTest
+class NONLTSProcessBuilderFactoryTest extends TestCase
 {
+    use AbstractProcessBuilderFactoryTrait;
+
     protected function getProcessBuilderFactory($binary)
     {
         ProcessBuilderFactory::$emulateSfLTS = true;