Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"require-dev": {
"doctrine/coding-standard": "^14.0",
"doctrine/dbal": "^3.1 || ^4.0",
"phpunit/phpunit": "^9.6",
"phpunit/phpunit": "^12.0",
"vimeo/psalm": "^6.13",
"symfony/cache": "^5.3||^6.2",
"php-parallel-lint/php-parallel-lint": "^1.3.2",
Expand Down
21 changes: 11 additions & 10 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage>
<include>
<directory suffix=".php">./src</directory>
<directory suffix=".php">./config</directory>
</include>
<exclude>
<directory>./vendor</directory>
</exclude>
</coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd">
<testsuites>
<testsuite name="GraphQL">
<directory>./test</directory>
<exclude>test/Entity/TypeTest.php</exclude>
</testsuite>
</testsuites>
<php>
<ini name="memory_limit" value="-1"/>
</php>
<source>
<include>
<directory suffix=".php">./src</directory>
<directory suffix=".php">./config</directory>
</include>
<exclude>
<directory>./vendor</directory>
</exclude>
</source>
</phpunit>
2 changes: 2 additions & 0 deletions test/Entity/TypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use ApiSkeletons\Doctrine\ORM\GraphQL\Filter\Filters;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Hydrator\Strategy\CsvString;
use DateTime;
use DateTimeImmutable;
use Doctrine\ORM\Mapping as ORM;

/**
Expand All @@ -21,6 +22,7 @@
#[GraphQL\Entity(group: 'BetweenTypeContainerTest')]
#[GraphQL\Entity(group: 'CustomTypeArray')]
#[ORM\Entity]
#[PHPUnit\Framework\Attributes\ExcludeFromCodeCoverage]
class TypeTest
{
#[GraphQL\Field]
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/ConfigTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
namespace ApiSkeletonsTest\Doctrine\ORM\GraphQL\Feature;

use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use InvalidArgumentException;

class ConfigTest extends AbstractTest
class ConfigTest extends TestCase
{
public function testInvalidConfig(): void
{
Expand Down
6 changes: 3 additions & 3 deletions test/Feature/DriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
use ApiSkeletons\Doctrine\ORM\GraphQL\Type\Entity\Entity;
use ApiSkeletons\Doctrine\ORM\GraphQL\Type\Entity\EntityTypeContainer;
use ApiSkeletons\Doctrine\ORM\GraphQL\Type\TypeContainer;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Performance;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Recording;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\User;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use ArrayObject;
use GraphQL\Error\Error;
use GraphQL\GraphQL;
Expand All @@ -23,7 +23,7 @@
use GraphQL\Type\Schema;
use Psr\Container\ContainerInterface;

class DriverTest extends AbstractTest
class DriverTest extends TestCase
{
public function testGetInvalidService(): void
{
Expand All @@ -49,7 +49,7 @@ public function testCreateDriverWithoutConfig(): void

public function testCreateDriverWithConfig(): void
{
$container = $this->createMock(ContainerInterface::class);
$container = $this->createStub(ContainerInterface::class);
$config = new Config([
'group' => 'default',
'useHydratorCache' => true,
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Event/BuildMetadataTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletons\Doctrine\ORM\GraphQL\Event\Metadata;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use ArrayObject;
use League\Event\EventDispatcher;

/**
* This test uses both EventDefinition and QueryBuidlerTest to add a new
* field to an entity type and filter it.
*/
class BuildMetadataTest extends AbstractTest
class BuildMetadataTest extends TestCase
{
public function testEvent(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Event/CriteriaTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletons\Doctrine\ORM\GraphQL\Event\Criteria as CriteriaEvent;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\Criteria;
use GraphQL\GraphQL;
Expand All @@ -19,7 +19,7 @@

use function count;

class CriteriaTest extends AbstractTest
class CriteriaTest extends TestCase
{
public function testEvent(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Event/CustomEventNameTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletons\Doctrine\ORM\GraphQL\Event\QueryBuilder as QueryBuilderEvent;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use Doctrine\ORM\QueryBuilder;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Schema;
use League\Event\EventDispatcher;

class CustomEventNameTest extends AbstractTest
class CustomEventNameTest extends TestCase
{
public function testEvent(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Event/EntityEventNameTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletons\Doctrine\ORM\GraphQL\Event\EntityDefinition;
use ApiSkeletons\Doctrine\ORM\GraphQL\Event\QueryBuilder;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\InputObjectType;
use GraphQL\Type\Definition\ObjectType;
Expand All @@ -23,7 +23,7 @@
/**
* This tests custom event names when creating entity types
*/
class EntityEventNameTest extends AbstractTest
class EntityEventNameTest extends TestCase
{
public function testEvent(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Event/EntityFilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletons\Doctrine\ORM\GraphQL\Event\EntityDefinition;
use ApiSkeletons\Doctrine\ORM\GraphQL\Event\QueryBuilder;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\InputObjectType;
use GraphQL\Type\Definition\ObjectType;
Expand All @@ -24,7 +24,7 @@
* This test uses both EventDefinition and QueryBuilderTest to add a new
* field to an entity type and filter it.
*/
class EntityFilterTest extends AbstractTest
class EntityFilterTest extends TestCase
{
public function testEvent(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Event/EventDefinitionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletons\Doctrine\ORM\GraphQL\Event\EntityDefinition;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Definition\ResolveInfo;
Expand All @@ -18,7 +18,7 @@
use function str_replace;
use function trim;

class EventDefinitionTest extends AbstractTest
class EventDefinitionTest extends TestCase
{
public function testEvent(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Event/FilterQueryBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletons\Doctrine\ORM\GraphQL\Event\QueryBuilder as QueryBuilderEvent;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use Doctrine\ORM\QueryBuilder;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Schema;
use League\Event\EventDispatcher;

class FilterQueryBuilderTest extends AbstractTest
class FilterQueryBuilderTest extends TestCase
{
public function testEvent(): void
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletons\Doctrine\ORM\GraphQL\Event\QueryBuilder;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Definition\ResolveInfo;
Expand All @@ -18,7 +18,7 @@
/**
* Use the resolve argument of $args on the FilterQueryBuilder object to filter the query builder
*/
class FilterQueryBuilderWithAdditionalArgsTest extends AbstractTest
class FilterQueryBuilderWithAdditionalArgsTest extends TestCase
{
public function testEvent(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Filter/CollectionFiltersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Schema;
Expand All @@ -19,7 +19,7 @@
*
* This test exists to test the filters for a collection
*/
class CollectionFiltersTest extends AbstractTest
class CollectionFiltersTest extends TestCase
{
public function testLiteralFilterValues(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Filter/ConfigExcludeFiltersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletons\Doctrine\ORM\GraphQL\Filter\Filters;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Schema;

class ConfigExcludeFiltersTest extends AbstractTest
class ConfigExcludeFiltersTest extends TestCase
{
public function testConfigExcludeFilters(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Filter/ExcludeFiltersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Schema;

class ExcludeFiltersTest extends AbstractTest
class ExcludeFiltersTest extends TestCase
{
public function testExcludeCriteria(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Filter/FilterFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;

class FilterFactoryTest extends AbstractTest
class FilterFactoryTest extends TestCase
{
public function testExcludeFilters(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Filter/FiltersTypeCollisionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletons\Doctrine\ORM\GraphQL\Type\TypeContainer;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Performance;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Schema;

class FiltersTypeCollisionTest extends AbstractTest
class FiltersTypeCollisionTest extends TestCase
{
public function testFiltersTypeCollision(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Filter/IncludeExcludeFiltersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Performance;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Schema;
use Throwable;

class IncludeExcludeFiltersTest extends AbstractTest
class IncludeExcludeFiltersTest extends TestCase
{
public function testIncludeExcludeFilters(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Filter/IncludeFiltersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Performance;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Schema;

class IncludeFiltersTest extends AbstractTest
class IncludeFiltersTest extends TestCase
{
public function testIncludeFilters(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Hydrator/DataTypesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\TypeTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Schema;

use function count;

class DataTypesTest extends AbstractTest
class DataTypesTest extends TestCase
{
public function testDataTypes(): void
{
Expand Down
4 changes: 2 additions & 2 deletions test/Feature/Hydrator/ExtractionMapTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
use ApiSkeletons\Doctrine\ORM\GraphQL\Type\Entity\EntityTypeContainer;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\AbstractTest;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\Entity\Artist;
use ApiSkeletonsTest\Doctrine\ORM\GraphQL\TestCase;
use GraphQL\GraphQL;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Schema;
Expand All @@ -20,7 +20,7 @@
/**
* This test uses aliases for fields and associations
*/
class ExtractionMapTest extends AbstractTest
class ExtractionMapTest extends TestCase
{
public function testExtractionMap(): void
{
Expand Down
Loading
Loading