From 2feef9bae3c620da48217b72c7eaae04468f4f86 Mon Sep 17 00:00:00 2001 From: Mati Kochen Date: Fri, 8 Dec 2023 20:40:10 +0100 Subject: [PATCH 1/7] feat: min 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 1ef2582..f5005ab 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.3" }, "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 ccb2af101c732ae05d5c62384f23915bdf7d67a7 Mon Sep 17 00:00:00 2001 From: Mati Kochen Date: Fri, 8 Dec 2023 20:41:28 +0100 Subject: [PATCH 2/7] feat: bump core to v7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f5005ab..ae53884 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "require": { "ext-json": "*", "php": ">=8.0.0", - "oat-sa/lib-lti1p3-core": "^6.3" + "oat-sa/lib-lti1p3-core": "^7.0" }, "require-dev": { "phpunit/phpunit": "^9.6", From b2f5ca2b7915b003532e6837efba8a61d3cdd0a2 Mon Sep 17 00:00:00 2001 From: Sergei Mikhailov Date: Thu, 21 Dec 2023 21:36:39 +0100 Subject: [PATCH 3/7] ci: execute Build workflow on pull requests to `main` --- .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..ae35c64 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,6 +1,10 @@ name: Build -on: push +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] 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 76d5a5027c331e70b65f27c94106f3bb076b912c Mon Sep 17 00:00:00 2001 From: Sergei Mikhailov Date: Thu, 21 Dec 2023 21:37:18 +0100 Subject: [PATCH 4/7] 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 ae53884..a0550b0 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 76c38cfbbbb256027a6100438fc1ec7292979baf Mon Sep 17 00:00:00 2001 From: Sergei Mikhailov Date: Thu, 21 Dec 2023 21:39:07 +0100 Subject: [PATCH 5/7] fix: migrate phpunit.xml.dist configuration to phpunit 9 --- phpunit.xml.dist | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 081c3ef..9c207e8 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,25 +1,17 @@ - - - - - - - - - - tests/Unit - - - - - - src - - + + + + src + + + + + + + + tests/Unit + + From ddead9d242b8c16becdfea2dd1218f6890b6f19d Mon Sep 17 00:00:00 2001 From: Sergei Mikhailov Date: Thu, 21 Dec 2023 21:41:05 +0100 Subject: [PATCH 6/7] fix: add direct dependencies explicitly to the root-level composer.json --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a0550b0..4651028 100644 --- a/composer.json +++ b/composer.json @@ -9,9 +9,13 @@ "oat-sa/lib-lti1p3-core": "dev-feature/TR-5944/upgrade-dependencies as 7.0.0" }, "require-dev": { - "phpunit/phpunit": "^9.6", + "lcobucci/jwt": "^4.3", + "nesbot/carbon": "^2.72", + "nyholm/psr7": "^1.8", "php-coveralls/php-coveralls": "^2.4", + "phpunit/phpunit": "^9.6", "psalm/plugin-phpunit": "^0.15", + "psr/http-message": "^1.1", "vimeo/psalm": "^4.6" }, "autoload": { From a4b63db6114d3cb8154d6cdcc482b052782a273e Mon Sep 17 00:00:00 2001 From: Sergei Mikhailov Date: Fri, 22 Dec 2023 09:20:55 +0100 Subject: [PATCH 7/7] 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 4651028..3f5d041 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": { "lcobucci/jwt": "^4.3",