Merge branch 'protonemedia:main' into main

Author: marcialpaulg

.github/workflows/run-tests.yml

@@ -15,25 +15,29 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         php: [8.4, 8.3, 8.2, 8.1]
-        laravel: ["10.*", "11.*"]
+        laravel: ['10.*', '11.*', '12.*']
         ffmpeg: [5.0, 4.4]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
             testbench: 8.*
           - laravel: 11.*
             testbench: 9.*
+          - laravel: 12.*
+            testbench: 10.*
         exclude:
           - laravel: 11.*
             php: 8.1
           - laravel: 10.*
             php: 8.4
+          - laravel: 12.*
+            php: 8.1
 
     name: ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - FF${{ matrix.ffmpeg }} - ${{ matrix.dependency-version }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -54,7 +58,7 @@ jobs:
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache/files
           key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}-dep-${{ matrix.dependency-version }}

README.md

@@ -817,7 +817,7 @@ $media = FFMpeg::fromDisk('videos')->open('video.mp4');
 
 // The 'getStreams' method will be called on the underlying Media object since
 // it doesn't exists on this object.
-$codec = $media->getStreams()->first()->get('codec_name');
+$codec = $media->getVideoStream()->get('codec_name');
 ```
 
 If you want direct access to the underlying object, call the object as a function (invoke):

composer.json

@@ -21,16 +21,16 @@
     ],
     "require": {
         "php": "^8.1|^8.2|^8.3|^8.4",
-        "illuminate/contracts": "^10.0|^11.0",
+        "illuminate/contracts": "^10.0|^11.0|^12.0",
         "php-ffmpeg/php-ffmpeg": "^1.2",
         "ramsey/collection": "^2.0"
     },
     "require-dev": {
         "league/flysystem-memory": "^3.10",
         "mockery/mockery": "^1.4.4",
         "nesbot/carbon": "^2.66|^3.0",
-        "orchestra/testbench": "^8.0|^9.0",
-        "phpunit/phpunit": "^10.4",
+        "orchestra/testbench": "^8.0|^9.0|^10.0",
+        "phpunit/phpunit": "^10.4|^11.5.3",
         "spatie/image": "^2.2|^3.3",
         "spatie/phpunit-snapshot-assertions": "^5.0"
     },
@@ -63,4 +63,4 @@
             }
         }
     }
-}
+}

src/Drivers/InteractsWithFilters.php

@@ -22,8 +22,6 @@ trait InteractsWithFilters
 
     /**
      * Returns an array with the filters applied to the underlying media object.
-     *
-     * @return array
      */
     public function getFilters(): array
     {
@@ -33,8 +31,6 @@ public function getFilters(): array
     /**
      * Helper method to provide multiple ways to add a filter to the underlying
      * media object.
-     *
-     * @return self
      */
     public function addFilter(): self
     {
@@ -77,14 +73,11 @@ public function addFilter(): self
     /**
      * Calls the callable with a WatermarkFactory instance and
      * adds the freshly generated WatermarkFilter.
-     *
-     * @param callable $withWatermarkFactory
-     * @return self
      */
     public function addWatermark(callable $withWatermarkFactory): self
     {
         $withWatermarkFactory(
-            $watermarkFactory = new WatermarkFactory()
+            $watermarkFactory = new WatermarkFactory
         );
 
         return $this->addFilter($watermarkFactory->get());
@@ -93,11 +86,10 @@ public function addWatermark(callable $withWatermarkFactory): self
     /**
      * Shortcut for adding a Resize filter.
      *
-     * @param int $width
-     * @param int $height
-     * @param string $mode
-     * @param boolean $forceStandards
-     * @return self
+     * @param  int  $width
+     * @param  int  $height
+     * @param  string  $mode
+     * @param  bool  $forceStandards
      */
     public function resize($width, $height, $mode = ResizeFilter::RESIZEMODE_FIT, $forceStandards = true): self
     {
@@ -126,8 +118,6 @@ public function addFilterAsComplexFilter($in, $out, ...$arguments): self
 
     /**
      * Getter for the pending complex filters.
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function getPendingComplexFilters(): Collection
     {

src/Drivers/InteractsWithMediaStreams.php

@@ -11,12 +11,10 @@ trait InteractsWithMediaStreams
 {
     /**
      * Returns an array with all streams.
-     *
-     * @return array
      */
     public function getStreams(): array
     {
-        if (!$this->isAdvancedMedia()) {
+        if (! $this->isAdvancedMedia()) {
             return iterator_to_array($this->media->getStreams());
         }
 
@@ -39,7 +37,17 @@ public function getDurationInMiliseconds(): int
         $format = $this->getFormat();
 
         if ($format->has('duration')) {
-            return intval(round($format->get('duration') * 1000));
+            $duration = $format->get('duration');
+
+            if (! blank($duration)) {
+                return $format->get('duration') * 1000;
+            }
+        }
+
+        $duration = $this->extractDurationFromStream($this->getVideoStream() ?? $this->getAudioStream());
+
+        if ($duration !== null) {
+            return $duration;
         }
 
         throw new UnknownDurationException('Could not determine the duration of the media.');
@@ -69,4 +77,53 @@ public function getVideoStream(): ?Stream
             return $stream->isVideo();
         });
     }
+
+    /**
+     * Extract video duration when it's not a standard property.
+     */
+    public function extractDurationFromStream(Stream $stream): ?int
+    {
+        $duration = $this->findDuration($stream->all());
+
+        if ($duration === null) {
+            return null;
+        }
+
+        return $this->formatDuration($duration) * 1000;
+    }
+
+    /**
+     * Recursively search for the duration key.
+     */
+    public function findDuration(array $array): ?string
+    {
+        foreach ($array as $key => $value) {
+            if (is_array($value)) {
+                if (! is_null($duration = $this->findDuration($value))) {
+                    return $duration;
+                }
+            }
+
+            if (strtolower($key) === 'duration') {
+                return (string) $value;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Convert duration string to seconds.
+     */
+    public function formatDuration(string $duration): float
+    {
+        $parts = array_map('floatval', explode(':', $duration));
+        $count = count($parts);
+
+        return match ($count) {
+            2 => $parts[0] * 60 + $parts[1],
+            3 => $parts[0] * 3600 + $parts[1] * 60 + $parts[2],
+            default => 0.0,
+        };
+    }
 }

src/Drivers/PHPFFMpeg.php

@@ -42,7 +42,7 @@ class PHPFFMpeg
     private $mediaCollection;
 
     /**
-     * @var boolean
+     * @var bool
      */
     private $forceAdvanced = false;
 
@@ -61,8 +61,8 @@ class PHPFFMpeg
 
     public function __construct(FFMpeg $ffmpeg)
     {
-        $this->ffmpeg                = $ffmpeg;
-        $this->pendingComplexFilters = new Collection();
+        $this->ffmpeg = $ffmpeg;
+        $this->pendingComplexFilters = new Collection;
     }
 
     /**
@@ -114,7 +114,7 @@ public function open(MediaCollection $mediaCollection): self
 
         $this->mediaCollection = $mediaCollection;
 
-        if ($mediaCollection->count() === 1 && !$this->forceAdvanced) {
+        if ($mediaCollection->count() === 1 && ! $this->forceAdvanced) {
             $media = Arr::first($mediaCollection->collection());
 
             $this->ffmpeg->setFFProbe(
@@ -147,7 +147,7 @@ public function open(MediaCollection $mediaCollection): self
 
     public function frame(TimeCode $timecode)
     {
-        if (!$this->isVideo()) {
+        if (! $this->isVideo()) {
             throw new Exception('Opened media is not a video file.');
         }
 
@@ -178,8 +178,6 @@ public function openAdvanced(MediaCollection $mediaCollection): self
 
     /**
      * Returns the FFMpegDriver of the underlying library.
-     *
-     * @return \FFMpeg\Driver\FFMpegDriver
      */
     private function getFFMpegDriver(): FFMpegDriver
     {
@@ -188,9 +186,6 @@ private function getFFMpegDriver(): FFMpegDriver
 
     /**
      * Add a Listener to the underlying library.
-     *
-     * @param \Alchemy\BinaryDriver\Listeners\ListenerInterface $listener
-     * @return self
      */
     public function addListener(ListenerInterface $listener): self
     {
@@ -201,9 +196,6 @@ public function addListener(ListenerInterface $listener): self
 
     /**
      * Remove the Listener from the underlying library.
-     *
-     * @param \Alchemy\BinaryDriver\Listeners\ListenerInterface $listener
-     * @return self
      */
     public function removeListener(ListenerInterface $listener): self
     {
@@ -214,9 +206,6 @@ public function removeListener(ListenerInterface $listener): self
 
     /**
      * Adds a callable to the callbacks array.
-     *
-     * @param callable $callback
-     * @return self
      */
     public function beforeSaving(callable $callback): self
     {
@@ -227,8 +216,6 @@ public function beforeSaving(callable $callback): self
 
     /**
      * Set the callbacks on the Media.
-     *
-     * @return self
      */
     public function applyBeforeSavingCallbacks(): self
     {
@@ -243,10 +230,6 @@ public function applyBeforeSavingCallbacks(): self
 
     /**
      * Add an event handler to the underlying library.
-     *
-     * @param string $event
-     * @param callable $callback
-     * @return self
      */
     public function onEvent(string $event, callable $callback): self
     {

src/Drivers/UnknownDurationException.php

@@ -4,6 +4,4 @@
 
 use Exception;
 
-class UnknownDurationException extends Exception
-{
-}
+class UnknownDurationException extends Exception {}

src/Exporters/EncodingException.php

@@ -15,7 +15,7 @@ public static function decorate(RuntimeException $runtimeException): EncodingExc
             $runtimeException->getPrevious()
         ), function (self $exception) {
             if (config('laravel-ffmpeg.set_command_and_error_output_on_exception', true)) {
-                $exception->message = $exception->getAlchemyException()?->getMessage() ?: "";
+                $exception->message = $exception->getAlchemyException()?->getMessage() ?: '';
             }
         });
     }