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

Update dependencies and fix PHP 8.4 issues #167

Merged
merged 3 commits into from
Dec 9, 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
9 changes: 6 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
VUFIND_LOCAL_DIR: $GITHUB_WORKSPACE/local
strategy:
matrix:
php-version: ['8.1', '8.2', '8.3', '8.3-no-mongo']
php-version: ['8.1', '8.2', '8.3', '8.4', '8.4-no-mongo']
include:
- php-version: 8.1
phing_tasks: "qa-tasks"
Expand All @@ -22,7 +22,10 @@ jobs:
- php-version: 8.3
phing_tasks: "qa-tasks"
php-extensions: intl, xsl, mongodb
- php-version: 8.3-no-mongo
- php-version: 8.4
phing_tasks: "qa-tasks"
php-extensions: intl, xsl, mongodb
- php-version: 8.4-no-mongo
phing_tasks: "qa-tasks"
php-extensions: intl, xsl

Expand Down Expand Up @@ -65,4 +68,4 @@ jobs:
run: composer install

- name: Run tests
run: vendor/bin/phing ${{ matrix.phing_tasks }}
run: PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/phing ${{ matrix.phing_tasks }}
12 changes: 10 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
<phingcall target="phpstan-console"/>
</target>

<!-- Fix PHP Tasks -->
<target name="fix-php" description="quality assurance php tasks">
<phingcall target="php-cs-fixer"/>
<phingcall target="phpcbf"/>
</target>

<!-- PHPUnit -->
<target name="phpunit" description="Run tests with coverage reports">
<if>
Expand Down Expand Up @@ -81,12 +87,14 @@
<!-- Psalm -->
<target name="psalm">
<exec executable="${basedir}/vendor/bin/psalm" escape="false" passthru="true" checkreturn="true">
<arg line="--diff" />
<!-- threads=1 is a workaround for "Fatal error: Maximum execution time of 0 seconds exceeded" with macOS-->
<arg line="--threads=1 --diff" />
</exec>
</target>
<target name="psalm-info">
<exec executable="${basedir}/vendor/bin/psalm" escape="false" passthru="true" checkreturn="true">
<arg line="--diff --show-info=true" />
<!-- threads=1 is a workaround for "Fatal error: Maximum execution time of 0 seconds exceeded" with macOS-->
<arg line="--threads=1 --diff --show-info=true" />
</exec>
</target>

Expand Down
31 changes: 16 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,30 +33,31 @@
"require": {
"cash/lrucache": "1.0.0",
"guzzlehttp/guzzle": "^7.8",
"laminas/laminas-mvc": "3.7.0",
"laminas/laminas-router": "3.13.0",
"laminas/laminas-servicemanager": "3.22.1",
"laminas/laminas-xml": "1.6.0",
"league/mime-type-detection": "1.15.0",
"laminas/laminas-mvc": "3.8.0",
"laminas/laminas-router": "3.14.0",
"laminas/laminas-servicemanager": "3.23.0",
"laminas/laminas-xml": "1.7.0",
"league/mime-type-detection": "1.16.0",
"ml/json-ld": "1.2.1",
"mongodb/mongodb": "1.16.1",
"mongodb/mongodb": "1.20.0",
"pcrov/jsonreader": "1.0.3",
"phayes/geophp": "1.2",
"pietercolpaert/hardf": "0.4.0",
"symfony/console": "6.4.8",
"symfony/lock": "6.4.8",
"pietercolpaert/hardf": "0.5.0",
"symfony/console": "6.4.15",
"symfony/lock": "6.4.13",
"vufind-org/vufind-marc": "1.1.0",
"wikimedia/composer-merge-plugin": "2.1.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "3.59.3",
"phing/phing": "3.0.0",
"phpstan/phpstan": "1.11.5",
"phpunit/phpunit": "10.5.24",
"squizlabs/php_codesniffer": "3.10.1",
"vimeo/psalm": "5.25.0"
"friendsofphp/php-cs-fixer": "3.65.0",
"phing/phing": "3.0.1",
"phpstan/phpstan": "1.12.12",
"phpunit/phpunit": "10.5.38",
"squizlabs/php_codesniffer": "3.11.1",
"vimeo/psalm": "5.26.1"
},
"scripts": {
"fix": "phing fix-php",
"qa": "phing qa-tasks"
},
"extra": {
Expand Down
Loading
Loading