From 766dda291a17fea9eeb6181398e9b5a6d89d78dd Mon Sep 17 00:00:00 2001 From: paladox Date: Wed, 18 Dec 2024 13:32:46 +0000 Subject: [PATCH 1/6] Add tests for MW 1.41, 1.42 and 1.43 --- .github/workflows/ci.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a26285a..0d4ae3b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,27 @@ jobs: database_image: "mariadb:11.2" coverage: true experimental: false + - mediawiki_version: '1.41' + smw_version: dev-master + php_version: 8.1 + database_type: mysql + database_image: "mariadb:11.2" + coverage: false + experimental: false + - mediawiki_version: '1.42' + smw_version: dev-master + php_version: 8.1 + database_type: mysql + database_image: "mariadb:11.2" + coverage: false + experimental: false + - mediawiki_version: '1.43' + smw_version: dev-master + php_version: 8.1 + database_type: mysql + database_image: "mariadb:11.2" + coverage: false + experimental: false env: MW_VERSION: ${{ matrix.mediawiki_version }} From 1d297b61841b4cc603b57a4c30855a46deac199a Mon Sep 17 00:00:00 2001 From: paladox Date: Wed, 18 Dec 2024 13:50:09 +0000 Subject: [PATCH 2/6] Run php linting and minus-x --- composer.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 28c8792..77387a0 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,10 @@ "mediawiki/page-forms": ">=5.3.0" }, "require-dev": { - "mediawiki/semantic-media-wiki": "@dev" + "mediawiki/semantic-media-wiki": "@dev", + "mediawiki/minus-x": "1.1.3", + "php-parallel-lint/php-console-highlighter": "1.0.0", + "php-parallel-lint/php-parallel-lint": "1.4.0" }, "extra": { "branch-alias": { @@ -56,15 +59,22 @@ } }, "config": { - "process-timeout": 0 + "process-timeout": 0, + "allow-plugins": { + "composer/installers": true, + "dealerdirect/phpcodesniffer-composer-installer": true + } }, "scripts":{ "test": [ + "@lint", + "minus-x check .", "@phpunit" ], "test-coverage": [ "@phpunit-coverage" ], + "lint": "parallel-lint . --exclude vendor --exclude node_modules", "phpunit": "php ../../tests/phpunit/phpunit.php -c phpunit.xml.dist", "phpunit-coverage": "php ../../tests/phpunit/phpunit.php -c phpunit.xml.dist --testdox --coverage-text --coverage-html coverage/php --coverage-clover coverage/php/coverage.xml" } From 4b4f6f890e3739b9a39b76b79c2f44c1af85615a Mon Sep 17 00:00:00 2001 From: paladox Date: Wed, 18 Dec 2024 13:50:54 +0000 Subject: [PATCH 3/6] Update composer.json --- composer.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 77387a0..7987973 100644 --- a/composer.json +++ b/composer.json @@ -59,11 +59,7 @@ } }, "config": { - "process-timeout": 0, - "allow-plugins": { - "composer/installers": true, - "dealerdirect/phpcodesniffer-composer-installer": true - } + "process-timeout": 0 }, "scripts":{ "test": [ From 4905cdf722be89ac7f5aca8e427ead0e69f277e3 Mon Sep 17 00:00:00 2001 From: paladox Date: Wed, 18 Dec 2024 16:16:10 +0000 Subject: [PATCH 4/6] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6321894..48706d6 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ DB_IMAGE?="" # extensions SMW_VERSION?=4.1.2 -PF_VERSION?=5.5.1 +PF_VERSION?=5.9 # composer # Enables "composer update" inside of extension From fe5a07b0a9e4e25c1547b17d27cbc8bdeffab44b Mon Sep 17 00:00:00 2001 From: paladox Date: Wed, 18 Dec 2024 16:18:05 +0000 Subject: [PATCH 5/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 28c8792..9c372a2 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "php": ">=7.3", "composer/installers": "1.*,>=1.0.1", "mediawiki/semantic-media-wiki": "~3.0|~4.0|~5.0", - "mediawiki/page-forms": ">=5.3.0" + "mediawiki/page-forms": ">=5.9.0" }, "require-dev": { "mediawiki/semantic-media-wiki": "@dev" From 88a573a40c690d1cb05ff43979715dbdf2e2bb6e Mon Sep 17 00:00:00 2001 From: paladox Date: Wed, 18 Dec 2024 16:24:29 +0000 Subject: [PATCH 6/6] Update --- .github/workflows/ci.yml | 7 +++++++ .../Unit/ApiSemanticFormsSelectRequestProcessorTest.php | 2 +- tests/phpunit/Unit/ApiSemanticFormsSelectTest.php | 2 +- tests/phpunit/Unit/OutputTest.php | 2 +- tests/phpunit/Unit/SelectFieldTest.php | 2 +- tests/phpunit/Unit/SemanticFormsSelectInputTest.php | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d4ae3b..4b37e71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,7 @@ jobs: include: - mediawiki_version: '1.39' smw_version: '4.2.0' + pf_version: '5.9' php_version: 8.1 database_type: mysql database_image: "mariadb:11.2" @@ -26,6 +27,7 @@ jobs: experimental: false - mediawiki_version: '1.39' smw_version: dev-master + pf_version: '5.9' php_version: 8.1 database_type: mysql database_image: "mysql:8" @@ -33,6 +35,7 @@ jobs: experimental: false - mediawiki_version: '1.40' smw_version: '4.2.0' + pf_version: '5.9' php_version: 8.1 database_type: mysql database_image: "mariadb:11.2" @@ -40,6 +43,7 @@ jobs: experimental: false - mediawiki_version: '1.41' smw_version: dev-master + pf_version: '5.9' php_version: 8.1 database_type: mysql database_image: "mariadb:11.2" @@ -47,6 +51,7 @@ jobs: experimental: false - mediawiki_version: '1.42' smw_version: dev-master + pf_version: '5.9' php_version: 8.1 database_type: mysql database_image: "mariadb:11.2" @@ -54,6 +59,7 @@ jobs: experimental: false - mediawiki_version: '1.43' smw_version: dev-master + pf_version: '5.9' php_version: 8.1 database_type: mysql database_image: "mariadb:11.2" @@ -63,6 +69,7 @@ jobs: env: MW_VERSION: ${{ matrix.mediawiki_version }} SMW_VERSION: ${{ matrix.smw_version }} + PF_VERSION: ${{ matrix.pf_version }} PHP_VERSION: ${{ matrix.php_version }} DB_TYPE: ${{ matrix.database_type }} DB_IMAGE: ${{ matrix.database_image }} diff --git a/tests/phpunit/Unit/ApiSemanticFormsSelectRequestProcessorTest.php b/tests/phpunit/Unit/ApiSemanticFormsSelectRequestProcessorTest.php index a556a2c..67753c2 100644 --- a/tests/phpunit/Unit/ApiSemanticFormsSelectRequestProcessorTest.php +++ b/tests/phpunit/Unit/ApiSemanticFormsSelectRequestProcessorTest.php @@ -18,7 +18,7 @@ * @author FelixAba */ class ApiSemanticFormsSelectRequestProcessorTest - extends \PHPUnit_Framework_TestCase { + extends \PHPUnit\Framework\TestCase { private $ApiSFSRP; diff --git a/tests/phpunit/Unit/ApiSemanticFormsSelectTest.php b/tests/phpunit/Unit/ApiSemanticFormsSelectTest.php index f3e0b01..5c76e31 100644 --- a/tests/phpunit/Unit/ApiSemanticFormsSelectTest.php +++ b/tests/phpunit/Unit/ApiSemanticFormsSelectTest.php @@ -17,7 +17,7 @@ * * @author mwjames */ -class ApiSemanticFormsSelectTest extends \PHPUnit_Framework_TestCase { +class ApiSemanticFormsSelectTest extends \PHPUnit\Framework\TestCase { private $ApiSFS; private $ApiMain; diff --git a/tests/phpunit/Unit/OutputTest.php b/tests/phpunit/Unit/OutputTest.php index b70eb31..3ba9741 100644 --- a/tests/phpunit/Unit/OutputTest.php +++ b/tests/phpunit/Unit/OutputTest.php @@ -13,7 +13,7 @@ * * @author mwjames */ -class OutputTest extends \PHPUnit_Framework_TestCase { +class OutputTest extends \PHPUnit\Framework\TestCase { private $data; protected function setUp(): void { diff --git a/tests/phpunit/Unit/SelectFieldTest.php b/tests/phpunit/Unit/SelectFieldTest.php index 418b88e..8b35624 100644 --- a/tests/phpunit/Unit/SelectFieldTest.php +++ b/tests/phpunit/Unit/SelectFieldTest.php @@ -20,7 +20,7 @@ * @group semantic-forms-select * @author FelixAba */ -class SelectFieldTest extends \PHPUnit_Framework_TestCase { +class SelectFieldTest extends \PHPUnit\Framework\TestCase { private $selectField; private $other_args_query_parametrized = [ 'query' => '((Category:Building Complex))((Part Of Site::@@@@));?Display Title;format~list;sort~Display Title;sep~,;link~none;headers~hide;limit~500' ]; diff --git a/tests/phpunit/Unit/SemanticFormsSelectInputTest.php b/tests/phpunit/Unit/SemanticFormsSelectInputTest.php index cb3a35b..071adc4 100644 --- a/tests/phpunit/Unit/SemanticFormsSelectInputTest.php +++ b/tests/phpunit/Unit/SemanticFormsSelectInputTest.php @@ -13,7 +13,7 @@ * * @author FelixAba */ -class SemanticFormsSelectInputTest extends \PHPUnit_Framework_TestCase { +class SemanticFormsSelectInputTest extends \PHPUnit\Framework\TestCase { private $SFSInput;