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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ jobs:
- api-platform/doctrine-orm
- api-platform/doctrine-odm
- api-platform/metadata
- api-platform/hal
- api-platform/hydra
- api-platform/json-api
- api-platform/json-schema
Expand Down
2 changes: 1 addition & 1 deletion src/GraphQl/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"php": ">=8.2",
"api-platform/metadata": "^4.3",
"api-platform/state": "^4.3",
"api-platform/serializer": "^4.3.7",
"api-platform/serializer": "^4.3.8",
"symfony/property-info": "^7.1 || ^8.0",
"symfony/serializer": "^6.4 || ^7.1 || ^8.0",
"symfony/type-info": "^7.3 || ^8.0",
Expand Down
33 changes: 30 additions & 3 deletions src/Hal/Tests/Fixtures/Dummy.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,15 @@
class Dummy
{
public int $id;
private RelatedDummy $relatedDummy;
public ?RelatedDummy $relatedDummy = null;
private string $name;
private ?string $alias = null;
private ?string $description = null;

public function setId(int $id): void
{
$this->id = $id;
}

public function getName(): string
{
Expand All @@ -29,12 +36,32 @@ public function setName(string $name): void
$this->name = $name;
}

public function getRelatedDummy(): RelatedDummy
public function getAlias(): ?string
{
return $this->alias;
}

public function setAlias(?string $alias): void
{
$this->alias = $alias;
}

public function getDescription(): ?string
{
return $this->description;
}

public function setDescription(?string $description): void
{
$this->description = $description;
}

public function getRelatedDummy(): ?RelatedDummy
{
return $this->relatedDummy;
}

public function setRelatedDummy(RelatedDummy $relatedDummy): void
public function setRelatedDummy(?RelatedDummy $relatedDummy): void
{
$this->relatedDummy = $relatedDummy;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Hal/Tests/Fixtures/MaxDepthDummy.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ class MaxDepthDummy
#[ApiProperty(fetchEager: false)]
#[Groups(['default'])]
#[MaxDepth(1)]
public MaxDepthDummy $child;
public ?MaxDepthDummy $child = null;
}
2 changes: 1 addition & 1 deletion src/Hal/Tests/JsonSchema/SchemaFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected function setUp(): void
definitionNameFactory: $definitionNameFactory,
);

$this->schemaFactory = new SchemaFactory($baseSchemaFactory);
$this->schemaFactory = new SchemaFactory($baseSchemaFactory, $definitionNameFactory, $resourceMetadataFactory);
}

public function testBuildSchema(): void
Expand Down
18 changes: 9 additions & 9 deletions src/Hal/Tests/Serializer/ItemNormalizerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@
namespace ApiPlatform\Hal\Tests\Serializer;

use ApiPlatform\Hal\Serializer\ItemNormalizer;
use ApiPlatform\Hal\Tests\Fixtures\ApiResource\Issue5452\ActivableInterface;
use ApiPlatform\Hal\Tests\Fixtures\ApiResource\Issue5452\Author;
use ApiPlatform\Hal\Tests\Fixtures\ApiResource\Issue5452\Book;
use ApiPlatform\Hal\Tests\Fixtures\ApiResource\Issue5452\Library;
use ApiPlatform\Hal\Tests\Fixtures\ApiResource\Issue5452\TimestampableInterface;
use ApiPlatform\Hal\Tests\Fixtures\Dummy;
use ApiPlatform\Hal\Tests\Fixtures\MaxDepthDummy;
use ApiPlatform\Hal\Tests\Fixtures\RelatedDummy;
use ApiPlatform\Metadata\ApiProperty;
use ApiPlatform\Metadata\IriConverterInterface;
use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
use ApiPlatform\Metadata\Property\PropertyNameCollection;
use ApiPlatform\Metadata\ResourceClassResolverInterface;
use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue5452\ActivableInterface;
use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue5452\Author;
use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue5452\Book;
use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue5452\Library;
use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue5452\TimestampableInterface;
use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy;
use ApiPlatform\Tests\Fixtures\TestBundle\Entity\MaxDepthDummy;
use ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -104,7 +104,7 @@ public function testSupportsNormalization(): void
$this->assertFalse($normalizer->supportsNormalization($dummy, 'xml'));
$this->assertFalse($normalizer->supportsNormalization($std, $normalizer::FORMAT));
$this->assertEmpty($normalizer->getSupportedTypes('xml'));
$this->assertSame(['object' => true], $normalizer->getSupportedTypes($normalizer::FORMAT));
$this->assertSame(['object' => false], $normalizer->getSupportedTypes($normalizer::FORMAT));
}

public function testNormalize(): void
Expand Down
7 changes: 4 additions & 3 deletions src/Hal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"api-platform/state": "^4.3",
"api-platform/metadata": "^4.3",
"api-platform/documentation": "^4.3",
"api-platform/serializer": "^4.3.7",
"api-platform/serializer": "^4.3.8",
"symfony/type-info": "^7.3 || ^8.0"
},
"autoload": {
Expand Down Expand Up @@ -65,8 +65,9 @@
"test": "./vendor/bin/phpunit"
},
"require-dev": {
"phpunit/phpunit": "^11.5 || ^12.2",
"api-platform/json-schema": "^4.3"
"api-platform/json-schema": "^4.3",
"phpspec/prophecy-phpunit": "^2.2",
"phpunit/phpunit": "^11.5 || ^12.2"
},
"minimum-stability": "beta",
"prefer-stable": true
Expand Down
2 changes: 1 addition & 1 deletion src/JsonApi/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"api-platform/documentation": "^4.3",
"api-platform/json-schema": "^4.3",
"api-platform/metadata": "^4.3",
"api-platform/serializer": "^4.3.7",
"api-platform/serializer": "^4.3.8",
"api-platform/state": "^4.3",
"symfony/error-handler": "^6.4 || ^7.0 || ^8.0",
"symfony/http-foundation": "^6.4.14 || ^7.0 || ^8.0",
Expand Down
Loading