From 6bee7c562c48204af15f466bebb7bce40cfedb93 Mon Sep 17 00:00:00 2001 From: Mati Kochen Date: Fri, 8 Dec 2023 20:09:14 +0100 Subject: [PATCH 1/6] feat: bump to php 8.0 --- .github/workflows/build.yaml | 4 ++-- composer.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 28c7876..0e13aba 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,10 +9,10 @@ jobs: strategy: fail-fast: false matrix: - php: [7.2, 7.3, 7.4] + php: [8.0, 8.1, 8.2, 8.3] coverage: ["true"] include: - - php: 8.0 + - php: 8.3 coverage: "false" # PHPUnit 8.5.14 doesn't support code coverage under PHP 8 steps: diff --git a/composer.json b/composer.json index 9ee4f7b..a6fbcdc 100644 --- a/composer.json +++ b/composer.json @@ -5,13 +5,13 @@ "license": "GPL-2.0-only", "require": { "ext-json": "*", - "php": ">=7.2.0", + "php": ">=8.0.0", "oat-sa/lib-lti1p3-core": "^6.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": { From f93ead4ae7f5e0fb41c14f3e2f94070a49e81b0d Mon Sep 17 00:00:00 2001 From: Mati Kochen Date: Fri, 8 Dec 2023 20:10:38 +0100 Subject: [PATCH 2/6] feat: bump core v7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a6fbcdc..53840c4 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "require": { "ext-json": "*", "php": ">=8.0.0", - "oat-sa/lib-lti1p3-core": "^6.0" + "oat-sa/lib-lti1p3-core": "^7.0" }, "require-dev": { "phpunit/phpunit": "^9.6", From e379ccb3a67684ee3fd9d58091d62138440a0369 Mon Sep 17 00:00:00 2001 From: Sergei Mikhailov Date: Thu, 21 Dec 2023 21:07:50 +0100 Subject: [PATCH 3/6] ci: execute Build workflow on pull requests to `master` --- .github/workflows/build.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0e13aba..0e02efa 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,6 +1,10 @@ name: Build -on: push +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] jobs: build: @@ -10,10 +14,10 @@ jobs: fail-fast: false matrix: php: [8.0, 8.1, 8.2, 8.3] - coverage: ["true"] + coverage: ["false"] include: - php: 8.3 - coverage: "false" # PHPUnit 8.5.14 doesn't support code coverage under PHP 8 + coverage: "true" # Collecting coverage reports only once steps: - name: Checkout From 925c9415995fa5cf9173f6214d7dd2bda115b3c4 Mon Sep 17 00:00:00 2001 From: Sergei Mikhailov Date: Thu, 21 Dec 2023 21:08:56 +0100 Subject: [PATCH 4/6] chore: temporarily depend on an unreleased version of `oat-sa/lib-lti1p3-core` --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 53840c4..c17bc67 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "require": { "ext-json": "*", "php": ">=8.0.0", - "oat-sa/lib-lti1p3-core": "^7.0" + "oat-sa/lib-lti1p3-core": "dev-feature/TR-5944/upgrade-dependencies as 7.0.0" }, "require-dev": { "phpunit/phpunit": "^9.6", From ca9de456b042862a16d0a1882b03ca57d4499bb4 Mon Sep 17 00:00:00 2001 From: Sergei Mikhailov Date: Thu, 21 Dec 2023 21:10:22 +0100 Subject: [PATCH 5/6] fix: migrate phpunit.xml.dist configuration to phpunit 9 --- phpunit.xml.dist | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 84b07a9..5441481 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,27 +1,20 @@ - - - - - - - - - tests/Integration - - - tests/Unit - - - - - - src - - + + + + src + + + + + + + + tests/Integration + + + tests/Unit + + From cbc78829211909d197bfa0f1556d888e470033d6 Mon Sep 17 00:00:00 2001 From: Sergei Mikhailov Date: Fri, 22 Dec 2023 09:19:10 +0100 Subject: [PATCH 6/6] chore: require the released `oat-sa/lib-lti1p3-core` Signed-off-by: Sergei Mikhailov --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c17bc67..53840c4 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "require": { "ext-json": "*", "php": ">=8.0.0", - "oat-sa/lib-lti1p3-core": "dev-feature/TR-5944/upgrade-dependencies as 7.0.0" + "oat-sa/lib-lti1p3-core": "^7.0" }, "require-dev": { "phpunit/phpunit": "^9.6",