Skip to content
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
36 changes: 19 additions & 17 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.7.0
uses: styfle/cancel-workflow-action@0.12.1
with:
access_token: ${{ github.token }}

Expand All @@ -30,15 +30,15 @@ jobs:
- "kill_previous"
steps:
- name: "Set up PHP"
uses: "shivammathur/setup-php@v2"
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # 2.32.0
with:
php-version: "latest"

- name: "Checkout code"
uses: "actions/checkout@v3"
uses: "actions/checkout@v4.2.2"

- name: "Install dependencies"
uses: "ramsey/composer-install@v2"
uses: ramsey/composer-install@a2636af0004d1c0499ffca16ac0b4cc94df70565 # 3.1.0

- name: Validate files
run: composer validate-files
Expand All @@ -50,15 +50,15 @@ jobs:
- "kill_previous"
steps:
- name: "Set up PHP"
uses: "shivammathur/setup-php@v2"
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # 2.32.0
with:
php-version: "latest"

- name: "Checkout code"
uses: "actions/checkout@v3"
uses: "actions/checkout@v4.2.2"

- name: "Install dependencies"
uses: "ramsey/composer-install@v2"
uses: ramsey/composer-install@a2636af0004d1c0499ffca16ac0b4cc94df70565 # 3.1.0

- name: Check Style
run: composer check-code-style
Expand All @@ -70,17 +70,17 @@ jobs:
- "php_syntax_errors"
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Setup PHP
uses: shivammathur/setup-php@2.15.0
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # 2.32.0
with:
php-version: "latest"
coverage: none
tools: phpstan

- name: Install Composer dependencies
uses: "ramsey/composer-install@v2"
uses: ramsey/composer-install@a2636af0004d1c0499ffca16ac0b4cc94df70565 # 3.1.0

- name: Run PHPStan
run: vendor/bin/phpstan analyze
Expand All @@ -94,14 +94,14 @@ jobs:
fail-fast: false
matrix:
php-version:
- "8.2"
- "8.3"
- "8.4"
env:
extensions: curl, dom, imagick, json, libxml, mbstring

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Set Up Imagick, FFmpeg & Exiftools
run: |
Expand All @@ -110,7 +110,7 @@ jobs:
sudo apt-get -y install ffmpeg libimage-exiftool-perl libmagickwand-dev

- name: Setup PHP Action
uses: shivammathur/setup-php@2.15.0
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # 2.32.0
with:
php-version: ${{ matrix.php-version }}
extensions: ${{ env.extensions }}
Expand All @@ -121,7 +121,7 @@ jobs:
# Dependencies need to be installed to make sure the PHPUnit classes are recognized.
# @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
- name: Install Composer dependencies
uses: "ramsey/composer-install@v2"
uses: ramsey/composer-install@a2636af0004d1c0499ffca16ac0b4cc94df70565 # 3.1.0

# - name: boot test server
# run: vendor/bin/http_test_server > /dev/null 2>&1 &
Expand All @@ -139,7 +139,9 @@ jobs:
run: composer run-tests

- name: Codecov
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

# support for mutation testing.
#
Expand All @@ -159,7 +161,7 @@ jobs:
# - "tests"
# steps:
# - name: Checkout code
# uses: actions/checkout@v3
# uses: actions/checkout@v4.2.2

# - name: Set Up Imagick, FFmpeg & Exiftools
# run: |
Expand All @@ -168,7 +170,7 @@ jobs:
# sudo apt-get -y install ffmpeg libimage-exiftool-perl libmagickwand-dev

# - name: Setup PHP
# uses: shivammathur/setup-php@2.15.0
# uses: shivammathur/setup-php@2.32.0
# with:
# php-version: "latest"
# coverage: xdebug
Expand Down
17 changes: 11 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@
"type": "library",
"license": "MIT",
"authors": [
{
"name": "LycheeOrg",
"homepage": "https://lycheeorg.dev/",
"role": "Maintainers"
},
{
"name": "Tom Van Herreweghe",
"homepage": "http://theanalogguy.be",
"role": "Developer"
"role": "Creator"
}
],
"repositories": [
Expand All @@ -28,16 +33,16 @@
"Imagick"
],
"require": {
"php": "^8.2",
"php": "^8.3",
"ext-fileinfo": "*",
"fylax/forceutf8": "^3.0.3",
"php-ffmpeg/php-ffmpeg": "^1.2",
"thecodingmachine/safe": "^2.5"
"thecodingmachine/safe": "^3.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.51",
"infection/infection": "^0.27.10",
"lychee-org/phpstan-lychee": "^1.0.4",
"infection/infection": "^0.29.14",
"lychee-org/phpstan-lychee": "^2.0.0",
"php-parallel-lint/php-parallel-lint": "^1.3.2",
"phpmd/phpmd": "^2.15",
"phpunit/phpunit": "^9.5.10",
Expand Down Expand Up @@ -76,7 +81,7 @@
},
"config": {
"platform": {
"php": "8.2"
"php": "8.3"
},
"preferred-install": "dist",
"sort-packages": true,
Expand Down
Loading