Skip to content

Commit 8310f4b

Browse files
authored
Merge pull request #109 from pascalbaljetmedia/laravel-5.7
Laravel 5.7
2 parents 11a26dc + e9e4ad8 commit 8310f4b

File tree

3 files changed

+27
-10
lines changed

3 files changed

+27
-10
lines changed

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22

33
All Notable changes to `pbmedia/laravel-ffmpeg` will be documented in this file
44

5+
## 3.0.0 - 2018-09-03
6+
7+
### Added
8+
- Support for Laravel 5.7.
9+
10+
### Deprecated
11+
- Nothing
12+
13+
### Fixed
14+
- Nothing
15+
16+
### Removed
17+
- Nothing
18+
19+
### Security
20+
- Nothing
21+
522
## 2.1.0 - 2018-04-10
623

724
### Added

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
[![Quality Score](https://img.shields.io/scrutinizer/g/pascalbaljetmedia/laravel-ffmpeg.svg?style=flat-square)](https://scrutinizer-ci.com/g/pascalbaljetmedia/laravel-ffmpeg)
77
[![Total Downloads](https://img.shields.io/packagist/dt/pbmedia/laravel-ffmpeg.svg?style=flat-square)](https://packagist.org/packages/pbmedia/laravel-ffmpeg)
88

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

1111
## Features
1212
* Super easy wrapper around [PHP-FFMpeg](https://github.com/PHP-FFMpeg/PHP-FFMpeg), including support for filters and other advanced features.
13-
* Integration with [Laravel's Filesystem](http://laravel.com/docs/5.6/filesystem), [configuration system](https://laravel.com/docs/5.6/configuration) and [logging handling](https://laravel.com/docs/5.6/errors).
14-
* Compatible with Laravel 5.6.
15-
* Support for [Package Discovery](https://laravel.com/docs/5.6/packages#package-discovery).
13+
* Integration with [Laravel's Filesystem](http://laravel.com/docs/5.7/filesystem), [configuration system](https://laravel.com/docs/5.7/configuration) and [logging handling](https://laravel.com/docs/5.7/errors).
14+
* Compatible with Laravel 5.7.
15+
* Support for [Package Discovery](https://laravel.com/docs/5.7/packages#package-discovery).
1616
* PHP 7.1 and 7.2 only.
1717

1818
## Installation
1919

20-
This version of the package is only compatible with Laravel 5.6. If you're still using Laravel 5.1 - 5.5, please use version 1.3 (which is not maintained anymore).
20+
This version of the package is only compatible with Laravel 5.7. If you're still using Laravel 5.1 - 5.5, please use version 1.3, for Laravel 5.6 use version 2.1. Mind that older versions are not supported anymore.
2121

2222
You can install the package via composer:
2323

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
],
1818
"require": {
1919
"php": "^7.1",
20-
"illuminate/config": "5.6.*",
21-
"illuminate/filesystem": "5.6.*",
22-
"illuminate/log": "5.6.*",
20+
"illuminate/config": "5.7.*",
21+
"illuminate/filesystem": "5.7.*",
22+
"illuminate/log": "5.7.*",
2323
"league/flysystem": "~1.0",
24-
"pbmedia/php-ffmpeg": "~0.14.0",
24+
"php-ffmpeg/php-ffmpeg": "dev-master#c11b79ab5b0174aa1a56c54c67491169e78a4c17",
2525
"symfony/process": "~4.0"
2626
},
2727
"require-dev": {
2828
"mockery/mockery": "^1.0",
29-
"phpunit/phpunit": "^6.0|^7.0"
29+
"phpunit/phpunit": "^7.0"
3030
},
3131
"autoload": {
3232
"psr-4": {

0 commit comments

Comments
 (0)