Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for PHP 8.3. Dropped support for Laravel 9 #513

Merged
merged 6 commits into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-20.04]
php: [8.2, 8.1]
laravel: [10.*, 9.*]
php: [8.3, 8.2, 8.1]
laravel: [10.*]
ffmpeg: [5.0, 4.4]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 9.*
testbench: 7.*

name: ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - FF${{ matrix.ffmpeg }} - ${{ matrix.dependency-version }}

Expand Down Expand Up @@ -53,15 +51,7 @@ jobs:
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}-dep-${{ matrix.dependency-version }}

- name: Execute tests
run: vendor/bin/phpunit --stop-on-error --stop-on-failure --order-by random
if: matrix.os == 'ubuntu-20.04'
run: vendor/bin/phpunit --order-by random
env:
FFMPEG_TEMPORARY_FILES_ROOT: ${{ github.workspace }}
FFMPEG_TEMPORARY_ENCRYPTED_HLS: /dev/shm

- name: Execute tests
run: vendor/bin/phpunit --stop-on-error --stop-on-failure --order-by random
if: matrix.os == 'windows-2019'
env:
FFMPEG_TEMPORARY_FILES_ROOT: ${{ github.workspace }}
FFMPEG_TEMPORARY_ENCRYPTED_HLS: ${{ github.workspace }}
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
}
],
"require": {
"php": "^8.1|^8.2",
"illuminate/contracts": "^9.0|^10.0",
"php-ffmpeg/php-ffmpeg": "^1.1",
"ramsey/collection": "^1.0|^2.0"
"php": "^8.1|^8.2|^8.3",
"illuminate/contracts": "^10.0",
"php-ffmpeg/php-ffmpeg": "^1.2",
"ramsey/collection": "^2.0"
},
"require-dev": {
"league/flysystem-memory": "^3.10",
"mockery/mockery": "^1.4.4",
"nesbot/carbon": "^2.66",
"orchestra/testbench": "^7.0|^8.0",
"phpunit/phpunit": "^9.5.10",
"orchestra/testbench": "^8.0",
"phpunit/phpunit": "^10.4",
"spatie/image": "^2.2",
"spatie/phpunit-snapshot-assertions": "^4.2"
"spatie/phpunit-snapshot-assertions": "^5.0"
},
"autoload": {
"psr-4": {
Expand Down
27 changes: 5 additions & 22 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,29 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="vendor/autoload.php"
backupGlobals="false"
backupStaticAttributes="false"
colors="true"
verbose="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
backupGlobals="false"
colors="true"
processIsolation="false"
stopOnFailure="false">
<testsuites>
<testsuite name="FFMpeg Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">src/</directory>
</whitelist>
</filter>
<logging>
<log type="tap" target="build/report.tap"/>
<log type="junit" target="build/report.junit.xml"/>
<log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
<log type="coverage-text" target="build/coverage.txt"/>
<log type="coverage-clover" target="build/logs/clover.xml"/>
</logging>
</phpunit>
</phpunit>
2 changes: 1 addition & 1 deletion tests/AddFilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
use ProtoneMedia\LaravelFFMpeg\Filters\WatermarkFactory;
use ProtoneMedia\LaravelFFMpeg\MediaOpener;

class AddFilter extends TestCase
class AddFilterTest extends TestCase
{
/** @test */
public function it_can_add_a_filter_using_a_closure()
Expand Down
10 changes: 5 additions & 5 deletions tests/TileTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@

class TileTest extends TestCase
{
public static function provideThumbnailAmount()
{
return array_map(fn ($i) => [$i], range(1, 10));
}

/** @test */
public function it_has_a_tile_filter()
{
Expand Down Expand Up @@ -94,11 +99,6 @@ public function it_can_generate_thumbnails_with_a_specified_quality()
);
}

public function provideThumbnailAmount()
{
return array_map(fn ($i) => [$i], range(1, 10));
}

/** @test */
public function it_has_a_tile_filter_and_can_store_the_vtt_file()
{
Expand Down
Loading