Skip to content

Quick Fix ORM translatable listener for Symfony 5 #917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GSadee merged 2 commits into from
Sep 2, 2024
Merged

Quick Fix ORM translatable listener for Symfony 5 #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f17ae07
Fix ORM translatable listener for Symfony 5
loic425 Aug 31, 2024
4a8a62c
Fix coding standard
loic425 Aug 31, 2024
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: 0 additions & 2 deletions src/Bundle/AbstractResourceBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ protected function getDoctrineMappingDirectory(): string

/**
* Return the entity namespace.
*
* @return string
*/
protected function getModelNamespace(): ?string
{
Expand Down
4 changes: 2 additions & 2 deletions src/Bundle/EventListener/ORMTranslatableListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
namespace Sylius\Bundle\ResourceBundle\EventListener;

use Doctrine\Common\EventSubscriber;
use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
use Doctrine\ORM\Event\PostLoadEventArgs;
use Doctrine\ORM\Events;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Mapping\ClassMetadataInfo;
Expand Down Expand Up @@ -72,7 +72,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
}
}

public function postLoad(LifecycleEventArgs $args): void
public function postLoad(PostLoadEventArgs $args): void

@loic425 loic425 Aug 31, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

LifecycleEventArgs is deprecated so I change this too.

{
$entity = $args->getObject();

Expand Down
3 changes: 0 additions & 3 deletions src/Bundle/Form/EventSubscriber/AddCodeFormSubscriber.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ final class AddCodeFormSubscriber implements EventSubscriberInterface

private array $options;

/**
* @param string $type
*/
public function __construct(?string $type = null, array $options = [])
{
$this->type = $type ?? TextType::class;
Expand Down
3 changes: 1 addition & 2 deletions src/Bundle/Resources/config/services/integrations/translation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
<service id="sylius.translation.translatable_listener.doctrine.orm" class="Sylius\Bundle\ResourceBundle\EventListener\ORMTranslatableListener">
<argument type="service" id="sylius.resource_registry" />
<argument type="service" id="sylius.translatable_entity_locale_assigner" />
<tag name="doctrine.event_listener" connection="default" event="loadClassMetadata" priority="99" />
<tag name="doctrine.event_listener" connection="default" event="postLoad" priority="99" />
<tag name="doctrine.event_subscriber" connection="default" priority="99" />
</service>
<service id="Sylius\Bundle\ResourceBundle\EventListener\ORMTranslatableListener" alias="sylius.translation.translatable_listener.doctrine.orm" />

Expand Down
1 change: 0 additions & 1 deletion src/Component/src/Doctrine/Persistence/RepositoryInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

/**
* @template T of ResourceInterface
*
* @extends ObjectRepository<T>
*/
interface RepositoryInterface extends ObjectRepository
Expand Down
3 changes: 0 additions & 3 deletions src/Component/src/Metadata/MetadataInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ public function getPluralName(): string;

public function getDriver(): string|false;

/**
* @return ?string
*/
public function getTemplatesNamespace(): ?string;

/**
Expand Down
3 changes: 0 additions & 3 deletions src/Component/src/Model/ToggleableInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ interface ToggleableInterface
*/
public function isEnabled();

/**
* @param bool $enabled
*/
public function setEnabled(?bool $enabled): void;

public function enable(): void;
Expand Down
3 changes: 0 additions & 3 deletions src/Component/src/Model/ToggleableTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ public function isEnabled(): bool
return $this->enabled;
}

/**
* @param bool $enabled
*/
public function setEnabled(?bool $enabled): void
{
$this->enabled = (bool) $enabled;
Expand Down
⚡