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
10 changes: 9 additions & 1 deletion src/Doctrine/Common/State/PersistProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,15 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
$referenceIdentifier = $this->getIdentifierValue($identifiers);
}

$reflectionProperties[$toProperty]->setValue($newData, $parentManager->getReference($fromClass, $referenceIdentifier));
$doctrineIdentifiers = $parentManager->getClassMetadata($fromClass)->getIdentifierFieldNames();
if (!array_diff($identifierProperties, $doctrineIdentifiers) && !array_diff($doctrineIdentifiers, $identifierProperties)) {
$parent = $parentManager->getReference($fromClass, $referenceIdentifier);
} else {
$criteria = $hasCompositeIdentifiers ? $referenceIdentifier : [$identifierProperties[0] => $referenceIdentifier];
$parent = $parentManager->getRepository($fromClass)->findOneBy($criteria);
}

$reflectionProperties[$toProperty]->setValue($newData, $parent);

continue;
}
Expand Down
4 changes: 4 additions & 0 deletions src/Doctrine/Common/Tests/State/PersistProcessorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,11 @@ public function testPersistPutCreateResolvesParentLinkViaToProperty(): void
$deviceManagerProphecy->flush()->shouldBeCalled();
$deviceManagerProphecy->refresh($device)->shouldBeCalled();

$userClassMetadata = new ORMClassMetadata(PersistProcessorTestUserStub::class);
$userClassMetadata->identifier = ['id'];

$userManagerProphecy = $this->prophesize(EntityManagerInterface::class);
$userManagerProphecy->getClassMetadata(PersistProcessorTestUserStub::class)->willReturn($userClassMetadata);
$userManagerProphecy->getReference(PersistProcessorTestUserStub::class, 'user-uuid')
->willReturn($userReference)
->shouldBeCalledTimes(1);
Expand Down
43 changes: 43 additions & 0 deletions tests/Fixtures/TestBundle/Document/CompanyBadge.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php

/*
* This file is part of the API Platform project.
*
* (c) Kévin Dunglas <dunglas@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

declare(strict_types=1);

namespace ApiPlatform\Tests\Fixtures\TestBundle\Document;

use ApiPlatform\Metadata\ApiResource;
use ApiPlatform\Metadata\Get;
use ApiPlatform\Metadata\Link;
use ApiPlatform\Metadata\Put;
use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;

#[ApiResource]
#[Get(uriTemplate: '/company_badges/{code}')]
#[Put(
uriTemplate: '/companies-by-name/{name}/badges/{code}',
allowCreate: true,
uriVariables: [
'name' => new Link(identifiers: ['name'], fromClass: Company::class, toProperty: 'company'),
'code' => new Link(fromClass: self::class),
],
)]
#[ODM\Document]
class CompanyBadge
{
#[ODM\Id(type: 'string', strategy: 'NONE')]
public string $code;

#[ODM\ReferenceOne(targetDocument: Company::class, storeAs: 'id')]
public ?Company $company = null;

#[ODM\Field]
public string $label;
}
44 changes: 44 additions & 0 deletions tests/Fixtures/TestBundle/Entity/CompanyBadge.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php

/*
* This file is part of the API Platform project.
*
* (c) Kévin Dunglas <dunglas@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

declare(strict_types=1);

namespace ApiPlatform\Tests\Fixtures\TestBundle\Entity;

use ApiPlatform\Metadata\ApiResource;
use ApiPlatform\Metadata\Get;
use ApiPlatform\Metadata\Link;
use ApiPlatform\Metadata\Put;
use Doctrine\ORM\Mapping as ORM;

#[ApiResource]
#[Get(uriTemplate: '/company_badges/{code}')]
#[Put(
uriTemplate: '/companies-by-name/{name}/badges/{code}',
allowCreate: true,
uriVariables: [
'name' => new Link(identifiers: ['name'], fromClass: Company::class, toProperty: 'company'),
'code' => new Link(fromClass: self::class),
],
)]
#[ORM\Entity]
class CompanyBadge
{
#[ORM\Id]
#[ORM\Column]
public string $code;

#[ORM\ManyToOne(targetEntity: Company::class)]
public ?Company $company = null;

#[ORM\Column]
public string $label;
}
31 changes: 29 additions & 2 deletions tests/Functional/Parameters/LinkProviderParameterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@
use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue7939FooResource;
use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\LinkParameterProviderResource;
use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\WithParameter;
use ApiPlatform\Tests\Fixtures\TestBundle\Document\Company as DocumentCompany;
use ApiPlatform\Tests\Fixtures\TestBundle\Document\CompanyBadge as DocumentCompanyBadge;
use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Company;
use ApiPlatform\Tests\Fixtures\TestBundle\Entity\CompanyBadge;
use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy;
use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Employee;
use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Issue7469Dummy;
Expand All @@ -43,15 +46,15 @@ final class LinkProviderParameterTest extends ApiTestCase
*/
public static function getResources(): array
{
return [WithParameter::class, Dummy::class, Employee::class, Company::class, LinkParameterProviderResource::class, Issue7469TestResource::class, Issue7469Dummy::class, Pairing::class, Plan::class, Issue7939FooResource::class, Issue7939BarResource::class, Issue7939BazResource::class];
return [WithParameter::class, Dummy::class, Employee::class, Company::class, CompanyBadge::class, LinkParameterProviderResource::class, Issue7469TestResource::class, Issue7469Dummy::class, Pairing::class, Plan::class, Issue7939FooResource::class, Issue7939BarResource::class, Issue7939BazResource::class];
}

/**
* @throws \Throwable
*/
protected function setUp(): void
{
$this->recreateSchema([Dummy::class, RelatedOwnedDummy::class, RelatedDummy::class, Employee::class, Company::class, Issue7469Dummy::class, Plan::class, Pairing::class]);
$this->recreateSchema([Dummy::class, RelatedOwnedDummy::class, RelatedDummy::class, Employee::class, Company::class, CompanyBadge::class, Issue7469Dummy::class, Plan::class, Pairing::class]);
}

public function testReadDummyProviderFromQueryParameter(): void
Expand Down Expand Up @@ -147,6 +150,30 @@ public function testLinkSecurityWithSlug(): void
self::assertResponseStatusCodeSame(200);
}

public function testPutCreateUnderSlugParentLink(): void
{
$companyClass = $this->isMongoDB() ? DocumentCompany::class : Company::class;
$badgeClass = $this->isMongoDB() ? DocumentCompanyBadge::class : CompanyBadge::class;

$manager = $this->getManager();
$company = new $companyClass();
$company->setName('Test');
$manager->persist($company);
$manager->flush();
$companyId = $company->getId();

self::createClient()->request('PUT', '/companies-by-name/Test/badges/gold', [
'headers' => ['Content-Type' => 'application/ld+json'],
'json' => ['label' => 'Gold'],
]);
self::assertResponseStatusCodeSame(201);

$manager->clear();
$badge = $manager->getRepository($badgeClass)->find('gold');
self::assertNotNull($badge);
self::assertSame($companyId, $badge->company->getId());
}

/**
* See https://github.com/api-platform/core/issues/7061.
*/
Expand Down
Loading