Skip to content

Commit

Permalink
Merge branch 'release/4.0.0-beta.6' into v4
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed Apr 11, 2022
2 parents 3dad700 + 3250fb9 commit 0c1d732
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Transcoder Changelog

## 4.0.0-beta.6 - 2022.04.11
### Fixed
* Fixed method signature for `Transcode::getFileInfo()` so that an Asset object can be passed into it

## 4.0.0-beta.5 - 2022.04.09
### Changed
* Added `synchronous` & `stripMetadata` to the parameters that should be excluded from the generated file name
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "nystudio107/craft-transcoder",
"description": "Transcode video & audio files to various formats, and provide video thumbnails",
"type": "craft-plugin",
"version": "4.0.0-beta.5",
"version": "4.0.0-beta.6",
"keywords": [
"craft",
"cms",
Expand Down
4 changes: 2 additions & 2 deletions src/services/Transcode.php
Original file line number Diff line number Diff line change
Expand Up @@ -460,13 +460,13 @@ public function getAudioUrl(Asset|string $filePath, array $audioOptions): string
/**
* Extract information from a video/audio file
*
* @param string $filePath
* @param Asset|string $filePath
* @param bool $summary
*
* @return null|array
* @throws InvalidConfigException
*/
public function getFileInfo(string $filePath, bool $summary = false): ?array
public function getFileInfo(Asset|string $filePath, bool $summary = false): ?array
{
$result = null;
$settings = Transcoder::$plugin->getSettings();
Expand Down

0 comments on commit 0c1d732

Please sign in to comment.