Skip to content

Commit 0c1d732

Browse files
committed
Merge branch 'release/4.0.0-beta.6' into v4
2 parents 3dad700 + 3250fb9 commit 0c1d732

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Transcoder Changelog
22

3+
## 4.0.0-beta.6 - 2022.04.11
4+
### Fixed
5+
* Fixed method signature for `Transcode::getFileInfo()` so that an Asset object can be passed into it
6+
37
## 4.0.0-beta.5 - 2022.04.09
48
### Changed
59
* Added `synchronous` & `stripMetadata` to the parameters that should be excluded from the generated file name

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "nystudio107/craft-transcoder",
33
"description": "Transcode video & audio files to various formats, and provide video thumbnails",
44
"type": "craft-plugin",
5-
"version": "4.0.0-beta.5",
5+
"version": "4.0.0-beta.6",
66
"keywords": [
77
"craft",
88
"cms",

src/services/Transcode.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -460,13 +460,13 @@ public function getAudioUrl(Asset|string $filePath, array $audioOptions): string
460460
/**
461461
* Extract information from a video/audio file
462462
*
463-
* @param string $filePath
463+
* @param Asset|string $filePath
464464
* @param bool $summary
465465
*
466466
* @return null|array
467467
* @throws InvalidConfigException
468468
*/
469-
public function getFileInfo(string $filePath, bool $summary = false): ?array
469+
public function getFileInfo(Asset|string $filePath, bool $summary = false): ?array
470470
{
471471
$result = null;
472472
$settings = Transcoder::$plugin->getSettings();

0 commit comments

Comments
 (0)