Skip to content

Commit a901ce2

Browse files
mpdudempdude
committed
Switch tests to use Doctrine ORM atttributes for configuration
1 parent e15b92f commit a901ce2

12 files changed

+109
-270
lines changed

‎composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
},
3737

3838
"require-dev": {
39-
"phpunit/phpunit": "^8.5.36|^9.6",
40-
"symfony/error-handler": "^5.4|^6.4|^7.0",
39+
"phpunit/phpunit": "^9.6.18",
40+
"symfony/error-handler": "^6.4|^7.0",
4141
"symfony/phpunit-bridge": ">= 7.0",
42-
"webfactory/doctrine-orm-test-infrastructure": "^1.9"
42+
"webfactory/doctrine-orm-test-infrastructure": "^1.14"
4343
},
4444

4545
"config": {

‎tests/Doctrine/TranslatableClassMetadataTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Webfactory\Bundle\PolyglotBundle\Tests\Doctrine;
44

5+
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
56
use PHPUnit\Framework\TestCase;
67
use Webfactory\Bundle\PolyglotBundle\Doctrine\TranslatableClassMetadata;
78
use Webfactory\Bundle\PolyglotBundle\Tests\TestEntity;
@@ -28,7 +29,7 @@ private function createMetadata(): TranslatableClassMetadata
2829
$infrastructure = new ORMInfrastructure([
2930
TestEntity::class,
3031
TestEntityTranslation::class,
31-
]);
32+
], mappingDriver: new AttributeDriver([], true));
3233
$entityManager = $infrastructure->getEntityManager();
3334

3435
return TranslatableClassMetadata::parseFromClass(TestEntity::class, $entityManager->getMetadataFactory());

‎tests/Functional/CascadePersistTranslationsTest.php

+13-34
Original file line numberDiff line numberDiff line change
@@ -44,33 +44,24 @@ public function adding_and_persisting_translations(): void
4444
}
4545
}
4646

47-
/**
48-
* @ORM\Entity
49-
*/
5047
#[Polyglot\Locale(primary: 'en_GB')]
48+
#[ORM\Entity]
5149
class CascadePersistTranslationsTest_Entity
5250
{
53-
/**
54-
* @ORM\Column(type="integer")
55-
*
56-
* @ORM\Id
57-
*
58-
* @ORM\GeneratedValue
59-
*/
51+
#[ORM\Column(type: 'integer')]
52+
#[ORM\Id]
53+
#[ORM\GeneratedValue]
6054
private ?int $id = null;
6155

6256
/**
6357
* (!) There is *not* cascade="persist" configuration here.
64-
*
65-
* @ORM\OneToMany(targetEntity="CascadePersistTranslationsTest_Translation", mappedBy="entity")
6658
*/
6759
#[Polyglot\TranslationCollection]
60+
#[ORM\OneToMany(targetEntity: \CascadePersistTranslationsTest_Translation::class, mappedBy: 'entity')]
6861
protected Collection $translations;
6962

70-
/**
71-
* @ORM\Column(type="string")
72-
*/
7363
#[Polyglot\Translatable]
64+
#[ORM\Column(type: 'string')]
7465
protected string|TranslatableInterface $text;
7566

7667
public function __construct()
@@ -85,33 +76,21 @@ public function addTranslation(string $locale, mixed $text): void
8576
}
8677
}
8778

88-
/**
89-
* @ORM\Entity
90-
*/
79+
#[ORM\Entity]
9180
class CascadePersistTranslationsTest_Translation
9281
{
93-
/**
94-
* @ORM\Id
95-
*
96-
* @ORM\GeneratedValue
97-
*
98-
* @ORM\Column(type="integer")
99-
*/
82+
#[ORM\Id]
83+
#[ORM\GeneratedValue]
84+
#[ORM\Column(type: 'integer')]
10085
private ?int $id = null;
10186

102-
/**
103-
* @ORM\Column
104-
*/
10587
#[Polyglot\Locale]
88+
#[ORM\Column]
10689
private string $locale;
10790

108-
/**
109-
* @ORM\ManyToOne(targetEntity="CascadePersistTranslationsTest_Entity", inversedBy="translations")
110-
*/
91+
#[ORM\ManyToOne(targetEntity: \CascadePersistTranslationsTest_Entity::class, inversedBy: 'translations')]
11192
private CascadePersistTranslationsTest_Entity $entity;
11293

113-
/**
114-
* @ORM\Column
115-
*/
94+
#[ORM\Column]
11695
private string $text;
11796
}

‎tests/Functional/EntityInheritanceTest.php

+26-69
Original file line numberDiff line numberDiff line change
@@ -101,39 +101,26 @@ public function testUpdateTranslations(): void
101101
}
102102
}
103103

104-
/**
105-
* @ORM\Entity()
106-
*
107-
* @ORM\InheritanceType(value="SINGLE_TABLE")
108-
*
109-
* @ORM\DiscriminatorMap({"base"="EntityInheritance_BaseEntityClass", "child"="EntityInheritance_ChildEntityClass"})
110-
*
111-
* @ORM\DiscriminatorColumn(name="discriminator", type="string")
112-
*/
113104
#[Polyglot\Locale(primary: 'en_GB')]
105+
#[ORM\Entity]
106+
#[ORM\InheritanceType(value: 'SINGLE_TABLE')]
107+
#[ORM\DiscriminatorMap(['base' => 'EntityInheritance_BaseEntityClass', 'child' => 'EntityInheritance_ChildEntityClass'])]
108+
#[ORM\DiscriminatorColumn(name: 'discriminator', type: 'string')]
114109
class EntityInheritance_BaseEntityClass
115110
{
116-
/**
117-
* @ORM\Column(type="integer")
118-
*
119-
* @ORM\Id
120-
*
121-
* @ORM\GeneratedValue
122-
*/
111+
#[ORM\Column(type: 'integer')]
112+
#[ORM\Id]
113+
#[ORM\GeneratedValue]
123114
private ?int $id = null;
124115

125116
private string $discriminator;
126117

127-
/**
128-
* @ORM\OneToMany(targetEntity="EntityInheritance_BaseEntityClassTranslation", mappedBy="entity")
129-
*/
130118
#[Polyglot\TranslationCollection]
119+
#[ORM\OneToMany(targetEntity: \EntityInheritance_BaseEntityClassTranslation::class, mappedBy: 'entity')]
131120
private Collection $translations;
132121

133-
/**
134-
* @ORM\Column(type="string")
135-
*/
136122
#[Polyglot\Translatable]
123+
#[ORM\Column(type: 'string')]
137124
private TranslatableInterface|string|null $text = null;
138125

139126
public function __construct()
@@ -157,52 +144,34 @@ public function getText(): TranslatableInterface
157144
}
158145
}
159146

160-
/**
161-
* @ORM\Entity
162-
*/
147+
#[ORM\Entity]
163148
class EntityInheritance_BaseEntityClassTranslation
164149
{
165-
/**
166-
* @ORM\Id
167-
*
168-
* @ORM\GeneratedValue
169-
*
170-
* @ORM\Column(type="integer")
171-
*/
150+
#[ORM\Id]
151+
#[ORM\GeneratedValue]
152+
#[ORM\Column(type: 'integer')]
172153
private ?int $id = null;
173154

174-
/**
175-
* @ORM\Column
176-
*/
177155
#[Polyglot\Locale]
156+
#[ORM\Column]
178157
private string $locale;
179158

180-
/**
181-
* @ORM\ManyToOne(targetEntity="EntityInheritance_BaseEntityClass", inversedBy="translations")
182-
*/
159+
#[ORM\ManyToOne(targetEntity: \EntityInheritance_BaseEntityClass::class, inversedBy: 'translations')]
183160
private EntityInheritance_BaseEntityClass $entity;
184161

185-
/**
186-
* @ORM\Column()
187-
*/
162+
#[ORM\Column]
188163
private string $text;
189164
}
190165

191-
/**
192-
* @ORM\Entity
193-
*/
166+
#[ORM\Entity]
194167
class EntityInheritance_ChildEntityClass extends EntityInheritance_BaseEntityClass
195168
{
196-
/**
197-
* @ORM\Column(type="string")
198-
*/
199169
#[Polyglot\Translatable]
170+
#[ORM\Column(type: 'string')]
200171
private TranslatableInterface|string|null $extraText = null;
201172

202-
/**
203-
* @ORM\OneToMany(targetEntity="EntityInheritance_ChildEntityClassTranslation", mappedBy="entity")
204-
*/
205173
#[Polyglot\TranslationCollection]
174+
#[ORM\OneToMany(targetEntity: \EntityInheritance_ChildEntityClassTranslation::class, mappedBy: 'entity')]
206175
private Collection $extraTranslations;
207176

208177
public function __construct()
@@ -222,33 +191,21 @@ public function getExtraText(): TranslatableInterface
222191
}
223192
}
224193

225-
/**
226-
* @ORM\Entity
227-
*/
194+
#[ORM\Entity]
228195
class EntityInheritance_ChildEntityClassTranslation
229196
{
230-
/**
231-
* @ORM\Id
232-
*
233-
* @ORM\GeneratedValue
234-
*
235-
* @ORM\Column(type="integer")
236-
*/
197+
#[ORM\Id]
198+
#[ORM\GeneratedValue]
199+
#[ORM\Column(type: 'integer')]
237200
private ?int $id = null;
238201

239-
/**
240-
* @ORM\Column
241-
*/
242202
#[Polyglot\Locale]
203+
#[ORM\Column]
243204
private string $locale;
244205

245-
/**
246-
* @ORM\ManyToOne(targetEntity="EntityInheritance_ChildEntityClass", inversedBy="extraTranslations")
247-
*/
206+
#[ORM\ManyToOne(targetEntity: \EntityInheritance_ChildEntityClass::class, inversedBy: 'extraTranslations')]
248207
private EntityInheritance_ChildEntityClass $entity;
249208

250-
/**
251-
* @ORM\Column()
252-
*/
209+
#[ORM\Column]
253210
private string $extraText;
254211
}

‎tests/Functional/FunctionalTestBase.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Doctrine\DBAL\Types\Type;
66
use Doctrine\ORM\EntityManagerInterface;
7+
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
78
use PHPUnit\Framework\TestCase;
89
use Webfactory\Bundle\PolyglotBundle\Doctrine\PolyglotListener;
910
use Webfactory\Bundle\PolyglotBundle\Doctrine\TranslatableStringType;
@@ -22,7 +23,7 @@ protected function setupOrmInfrastructure(array $classes): void
2223
if (!Type::hasType(TranslatableStringType::NAME)) {
2324
Type::addType(TranslatableStringType::NAME, TranslatableStringType::class);
2425
}
25-
$this->infrastructure = ORMInfrastructure::createOnlyFor($classes);
26+
$this->infrastructure = ORMInfrastructure::createOnlyFor($classes, mappingDriver: new AttributeDriver([], true));
2627
$this->entityManager = $this->infrastructure->getEntityManager();
2728
$this->defaultLocaleProvider = new DefaultLocaleProvider('en_GB');
2829

‎tests/Functional/IntegrationTest.php

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Webfactory\Bundle\PolyglotBundle\Tests\Functional;
44

5+
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
56
use Webfactory\Bundle\PolyglotBundle\Tests\TestEntity;
67
use Webfactory\Bundle\PolyglotBundle\Tests\TestEntityTranslation;
78
use Webfactory\Bundle\PolyglotBundle\Translatable;

‎tests/Functional/StronglyTypedTranslationsTest.php

+13-34
Original file line numberDiff line numberDiff line change
@@ -188,33 +188,24 @@ public function flush_updated_entity_two_times_does_not_update(): void
188188
}
189189
}
190190

191-
/**
192-
* @ORM\Entity
193-
*/
194191
#[Polyglot\Locale(primary: 'en_GB')]
192+
#[ORM\Entity]
195193
class StronglyTypedTranslationsTest_Entity
196194
{
197-
/**
198-
* @ORM\Column(type="integer")
199-
*
200-
* @ORM\Id
201-
*
202-
* @ORM\GeneratedValue
203-
*/
195+
#[ORM\Column(type: 'integer')]
196+
#[ORM\Id]
197+
#[ORM\GeneratedValue]
204198
public ?int $id = null;
205199

206-
/**
207-
* @ORM\OneToMany(targetEntity="StronglyTypedTranslationsTest_Translation", mappedBy="entity")
208-
*/
209200
#[Polyglot\TranslationCollection]
201+
#[ORM\OneToMany(targetEntity: \StronglyTypedTranslationsTest_Translation::class, mappedBy: 'entity')]
210202
public Collection $translations;
211203

212204
/**
213205
* @var TranslatableInterface<string>
214-
*
215-
* @ORM\Column(type="translatable_string", options={"use_text_column": true})
216206
*/
217207
#[Polyglot\Translatable]
208+
#[ORM\Column(type: 'translatable_string', options: ['use_text_column' => true])]
218209
public TranslatableInterface $text;
219210

220211
public function __construct()
@@ -224,33 +215,21 @@ public function __construct()
224215
}
225216
}
226217

227-
/**
228-
* @ORM\Entity
229-
*/
218+
#[ORM\Entity]
230219
class StronglyTypedTranslationsTest_Translation
231220
{
232-
/**
233-
* @ORM\Id
234-
*
235-
* @ORM\GeneratedValue
236-
*
237-
* @ORM\Column(type="integer")
238-
*/
221+
#[ORM\Id]
222+
#[ORM\GeneratedValue]
223+
#[ORM\Column(type: 'integer')]
239224
public ?int $id = null;
240225

241-
/**
242-
* @ORM\Column
243-
*/
244226
#[Polyglot\Locale]
227+
#[ORM\Column]
245228
public string $locale;
246229

247-
/**
248-
* @ORM\ManyToOne(targetEntity="StronglyTypedTranslationsTest_Entity", inversedBy="translations")
249-
*/
230+
#[ORM\ManyToOne(targetEntity: \StronglyTypedTranslationsTest_Entity::class, inversedBy: 'translations')]
250231
public StronglyTypedTranslationsTest_Entity $entity;
251232

252-
/**
253-
* @ORM\Column
254-
*/
233+
#[ORM\Column]
255234
public string $text;
256235
}

0 commit comments

Comments
 (0)