@@ -12,31 +12,31 @@ class Mapper
12
12
{
13
13
#[ORM \Id]
14
14
#[ORM \Column(type: 'integer ' )]
15
- private $ id ;
15
+ private ? int $ id = null ;
16
16
17
17
#[ORM \Column(type: 'string ' , length: 255 )]
18
- private $ display_name ;
18
+ private ? string $ display_name = null ;
19
19
20
20
#[ORM \Column(type: 'datetime ' )]
21
- private $ account_created ;
21
+ private ? \ DateTimeInterface $ account_created = null ;
22
22
23
23
#[ORM \Column(type: 'integer ' )]
24
- private $ changesets_count ;
24
+ private ? int $ changesets_count = null ;
25
25
26
26
#[ORM \Column(type: 'string ' , length: 255 )]
27
- private $ status ;
27
+ private ? string $ status = null ;
28
28
29
29
#[ORM \OneToMany(targetEntity: Changeset::class, mappedBy: 'mapper ' , orphanRemoval: true )]
30
- private $ changesets ;
30
+ private Collection $ changesets ;
31
31
32
32
#[ORM \Column(type: 'text ' , nullable: true )]
33
- private $ image ;
33
+ private ? string $ image = null ;
34
34
35
35
#[ORM \OneToMany(targetEntity: Note::class, mappedBy: 'mapper ' , orphanRemoval: true )]
36
- private $ notes ;
36
+ private Collection $ notes ;
37
37
38
38
#[ORM \OneToOne(targetEntity: Welcome::class, mappedBy: 'mapper ' , cascade: ['persist ' ])]
39
- private $ welcome ;
39
+ private ? Welcome $ welcome = null ;
40
40
41
41
#[ORM \ManyToMany(targetEntity: Region::class, inversedBy: 'mappers ' )]
42
42
private Collection $ region ;
@@ -128,11 +128,9 @@ public function addChangeset(Changeset $changeset): self
128
128
129
129
public function removeChangeset (Changeset $ changeset ): self
130
130
{
131
- if ($ this ->changesets ->removeElement ($ changeset )) {
132
- // set the owning side to null (unless already changed)
133
- if ($ changeset ->getMapper () === $ this ) {
134
- $ changeset ->setMapper (null );
135
- }
131
+ // set the owning side to null (unless already changed)
132
+ if ($ this ->changesets ->removeElement ($ changeset ) && $ changeset ->getMapper () === $ this ) {
133
+ $ changeset ->setMapper (null );
136
134
}
137
135
138
136
return $ this ;
@@ -170,23 +168,19 @@ public function addNote(Note $note): self
170
168
171
169
public function removeNote (Note $ note ): self
172
170
{
173
- if ($ this ->notes ->removeElement ($ note )) {
174
- // set the owning side to null (unless already changed)
175
- if ($ note ->getMapper () === $ this ) {
176
- $ note ->setMapper (null );
177
- }
171
+ // set the owning side to null (unless already changed)
172
+ if ($ this ->notes ->removeElement ($ note ) && $ note ->getMapper () === $ this ) {
173
+ $ note ->setMapper (null );
178
174
}
179
175
180
176
return $ this ;
181
177
}
182
178
183
179
public function getFirstChangeset (): Changeset
184
180
{
185
- /** @var Changeset[] */
186
- $ changesets = $ this ->getChangesets ()->toArray ();
181
+ $ changesets = $ this ->changesets ->toArray ();
187
182
188
- /** @var \DateTimeImmutable[] */
189
- $ createdAt = array_map (fn (Changeset $ changeset ): ?\DateTimeImmutable => $ changeset ->getCreatedAt (), $ changesets );
183
+ $ createdAt = array_map (static fn (Changeset $ changeset ): ?\DateTimeImmutable => $ changeset ->getCreatedAt (), $ changesets );
190
184
191
185
array_multisort ($ createdAt , \SORT_ASC , $ changesets );
192
186
0 commit comments