Skip to content

Commit

Permalink
Merge pull request #172 from pascalbaljetmedia/laravel-7.0
Browse files Browse the repository at this point in the history
Laravel 7.0 support
  • Loading branch information
pascalbaljet authored Mar 3, 2020
2 parents 9f2677f + 497fd13 commit 622c29c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: php
php:
- '7.2'
- '7.3'
- '7.4'

env:
matrix:
Expand Down
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,25 @@
[![Quality Score](https://img.shields.io/scrutinizer/g/pascalbaljetmedia/laravel-ffmpeg.svg?style=flat-square)](https://scrutinizer-ci.com/g/pascalbaljetmedia/laravel-ffmpeg)
[![Total Downloads](https://img.shields.io/packagist/dt/pbmedia/laravel-ffmpeg.svg?style=flat-square)](https://packagist.org/packages/pbmedia/laravel-ffmpeg)

This package provides an integration with FFmpeg for Laravel 6.0. The storage of the files is handled by [Laravel's Filesystem](http://laravel.com/docs/6.0/filesystem).
This package provides an integration with FFmpeg for Laravel 7.0. The storage of the files is handled by [Laravel's Filesystem](http://laravel.com/docs/7.0/filesystem).

## Features
* Super easy wrapper around [PHP-FFMpeg](https://github.com/PHP-FFMpeg/PHP-FFMpeg), including support for filters and other advanced features.
* Integration with [Laravel's Filesystem](http://laravel.com/docs/6.0/filesystem), [configuration system](https://laravel.com/docs/6.0/configuration) and [logging handling](https://laravel.com/docs/6.0/errors).
* Compatible with Laravel 6.0.
* Support for [Package Discovery](https://laravel.com/docs/6.0/packages#package-discovery).
* Integration with [Laravel's Filesystem](http://laravel.com/docs/7.0/filesystem), [configuration system](https://laravel.com/docs/7.0/configuration) and [logging handling](https://laravel.com/docs/7.0/errors).
* Compatible with Laravel 7.0.
* Support for [Package Discovery](https://laravel.com/docs/7.0/packages#package-discovery).
* PHP 7.2 and 7.3 only.

## We are looking for beta testers!
We are currently building a *sophisticated health checker for your Laravel applications* called [Upserver.online](https://upserver.online). We will launch a private beta in the coming weeks so please join the mailing list to get **early access**! If you want to know more, you can also read the [official announcement](https://mailchi.mp/upserver/this-is-upserver-online) or follow us on [Twitter](https://twitter.com/UpserverOnline).

## Installation

Only the master branch and version 5.0 of this package are compatible with Laravel 6.0. If you're still using an older version of Laravel (or PHP < 7.2), please use the chart below to find out which version you should use. Mind that older versions are no longer supported.
Only the master branch and version 6.0 of this package are compatible with Laravel 7.0. If you're still using an older version of Laravel (or PHP < 7.2), please use the chart below to find out which version you should use. Mind that older versions are no longer supported.

| Laravel Version | Package Version |
|-----------------|-----------------|
| 7.0 | 6.0 |
| 6.0 | 5.0 |
| 5.8 | 4.0 |
| 5.7 | 3.0 |
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
],
"require": {
"php": "^7.2",
"illuminate/config": "^6.0",
"illuminate/filesystem": "^6.0",
"illuminate/log": "^6.0",
"illuminate/support": "^6.0",
"illuminate/config": "^7.0",
"illuminate/filesystem": "^7.0",
"illuminate/log": "^7.0",
"illuminate/support": "^7.0",
"league/flysystem": "^1.0.8",
"pbmedia/php-ffmpeg": "^0.14.1",
"symfony/process": "^4.3.4"
"php-ffmpeg/php-ffmpeg": "^0.14",
"symfony/process": "^5.0"
},
"require-dev": {
"mockery/mockery": "^1.2.3",
Expand Down

0 comments on commit 622c29c

Please sign in to comment.