Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
xPaw committed Sep 25, 2023
1 parent ce9c8f4 commit f82a59f
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 29 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: ['7.4', '8.0', '8.1']
php: ['8.0', '8.1', '8.2']
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: composer install --no-interaction --no-progress
- name: Run tests
run: php vendor/bin/phpunit --configuration Tests/phpunit.xml --verbose --fail-on-warning
run: php vendor/bin/phpunit --configuration Tests/phpunit.xml --fail-on-warning
- name: Run phpstan
run: php vendor/bin/phpstan
- name: Run psalm
Expand Down
9 changes: 4 additions & 5 deletions Tests/Tests.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ class TestableSocket extends BaseSocket

public function __construct( )
{
/** @var \SplQueue<string> */
$this->PacketQueue = new \SplQueue();
$this->PacketQueue->setIteratorMode( \SplDoublyLinkedList::IT_MODE_DELETE );

Expand Down Expand Up @@ -157,7 +156,7 @@ public function testGetInfo( string $RawInput, array $ExpectedOutput ) : void
$this->assertEquals( $ExpectedOutput, $RealOutput );
}

public function InfoProvider() : array
public static function InfoProvider() : array
{
$DataProvider = [];

Expand Down Expand Up @@ -221,7 +220,7 @@ public function testBadGetRulesAfterCorrectChallenge( string $Data ) : void
$this->SourceQuery->GetRules();
}

public function BadPacketProvider( ) : array
public static function BadPacketProvider( ) : array
{
return
[
Expand Down Expand Up @@ -263,7 +262,7 @@ public function testGetRules( array $RawInput, array $ExpectedOutput ) : void
$this->assertEquals( $ExpectedOutput, $RealOutput );
}

public function RulesProvider() : array
public static function RulesProvider() : array
{
$DataProvider = [];

Expand Down Expand Up @@ -299,7 +298,7 @@ public function testGetPlayers( array $RawInput, array $ExpectedOutput ) : void
$this->assertEquals( $ExpectedOutput, $RealOutput );
}

public function PlayersProvider() : array
public static function PlayersProvider() : array
{
$DataProvider = [];

Expand Down
33 changes: 17 additions & 16 deletions Tests/phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit colors="true"
bootstrap="../SourceQuery/bootstrap.php"
verbose="true">
<testsuites>
<testsuite name="Tests">
<file>./Tests.php</file>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">../SourceQuery</directory>
</whitelist>
</filter>
<logging>
<log type="coverage-clover" target="../build/logs/clover.xml"/>
</logging>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="../SourceQuery/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" cacheDirectory=".phpunit.cache">
<coverage>
<report>
<clover outputFile="../build/logs/clover.xml"/>
</report>
</coverage>
<testsuites>
<testsuite name="Tests">
<file>./Tests.php</file>
</testsuite>
</testsuites>
<logging/>
<source>
<include>
<directory suffix=".php">../SourceQuery</directory>
</include>
</source>
</phpunit>
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
],
"require":
{
"php": ">=7.4"
"php": ">=8.0"
},
"require-dev":
{
"phpunit/phpunit": "^9.5",
"vimeo/psalm": "^4.7",
"phpstan/phpstan": "^0.12.83"
"phpunit/phpunit": "^10.3",
"vimeo/psalm": "^5.15",
"phpstan/phpstan": "^1.10"
},
"autoload":
{
Expand Down
2 changes: 1 addition & 1 deletion phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ parameters:
level: 6
paths:
- .
excludes_analyse:
excludePaths:
- vendor
2 changes: 2 additions & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<psalm
errorLevel="1"
resolveFromConfigFile="true"
findUnusedBaselineEntry="true"
findUnusedCode="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
Expand Down

0 comments on commit f82a59f

Please sign in to comment.