Merge branch 'master' into pr/815

This commit is contained in:
Pascal Baljet 2021-12-20 12:48:37 +01:00
commit 40d9afd0d6
12 changed files with 142 additions and 127 deletions

View file

@ -32,11 +32,11 @@
}
],
"require": {
"php": ">=5.3.9",
"php": ">=5.5.9",
"alchemy/binary-driver": "^1.5 || ~2.0.0 || ^5.0",
"doctrine/cache": "^1.0|^2.0",
"evenement/evenement": "^3.0 || ^2.0 || ^1.0",
"neutron/temporary-filesystem": "^2.1.1 || ^3.0"
"neutron/temporary-filesystem": "^2.1.1 || ^3.0",
"symfony/cache": "^3.1 || ^4.0 || ^5.0 || ^6.0"
},
"suggest": {
"php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg"