Skip to content

Commit 297df80

Browse files
author
roadiz-ci
committed
feat!: Removed JMS Serializer annotation, AbstractAjaxController requires a Symfony Serializer interface
1 parent 760c030 commit 297df80

File tree

10 files changed

+86
-196
lines changed

10 files changed

+86
-196
lines changed

src/Entity/Folder.php

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@ class Folder extends AbstractDateTimedPositioned implements FolderInterface, Lea
8484
/** @phpstan-ignore-next-line */
8585
protected Collection $documents;
8686

87-
/**
88-
* @Serializer\Groups({"folder", "folder_color"})
89-
*
90-
* @Serializer\Type("string")
91-
*/
9287
#[ORM\Column(
9388
name: 'color',
9489
type: 'string',
@@ -99,6 +94,8 @@ class Folder extends AbstractDateTimedPositioned implements FolderInterface, Lea
9994
)]
10095
#[Assert\Length(max: 7)]
10196
#[SymfonySerializer\Groups(['folder', 'folder_color'])]
97+
#[Serializer\Groups(['folder', 'folder_color'])]
98+
#[Serializer\Type('string')]
10299
protected string $color = '#000000';
103100

104101
#[ApiFilter(BaseFilter\SearchFilter::class, strategy: 'partial')]
@@ -219,12 +216,9 @@ public function getTranslatedFoldersByDefaultTranslation(): ?FolderTranslation
219216
});
220217
}
221218

222-
/**
223-
* @Serializer\VirtualProperty
224-
*
225-
* @Serializer\Groups({"folder", "document_folders"})
226-
*/
227219
#[SymfonySerializer\Groups(['folder', 'document_folders'])]
220+
#[Serializer\Groups(['folder', 'document_folders'])]
221+
#[Serializer\VirtualProperty]
228222
public function getName(): ?string
229223
{
230224
return $this->getTranslatedFolders()->first() ?

src/Entity/Group.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,9 @@ class Group extends AbstractEntity
5252
#[Serializer\Type("ArrayCollection<RZ\Roadiz\CoreBundle\Entity\Role>")]
5353
private Collection $roleEntities;
5454

55-
/**
56-
* @Serializer\Groups({"group", "user"})
57-
*
58-
* @Serializer\Type("array<string>")
59-
*/
6055
#[SymfonySerializer\Groups(['group', 'user'])]
56+
#[Serializer\Groups(['group', 'user'])]
57+
#[Serializer\Type('array<string>')]
6158
private ?array $roles = null;
6259

6360
public function __construct()

src/Entity/NodesSources.php

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -456,15 +456,11 @@ public function setNoIndex(bool $noIndex): NodesSources
456456
return $this;
457457
}
458458

459-
/**
460-
* @Serializer\VirtualProperty
461-
*
462-
* @Serializer\SerializedName("slug")
463-
*
464-
* @Serializer\Groups({"nodes_sources", "nodes_sources_base"})
465-
*/
466459
#[SymfonySerializer\SerializedName('slug')]
467460
#[SymfonySerializer\Groups(['nodes_sources', 'nodes_sources_base'])]
461+
#[Serializer\SerializedName('slug')]
462+
#[Serializer\VirtualProperty]
463+
#[Serializer\Groups(['nodes_sources', 'nodes_sources_base'])]
468464
public function getIdentifier(): string
469465
{
470466
$urlAlias = $this->getUrlAliases()->first();
@@ -484,11 +480,10 @@ public function getUrlAliases(): Collection
484480
}
485481

486482
/**
487-
* Get parent node’ source based on the same translation.
488-
*
489-
* @Serializer\Exclude
483+
* Get parent node source based on the same translation.
490484
*/
491485
#[SymfonySerializer\Ignore]
486+
#[Serializer\Exclude]
492487
public function getParent(): ?NodesSources
493488
{
494489
/** @var Node|null $parent */
@@ -538,15 +533,11 @@ public function setTranslation(TranslationInterface $translation): NodesSources
538533
return $this;
539534
}
540535

541-
/**
542-
* @Serializer\VirtualProperty
543-
*
544-
* @Serializer\Groups({"nodes_sources", "nodes_sources_default"})
545-
*
546-
* @Serializer\SerializedName("@type")
547-
*/
548536
#[SymfonySerializer\Groups(['nodes_sources', 'nodes_sources_default'])]
549537
#[SymfonySerializer\SerializedName('@type')]
538+
#[Serializer\Groups(['nodes_sources', 'nodes_sources_default'])]
539+
#[Serializer\SerializedName('@type')]
540+
#[Serializer\VirtualProperty]
550541
public function getNodeTypeName(): string
551542
{
552543
return 'NodesSources';

src/Entity/Realm.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,9 @@ class Realm extends AbstractEntity implements RealmInterface
6161
#[Assert\Regex('#^[\w\s]+$#u')]
6262
private string $name = '';
6363

64-
/**
65-
* @Serializer\Exclude()
66-
*/
6764
#[ORM\Column(name: 'plain_password', type: 'string', length: 255, unique: false, nullable: true)]
6865
#[SymfonySerializer\Ignore]
66+
#[Serializer\Exclude]
6967
#[Assert\Length(max: 255)]
7068
private ?string $plainPassword = null;
7169

src/Entity/Role.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,9 @@ public function removeGroup(Group $group): Role
163163
* Get a classified version of current role name.
164164
*
165165
* It replaces underscores by dashes and lowercase.
166-
*
167-
* @Serializer\Groups({"role"})
168166
*/
169167
#[SymfonySerializer\Groups(['role'])]
168+
#[Serializer\Groups(['role'])]
170169
public function getClassName(): string
171170
{
172171
return str_replace('_', '-', \mb_strtolower($this->getRole()));

src/Entity/Tag.php

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -393,14 +393,10 @@ public function __toString(): string
393393
return (string) $this->getId();
394394
}
395395

396-
/**
397-
* @Serializer\Groups({"tag", "tag_base", "node", "nodes_sources"})
398-
*
399-
* @Serializer\VirtualProperty
400-
*
401-
* @Serializer\Type("string|null")
402-
*/
403396
#[SymfonySerializer\Ignore]
397+
#[Serializer\Groups(['tag', 'tag_base', 'node', 'nodes_sources'])]
398+
#[Serializer\VirtualProperty]
399+
#[Serializer\Type('string|null')]
404400
public function getName(): ?string
405401
{
406402
return $this->getTranslatedTags()->first() ?
@@ -432,29 +428,21 @@ public function setTranslatedTags(Collection $translatedTags): static
432428
return $this;
433429
}
434430

435-
/**
436-
* @Serializer\Groups({"tag", "node", "nodes_sources"})
437-
*
438-
* @Serializer\VirtualProperty
439-
*
440-
* @Serializer\Type("string|null")
441-
*/
442431
#[SymfonySerializer\Ignore]
432+
#[Serializer\VirtualProperty]
433+
#[Serializer\Groups(['tag', 'node', 'nodes_sources'])]
434+
#[Serializer\Type('string|null')]
443435
public function getDescription(): ?string
444436
{
445437
return $this->getTranslatedTags()->first() ?
446438
$this->getTranslatedTags()->first()->getDescription() :
447439
'';
448440
}
449441

450-
/**
451-
* @Serializer\Groups({"tag", "node", "nodes_sources"})
452-
*
453-
* @Serializer\VirtualProperty
454-
*
455-
* @Serializer\Type("array<RZ\Roadiz\CoreBundle\Entity\Document>")
456-
*/
457442
#[SymfonySerializer\Ignore]
443+
#[Serializer\VirtualProperty]
444+
#[Serializer\Groups(['tag', 'node', 'nodes_sources'])]
445+
#[Serializer\Type('array<RZ\Roadiz\CoreBundle\Entity\Document>')]
458446
public function getDocuments(): array
459447
{
460448
return $this->getTranslatedTags()->first() ?

src/Entity/TagTranslation.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ class TagTranslation extends AbstractEntity
5858

5959
/**
6060
* @var Collection<int, TagTranslationDocuments>
61-
*
62-
* @Serializer\Exclude
6361
*/
6462
#[ORM\OneToMany(
6563
mappedBy: 'tagTranslation',
@@ -69,6 +67,7 @@ class TagTranslation extends AbstractEntity
6967
)]
7068
#[ORM\OrderBy(['position' => 'ASC'])]
7169
#[SymfonySerializer\Ignore]
70+
#[Serializer\Exclude]
7271
protected Collection $tagTranslationDocuments;
7372

7473
/**
@@ -151,14 +150,10 @@ public function __clone()
151150
}
152151
}
153152

154-
/**
155-
* @Serializer\Groups({"tag"})
156-
*
157-
* @Serializer\VirtualProperty
158-
*
159-
* @Serializer\Type("array<RZ\Roadiz\CoreBundle\Entity\Document>")
160-
*/
161153
#[SymfonySerializer\Groups(['tag'])]
154+
#[Serializer\Groups(['tag'])]
155+
#[Serializer\VirtualProperty]
156+
#[Serializer\Type('array<RZ\Roadiz\CoreBundle\Entity\Document>')]
162157
public function getDocuments(): array
163158
{
164159
return array_map(function (TagTranslationDocuments $tagTranslationDocument) {

src/Entity/Translation.php

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -549,13 +549,10 @@ class Translation extends AbstractDateTimed implements TranslationInterface
549549
* fr or en for example
550550
*
551551
* @see https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
552-
*
553-
* @Serializer\Groups({"translation", "document", "nodes_sources", "tag", "attribute", "folder", "log_sources"})
554-
*
555-
* @Serializer\Type("string")
556552
*/
557553
#[ORM\Column(type: 'string', length: 10, unique: true, nullable: false)]
558554
#[SymfonySerializer\Ignore]
555+
#[Serializer\Exclude]
559556
#[Assert\NotBlank]
560557
#[Assert\NotNull]
561558
#[Assert\Length(max: 10)]
@@ -565,27 +562,20 @@ class Translation extends AbstractDateTimed implements TranslationInterface
565562
)]
566563
private string $locale = '';
567564

568-
/**
569-
* @Serializer\Groups({"translation", "document", "nodes_sources", "tag", "attribute", "folder"})
570-
*
571-
* @Serializer\Type("string")
572-
*/
573565
#[ORM\Column(name: 'override_locale', type: 'string', length: 10, unique: true, nullable: true)]
574566
#[SymfonySerializer\Ignore]
567+
#[Serializer\Exclude]
575568
#[Assert\Length(max: 10)]
576569
#[ApiProperty(
577570
description: 'Override standard locale with an other one (for example, `uk` instead of `en`)',
578571
example: 'uk',
579572
)]
580573
private ?string $overrideLocale = null;
581574

582-
/**
583-
* @Serializer\Groups({"translation", "translation_base"})
584-
*
585-
* @Serializer\Type("string")
586-
*/
587575
#[ORM\Column(type: 'string', length: 250, unique: true)]
588576
#[SymfonySerializer\Groups(['translation', 'translation_base'])]
577+
#[Serializer\Groups(['translation', 'translation_base'])]
578+
#[Serializer\Type('string')]
589579
#[Assert\NotNull]
590580
#[Assert\NotBlank]
591581
#[Assert\Length(max: 250)]
@@ -595,26 +585,20 @@ class Translation extends AbstractDateTimed implements TranslationInterface
595585
)]
596586
private string $name = '';
597587

598-
/**
599-
* @Serializer\Groups({"translation", "translation_base"})
600-
*
601-
* @Serializer\Type("bool")
602-
*/
603588
#[ORM\Column(name: 'default_translation', type: 'boolean', nullable: false, options: ['default' => false])]
604589
#[SymfonySerializer\Groups(['translation', 'translation_base'])]
590+
#[Serializer\Groups(['translation', 'translation_base'])]
591+
#[Serializer\Type('bool')]
605592
#[ApiProperty(
606593
description: 'Is translation default one?',
607594
example: 'true',
608595
)]
609596
private bool $defaultTranslation = false;
610597

611-
/**
612-
* @Serializer\Groups({"translation", "translation_base"})
613-
*
614-
* @Serializer\Type("bool")
615-
*/
616598
#[ORM\Column(type: 'boolean', nullable: false, options: ['default' => true])]
617599
#[SymfonySerializer\Groups(['translation', 'translation_base'])]
600+
#[Serializer\Groups(['translation', 'translation_base'])]
601+
#[Serializer\Type('bool')]
618602
#[ApiProperty(
619603
description: 'Is translation available publicly?',
620604
example: 'true',
@@ -778,6 +762,8 @@ public function setOverrideLocale(?string $overrideLocale): Translation
778762
*/
779763
#[SymfonySerializer\SerializedName('locale')]
780764
#[SymfonySerializer\Groups(['translation_base'])]
765+
#[Serializer\SerializedName('locale')]
766+
#[Serializer\Groups(['translation_base'])]
781767
#[ApiProperty(
782768
description: 'Translation ISO 639-1 locale. See https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes',
783769
example: 'fr',

0 commit comments

Comments
 (0)