Skip to content

Commit

Permalink
Merge pull request #12037 from nextcloud/techdebt/noid/phpunit-10.5
Browse files Browse the repository at this point in the history
deps(CI): Update to PHPUnit10
  • Loading branch information
nickvergessen authored Apr 10, 2024
2 parents da5e235 + 1b2f314 commit f425841
Show file tree
Hide file tree
Showing 8 changed files with 1,652 additions and 1,786 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"autoloader-suffix": "Talk",
"optimize-autoloader": true,
"platform": {
"php": "8.0.2"
"php": "8.1"
},
"sort-packages": true
},
Expand Down
2 changes: 1 addition & 1 deletion tests/php/Service/ProxyCacheMessageServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ protected function clearMessages(): void {
$query->executeStatement();
}

public function dataDeleteExpiredMessages(): array {
public static function dataDeleteExpiredMessages(): array {
return [
[1234, 12345, true],
[1234567, 12345, false],
Expand Down
4 changes: 2 additions & 2 deletions tests/php/Signaling/ListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function setUp(): void {
);
}

public function dataRoomModified(): array {
public static function dataRoomModified(): array {
return [
[
ARoomModifiedEvent::PROPERTY_NAME,
Expand Down Expand Up @@ -150,7 +150,7 @@ public function testRecordingStatusChanged(): void {
$this->listener->handle($event);
}

public function dataRoomLobbyModified(): array {
public static function dataRoomLobbyModified(): array {
return [
[
Webinary::LOBBY_NON_MODERATORS,
Expand Down
29 changes: 11 additions & 18 deletions tests/php/phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<phpunit bootstrap="bootstrap.php"
verbose="true"
convertDeprecationsToExceptions="true"
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
bootstrap="bootstrap.php"
timeoutForSmallTests="900"
timeoutForMediumTests="900"
timeoutForLargeTests="900"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
cacheDirectory=".phpunit.result.cache">
<testsuite name="Talk App Tests">
<directory suffix="Test.php">.</directory>
<directory>.</directory>
</testsuite>
<coverage>
<!-- filters for code coverage -->
<include>
<directory suffix=".php">../../../spreed/appinfo</directory>
<directory suffix=".php">../../../spreed/lib</directory>
</include>
<report>
<!-- and this is where your report will be written -->
<clover outputFile="./clover.xml"/>
</report>
</coverage>
<logging>
</logging>
<source>
<include>
<directory>../../../spreed/appinfo</directory>
<directory>../../../spreed/lib</directory>
</include>
</source>
</phpunit>
2 changes: 1 addition & 1 deletion vendor-bin/csfixer/composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"config": {
"platform": {
"php": "8.0"
"php": "8.1"
},
"sort-packages": true
},
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/mozart/composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"config": {
"platform": {
"php": "8.0"
"php": "8.1"
},
"sort-packages": true
},
Expand Down
4 changes: 2 additions & 2 deletions vendor-bin/phpunit/composer.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"config": {
"platform": {
"php": "8.0"
"php": "8.1"
},
"sort-packages": true
},
"require-dev": {
"phpunit/phpunit": "^9.5"
"phpunit/phpunit": "^10.5"
}
}
Loading

0 comments on commit f425841

Please sign in to comment.