From 24d7806d98e59ecb21cd96198ca0641a7c5ecaff Mon Sep 17 00:00:00 2001 From: aurelievndl Date: Wed, 10 Jul 2024 16:13:58 +0200 Subject: [PATCH 1/7] Fix package versions. --- composer.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 38ce6d85..5993e7cf 100644 --- a/composer.json +++ b/composer.json @@ -31,15 +31,16 @@ "irc": "irc://irc.libera.chat/wikidata" }, "require": { - "php": "^7.0|^8.0", - "wikibase/data-model": "~9.0|~8.0", + "php": "^7.4|^8.0", + "wikibase/data-model": "dev-master", "serialization/serialization": "~4.0|~3.1", - "data-values/serialization": "~1.0" + "data-values/serialization": "~1.0", + "wikibase/data-model-services": "dev-master" }, "require-dev": { - "data-values/geo": "~4.0|~3.0", - "data-values/number": ">=0.1 <0.11", - "data-values/time": "~1.0|~0.2", + "data-values/geo": "^4.4", + "data-values/number": "^0.12.1", + "data-values/time": "^1.1", "phpunit/phpunit": "~8.0" }, "suggest": { From 2f1cd508f195e8dcbf74d94b1a76ced98b795b2e Mon Sep 17 00:00:00 2001 From: "aurelie.vndl" Date: Wed, 24 Jul 2024 20:06:57 +0200 Subject: [PATCH 2/7] Replace package version dev-master with specified version. --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 5993e7cf..bffe8b83 100644 --- a/composer.json +++ b/composer.json @@ -31,11 +31,11 @@ "irc": "irc://irc.libera.chat/wikidata" }, "require": { - "php": "^7.4|^8.0", - "wikibase/data-model": "dev-master", + "php": "^8.1", + "wikibase/data-model": "^9.6.1", "serialization/serialization": "~4.0|~3.1", "data-values/serialization": "~1.0", - "wikibase/data-model-services": "dev-master" + "wikibase/data-model-services": "^5.4.0" }, "require-dev": { "data-values/geo": "^4.4", From 789186456ae27ff0c470f10600baebc87198a44e Mon Sep 17 00:00:00 2001 From: "aurelie.vndl" Date: Wed, 24 Jul 2024 20:27:34 +0200 Subject: [PATCH 3/7] Set fixed commit as version. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bffe8b83..db44f076 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ }, "require": { "php": "^8.1", - "wikibase/data-model": "^9.6.1", + "wikibase/data-model": "dev-master#cbbdfcb13e026357f7d441b9c901f06263304e46", "serialization/serialization": "~4.0|~3.1", "data-values/serialization": "~1.0", "wikibase/data-model-services": "^5.4.0" From 0f91e1e81514845b205425aff787ca571e3852cf Mon Sep 17 00:00:00 2001 From: "aurelie.vndl" Date: Wed, 24 Jul 2024 20:48:22 +0200 Subject: [PATCH 4/7] Update release notes. --- RELEASE-NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 96b248ea..3a75b401 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,5 +1,8 @@ # Wikibase DataModel Serialization release notes +## Unreleased +* Installable with PHP 8.1+ + ## 2.10.0 (development) * Require Wikibase DataModel 8.x or 9.x From 37f2ec15c72e41c91c95a77c1ce737335ae29a8d Mon Sep 17 00:00:00 2001 From: "aurelie.vndl" Date: Wed, 24 Jul 2024 20:53:37 +0200 Subject: [PATCH 5/7] Remove unsupported php versions. --- .travis.yml | 3 +-- composer.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5a4ba5a..d5e69542 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,9 @@ dist: xenial matrix: fast_finish: true include: - - php: 7.2 - - php: 7.3 - php: 7.4 - php: 8.0 + - php: 8.1 sudo: false diff --git a/composer.json b/composer.json index db44f076..a00cce99 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "irc": "irc://irc.libera.chat/wikidata" }, "require": { - "php": "^8.1", + "php": "^7.4||^8.0", "wikibase/data-model": "dev-master#cbbdfcb13e026357f7d441b9c901f06263304e46", "serialization/serialization": "~4.0|~3.1", "data-values/serialization": "~1.0", From b958fad2f0621829da236228103017dc67cfb92e Mon Sep 17 00:00:00 2001 From: "aurelie.vndl" Date: Wed, 24 Jul 2024 20:54:03 +0200 Subject: [PATCH 6/7] Fix composer php version. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a00cce99..9a46b5d9 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "irc": "irc://irc.libera.chat/wikidata" }, "require": { - "php": "^7.4||^8.0", + "php": "^7.4|^8.0", "wikibase/data-model": "dev-master#cbbdfcb13e026357f7d441b9c901f06263304e46", "serialization/serialization": "~4.0|~3.1", "data-values/serialization": "~1.0", From 28c912362a3a1502595b4e34bf8295b9f25bafb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lie?= Date: Thu, 25 Jul 2024 09:16:49 +0200 Subject: [PATCH 7/7] Set current version as dev-master. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9a46b5d9..3aa5efbd 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "wikibase/data-model": "dev-master#cbbdfcb13e026357f7d441b9c901f06263304e46", "serialization/serialization": "~4.0|~3.1", "data-values/serialization": "~1.0", - "wikibase/data-model-services": "^5.4.0" + "wikibase/data-model-services": "^5.3-dev" }, "require-dev": { "data-values/geo": "^4.4",