Skip to content
Open
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
18 changes: 18 additions & 0 deletions src/Bundle/Resources/config/services/integrations/doctrine/orm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,24 @@
<services>
<defaults public="true" />

<service id="sylius.doctrine_orm.metadata.resource.metadata_collection_factory"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<service id="sylius.doctrine_orm.metadata.resource.metadata_collection_factory"
<service id="sylius.resource_metadata_collection.factory.doctrine.orm"

Would make it easier to find since it'd be in line with the decorated service

class="Sylius\Resource\Doctrine\ORM\Metadata\Resource\Factory\DoctrineORMResourceMetadataCollectionFactory"
decorates="sylius.resource_metadata_collection.factory"
decoration-priority="200"
>
<argument type="service" id="doctrine" />
<argument type="service" id=".inner" />
</service>

<service id="sylius.state_provider.doctrine.orm.state.provider" class="Sylius\Resource\Doctrine\ORM\State\Provider">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<service id="sylius.state_provider.doctrine.orm.state.provider" class="Sylius\Resource\Doctrine\ORM\State\Provider">
<service id="sylius.state_provider.doctrine.orm" class="Sylius\Resource\Doctrine\ORM\State\Provider">

Seems a bit superfluous

<argument type="service" id="doctrine" />
<argument type="service" id="sylius.repository_argument_resolver.request" />
<argument type="service" id="sylius.expression_language.argument_parser.repository" />
<argument type="tagged_locator" tag="sylius.state_provider" />
<tag name="sylius.state_provider" />
</service>
<service id="Sylius\Resource\Doctrine\ORM\State\Provider" alias="sylius.state_provider.doctrine.orm.state.provider" />

<service id="sylius.event_subscriber.orm_mapped_super_class" class="Sylius\Bundle\ResourceBundle\EventListener\ORMMappedSuperClassSubscriber">
<argument type="service" id="sylius.resource_registry" />
<tag name="doctrine.event_listener" event="loadClassMetadata" priority="8192" />
Expand Down
9 changes: 0 additions & 9 deletions src/Bundle/Resources/config/services/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@
<argument>%sylius.state_machine_component.default%</argument>
</service>

<service id="sylius.resource_metadata_collection.factory.doctrine"
class="Sylius\Resource\Doctrine\Common\Metadata\Resource\Factory\DoctrineResourceMetadataCollectionFactory"
decorates="sylius.resource_metadata_collection.factory"
decoration-priority="200"
>
<argument type="service" id="sylius.resource_registry" />
<argument type="service" id=".inner" />
</service>

<service id="sylius.resource_metadata_collection.factory.redirect"
class="Sylius\Resource\Metadata\Resource\Factory\RedirectResourceMetadataCollectionFactory"
decorates="sylius.resource_metadata_collection.factory"
Expand Down
7 changes: 0 additions & 7 deletions src/Bundle/Resources/config/services/state.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@
</service>
<service id="Sylius\Resource\State\ResponderInterface" alias="sylius.state_responder" />

<service id="Sylius\Resource\Symfony\Request\State\Provider">
<argument type="tagged_locator" tag="sylius.repository" />
<argument type="service" id="sylius.repository_argument_resolver.request" />
<argument type="service" id="sylius.expression_language.argument_parser.repository" />
<tag name="sylius.state_provider" />
</service>

<service id="Sylius\Resource\StateMachine\State\ApplyStateMachineTransitionProcessor">
<argument type="service" id="sylius.state_machine.operation" />
<argument type="service" id="Sylius\Resource\Doctrine\Common\State\PersistProcessor" on-invalid="null" />
Expand Down
175 changes: 0 additions & 175 deletions src/Component/spec/Symfony/Request/State/ProviderSpec.php

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

use Sylius\Resource\Doctrine\Common\State\PersistProcessor;
use Sylius\Resource\Doctrine\Common\State\RemoveProcessor;
use Sylius\Resource\Doctrine\ORM\Metadata\Resource\Factory\DoctrineORMResourceMetadataCollectionFactory;
use Sylius\Resource\Metadata\DeleteOperationInterface;
use Sylius\Resource\Metadata\Operation;
use Sylius\Resource\Metadata\Operations;
Expand All @@ -29,6 +30,13 @@ public function __construct(
private RegistryInterface $resourceRegistry,
private ResourceMetadataCollectionFactoryInterface $decorated,
) {
trigger_deprecation(
'sylius/resource',
'1.13',
'The "%s" class is deprecated, use "%s instead. It will be removed in 2.0.',
self::class,
DoctrineORMResourceMetadataCollectionFactory::class,
);
}

public function create(string $resourceClass): ResourceMetadataCollection
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
<?php

/*
* This file is part of the Sylius package.
*
* (c) Sylius Sp. z o.o.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

declare(strict_types=1);

namespace Sylius\Resource\Doctrine\ORM\Metadata\Resource\Factory;

use Doctrine\ORM\EntityManagerInterface;
use Doctrine\Persistence\ManagerRegistry;
use Sylius\Resource\Doctrine\Common\State\PersistProcessor;
use Sylius\Resource\Doctrine\Common\State\RemoveProcessor;
use Sylius\Resource\Metadata\DeleteOperationInterface;
use Sylius\Resource\Metadata\GridAwareOperationInterface;
use Sylius\Resource\Metadata\Operation;
use Sylius\Resource\Metadata\Operations;
use Sylius\Resource\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
use Sylius\Resource\Metadata\Resource\ResourceMetadataCollection;
use Sylius\Resource\Metadata\ResourceMetadata;

final class DoctrineORMResourceMetadataCollectionFactory implements ResourceMetadataCollectionFactoryInterface
{
public function __construct(
private ManagerRegistry $managerRegistry,
private ResourceMetadataCollectionFactoryInterface $decorated,
) {
}

public function create(string $resourceClass): ResourceMetadataCollection
{
$resourceCollectionMetadata = $this->decorated->create($resourceClass);

/** @var ResourceMetadata $resource */
foreach ($resourceCollectionMetadata->getIterator() as $i => $resource) {
Comment on lines +40 to +41
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/** @var ResourceMetadata $resource */
foreach ($resourceCollectionMetadata->getIterator() as $i => $resource) {
foreach ($resourceCollectionMetadata->getIterator() as $i => $resource) {

Setting phpstan params (TKey, TValue) on ResourceMetadataCollection would ease type-hinting

$operations = $resource->getOperations() ?? new Operations();
$entityClass = $resource->getClass();

if (null === $entityClass) {
continue;
}

/** @var Operation $operation */
foreach ($operations as $operation) {
/** @var string $key */
$key = $operation->getName();
$entityManager = $this->managerRegistry->getManagerForClass($entityClass);

if (!$entityManager instanceof EntityManagerInterface) {
$operations->add($key, $operation);

continue;
}

$operations->add($key, $this->addDefaults($operation));
}

$resource = $resource->withOperations($operations);
$resourceCollectionMetadata[$i] = $resource;
}

return $resourceCollectionMetadata;
}

private function addDefaults(Operation $operation): Operation
{
$operation = $operation->withProvider($this->getProvider($operation));

return $operation->withProcessor($this->getProcessor($operation));
}

private function getProvider(Operation $operation): callable|string|null
{
if (null !== $provider = $operation->getProvider()) {
return $provider;
}

if ($operation instanceof GridAwareOperationInterface && null !== $operation->getGrid()) {
return null;
}

return 'sylius.state_provider.doctrine.orm.state.provider';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe put it in a const, or pass through the constructor as a parameter?

}

private function getProcessor(Operation $operation): callable|string
{
if (null !== $processor = $operation->getProcessor()) {
return $processor;
}

if ($operation instanceof DeleteOperationInterface) {
return RemoveProcessor::class;
}

return PersistProcessor::class;
}
}
Loading