From d5c0c5885beba3d230ecb0408cc158d73306ab86 Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Thu, 1 Aug 2024 09:20:29 +0900
Subject: [PATCH] Issue #3464978 by mondrake: Make PHPStan rule testing use
PHPUnit 10
---
.gitlab-ci/pipeline.yml | 4 ++--
core/tests/PHPStan/composer.json | 2 +-
core/tests/PHPStan/phpunit.xml.dist | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci/pipeline.yml b/.gitlab-ci/pipeline.yml
index 36433e0b4946..19c909925d4b 100644
--- a/.gitlab-ci/pipeline.yml
+++ b/.gitlab-ci/pipeline.yml
@@ -1,4 +1,4 @@
-# cspell:ignore cobertura drupaltestbot drupaltestbotpw Dwebdriver logfile XVFB
+# cspell:ignore cobertura drupaltestbot drupaltestbotpw Dwebdriver logfile testdox XVFB
stages:
- ðŸ—œï¸ Test
@@ -222,7 +222,7 @@ variables:
- docker-php-ext-enable pcov
- cd core/tests/PHPStan
- composer install
- - vendor/bin/phpunit tests --coverage-text --colors=never --coverage-cobertura=coverage.cobertura.xml --log-junit junit.xml
+ - vendor/bin/phpunit tests --testdox --coverage-text --colors=never --coverage-cobertura=coverage.cobertura.xml --log-junit junit.xml
# Default job settings runs a script that junit files in a specific location..
after_script: []
artifacts:
diff --git a/core/tests/PHPStan/composer.json b/core/tests/PHPStan/composer.json
index c78bab07e8a9..bc50383c432c 100644
--- a/core/tests/PHPStan/composer.json
+++ b/core/tests/PHPStan/composer.json
@@ -2,7 +2,7 @@
"name": "drupal/phpstan-testing",
"description": "Tests Drupal core's PHPStan rules",
"require-dev": {
- "phpunit/phpunit": "^9",
+ "phpunit/phpunit": "^10",
"phpstan/phpstan": "1.11.8"
},
"license": "GPL-2.0-or-later",
diff --git a/core/tests/PHPStan/phpunit.xml.dist b/core/tests/PHPStan/phpunit.xml.dist
index 7ca6a7c507c2..5ec52ff5a3e3 100644
--- a/core/tests/PHPStan/phpunit.xml.dist
+++ b/core/tests/PHPStan/phpunit.xml.dist
@@ -6,7 +6,7 @@
beStrictAboutChangesToGlobalState="true"
failOnWarning="true"
cacheResult="false"
- xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+ xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd">
<php>
<!-- Set error reporting to E_ALL. -->
<ini name="error_reporting" value="32767"/>
@@ -19,9 +19,9 @@
</testsuite>
</testsuites>
<!-- Settings for coverage reports. -->
- <coverage>
+ <source>
<include>
<directory>Rules</directory>
</include>
- </coverage>
+ </source>
</phpunit>
--
GitLab