Skip to content

Commit

Permalink
Merge pull request #22 from oat-sa/feature/TR-5944/upgrade-dependencies
Browse files Browse the repository at this point in the history
Feature TR-5944 upgrade dependencies
  • Loading branch information
wazelin authored Dec 22, 2023
2 parents 89b2186 + cbc7882 commit 7e11d03
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 33 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Build

on: push
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:
Expand All @@ -9,11 +13,11 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [7.2, 7.3, 7.4]
coverage: ["true"]
php: [8.0, 8.1, 8.2, 8.3]
coverage: ["false"]
include:
- php: 8.0
coverage: "false" # PHPUnit 8.5.14 doesn't support code coverage under PHP 8
- php: 8.3
coverage: "true" # Collecting coverage reports only once

steps:
- name: Checkout
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"license": "GPL-2.0-only",
"require": {
"ext-json": "*",
"php": ">=7.2.0",
"oat-sa/lib-lti1p3-core": "^6.0"
"php": ">=8.0.0",
"oat-sa/lib-lti1p3-core": "^7.0"
},
"require-dev": {
"phpunit/phpunit": "8.5.14",
"phpunit/phpunit": "^9.6",
"php-coveralls/php-coveralls": "^2.4",
"psalm/plugin-phpunit": "^0.15.1",
"psalm/plugin-phpunit": "^0.15",
"vimeo/psalm": "^4.6"
},
"autoload": {
Expand Down
41 changes: 17 additions & 24 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.5/phpunit.xsd"
backupGlobals="false"
colors="true"
>
<php>
<env name="TEST_KEYS_ROOT_DIR" value="file://vendor/oat-sa/lib-lti1p3-core/tests/Resource/Key/RSA" />
</php>

<testsuites>
<testsuite name="Integration">
<directory>tests/Integration</directory>
</testsuite>
<testsuite name="Unit">
<directory>tests/Unit</directory>
</testsuite>
</testsuites>

<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory>src</directory>
</whitelist>
</filter>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true">
<coverage processUncoveredFiles="true">
<include>
<directory>src</directory>
</include>
</coverage>
<php>
<env name="TEST_KEYS_ROOT_DIR" value="file://vendor/oat-sa/lib-lti1p3-core/tests/Resource/Key/RSA"/>
</php>
<testsuites>
<testsuite name="Integration">
<directory>tests/Integration</directory>
</testsuite>
<testsuite name="Unit">
<directory>tests/Unit</directory>
</testsuite>
</testsuites>
</phpunit>

0 comments on commit 7e11d03

Please sign in to comment.