Skip to content

Commit

Permalink
Use PHPUnit 10 (#1300)
Browse files Browse the repository at this point in the history
  • Loading branch information
spawnia authored Jun 5, 2023
1 parent ebc54e4 commit bd483fa
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
"require-dev": {
"amphp/amp": "^2.6",
"amphp/http-server": "^2.1",
"dms/phpunit-arraysubset-asserts": "^0.4",
"dms/phpunit-arraysubset-asserts": "dev-master",
"ergebnis/composer-normalize": "^2.28",
"mll-lab/php-cs-fixer-config": "^5.0",
"mll-lab/php-cs-fixer-config": "^5",
"nyholm/psr7": "^1.5",
"phpbench/phpbench": "^1.2",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "1.10.15",
"phpstan/phpstan-phpunit": "1.3.13",
"phpstan/phpstan-strict-rules": "1.5.1",
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.5 || ^10",
"psr/http-message": "^1 || ^2",
"react/http": "^1.6",
"react/promise": "^2.9",
Expand Down
20 changes: 9 additions & 11 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="tests/bootstrap.php"
>
<coverage>
<include>
<directory suffix=".php">./src</directory>
</include>
</coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="tests/bootstrap.php">
<php>
<ini name="error_reporting" value="E_ALL"/>
</php>
<source>
<include>
<directory>src</directory>
</include>
</source>
<testsuites>
<testsuite name="webonyx/graphql-php Test Suite">
<directory>./tests/</directory>
<directory>tests/</directory>
</testsuite>
</testsuites>
</phpunit>
1 change: 1 addition & 0 deletions tests/Executor/ExecutorLazySchemaTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ public function testWarnsAboutSlowIsTypeOfForLazySchema(): void

Warning::enable(Warning::WARNING_FULL_SCHEMA_SCAN);
$result = Executor::execute($schema, Parser::parse($query));
self::markTestIncomplete('No longer works with PHPUnit 10, reintroduce with https://github.com/webonyx/graphql-php/pull/1393');
self::assertCount(1, $result->errors);
$error = $result->errors[0] ?? null;
self::assertInstanceOf(Error::class, $error);
Expand Down

0 comments on commit bd483fa

Please sign in to comment.