Skip to content

Commit bbdbfb8

Browse files
committed
Run Rector
I used the following config: <?php declare(strict_types=1); use Rector\Config\RectorConfig; use Rector\Doctrine\Set\DoctrineSetList; return function (RectorConfig $rectorConfig): void { $rectorConfig->paths([ __DIR__ . '/tests', ]); $rectorConfig->sets([ DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES, ]); };
1 parent 29aee06 commit bbdbfb8

422 files changed

Lines changed: 4602 additions & 6131 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

tests/Doctrine/Tests/Models/CMS/CmsAddress.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ class CmsAddress
2727

2828
/**
2929
* @var string
30-
* @Column(length=50)
3130
*/
31+
#[Column(length: 50)]
3232
public $country;
3333

3434
/**
3535
* @var string
36-
* @Column(length=50)
3736
*/
37+
#[Column(length: 50)]
3838
public $zip;
3939

4040
/**
4141
* @var string
42-
* @Column(length=50)
4342
*/
43+
#[Column(length: 50)]
4444
public $city;
4545

4646
/**
@@ -52,9 +52,9 @@ class CmsAddress
5252

5353
/**
5454
* @var CmsUser
55-
* @OneToOne(targetEntity="CmsUser", inversedBy="address")
56-
* @JoinColumn(referencedColumnName="id")
5755
*/
56+
#[OneToOne(targetEntity: 'CmsUser', inversedBy: 'address')]
57+
#[JoinColumn(referencedColumnName: 'id')]
5858
public $user;
5959

6060
public function getId(): int

tests/Doctrine/Tests/Models/CMS/CmsArticle.php

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,48 @@
1515
use Doctrine\ORM\Mapping\Table;
1616
use Doctrine\ORM\Mapping\Version;
1717

18-
/**
19-
* @Entity
20-
* @Table(name="cms_articles")
21-
*/
18+
#[Table(name: 'cms_articles')]
19+
#[Entity]
2220
class CmsArticle
2321
{
2422
/**
2523
* @var int
26-
* @Id
27-
* @Column(type="integer")
28-
* @GeneratedValue(strategy="AUTO")
2924
*/
25+
#[Id]
26+
#[Column(type: 'integer')]
27+
#[GeneratedValue(strategy: 'AUTO')]
3028
public $id;
3129

3230
/**
3331
* @var string
34-
* @Column(type="string", length=255)
3532
*/
33+
#[Column(type: 'string', length: 255)]
3634
public $topic;
3735

3836
/**
3937
* @var string
40-
* @Column(type="text")
4138
*/
39+
#[Column(type: 'text')]
4240
public $text;
4341

4442
/**
4543
* @var CmsUser
46-
* @ManyToOne(targetEntity="CmsUser", inversedBy="articles")
47-
* @JoinColumn(name="user_id", referencedColumnName="id")
4844
*/
45+
#[ManyToOne(targetEntity: 'CmsUser', inversedBy: 'articles')]
46+
#[JoinColumn(name: 'user_id', referencedColumnName: 'id')]
4947
public $user;
5048

5149
/**
5250
* @var Collection<int, CmsComment>
53-
* @OneToMany(targetEntity="CmsComment", mappedBy="article")
5451
*/
52+
#[OneToMany(targetEntity: 'CmsComment', mappedBy: 'article')]
5553
public $comments;
5654

5755
/**
5856
* @var int
59-
* @Version
60-
* @Column(type="integer")
6157
*/
58+
#[Version]
59+
#[Column(type: 'integer')]
6260
public $version;
6361

6462
public function setAuthor(CmsUser $author): void

tests/Doctrine/Tests/Models/CMS/CmsComment.php

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,35 @@
1313
use Doctrine\ORM\Mapping\Table;
1414
use Stringable;
1515

16-
/**
17-
* @Entity
18-
* @Table(name="cms_comments")
19-
*/
16+
#[Table(name: 'cms_comments')]
17+
#[Entity]
2018
class CmsComment implements Stringable
2119
{
2220
/**
2321
* @var int
24-
* @Column(type="integer")
25-
* @Id
26-
* @GeneratedValue(strategy="AUTO")
2722
*/
23+
#[Column(type: 'integer')]
24+
#[Id]
25+
#[GeneratedValue(strategy: 'AUTO')]
2826
public $id;
2927

3028
/**
3129
* @var string
32-
* @Column(type="string", length=255)
3330
*/
31+
#[Column(type: 'string', length: 255)]
3432
public $topic;
3533

3634
/**
3735
* @var string
38-
* @Column(type="string", length=255)
3936
*/
37+
#[Column(type: 'string', length: 255)]
4038
public $text;
4139

4240
/**
4341
* @var CmsArticle
44-
* @ManyToOne(targetEntity="CmsArticle", inversedBy="comments")
45-
* @JoinColumn(name="article_id", referencedColumnName="id")
4642
*/
43+
#[ManyToOne(targetEntity: 'CmsArticle', inversedBy: 'comments')]
44+
#[JoinColumn(name: 'article_id', referencedColumnName: 'id')]
4745
public $article;
4846

4947
public function setArticle(CmsArticle $article): void

tests/Doctrine/Tests/Models/CMS/CmsEmail.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,29 @@
1313

1414
/**
1515
* CmsEmail
16-
*
17-
* @Entity
18-
* @Table(name="cms_emails")
1916
*/
17+
#[Table(name: 'cms_emails')]
18+
#[Entity]
2019
class CmsEmail
2120
{
2221
/**
2322
* @var int
24-
* @Column(type="integer")
25-
* @Id
26-
* @GeneratedValue
2723
*/
24+
#[Column(type: 'integer')]
25+
#[Id]
26+
#[GeneratedValue]
2827
public $id;
2928

3029
/**
3130
* @var string
32-
* @Column(length=250)
3331
*/
32+
#[Column(length: 250)]
3433
public $email;
3534

3635
/**
3736
* @var CmsUser
38-
* @OneToOne(targetEntity="CmsUser", mappedBy="email")
3937
*/
38+
#[OneToOne(targetEntity: 'CmsUser', mappedBy: 'email')]
4039
public $user;
4140

4241
public function getId(): int

tests/Doctrine/Tests/Models/CMS/CmsEmployee.php

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,21 @@
1414

1515
/**
1616
* Description of CmsEmployee
17-
*
18-
* @Entity
19-
* @Table(name="cms_employees")
2017
*/
18+
#[Table(name: 'cms_employees')]
19+
#[Entity]
2120
class CmsEmployee
2221
{
23-
/**
24-
* @Id
25-
* @Column(type="integer")
26-
* @GeneratedValue
27-
*/
22+
#[Id]
23+
#[Column(type: 'integer')]
24+
#[GeneratedValue]
2825
private int $id;
2926

30-
/** @Column */
27+
#[Column]
3128
private string $name;
3229

33-
/**
34-
* @OneToOne(targetEntity="CmsEmployee")
35-
* @JoinColumn(name="spouse_id", referencedColumnName="id")
36-
*/
30+
#[OneToOne(targetEntity: 'CmsEmployee')]
31+
#[JoinColumn(name: 'spouse_id', referencedColumnName: 'id')]
3732
private CmsEmployee $spouse;
3833

3934
public function getId(): int

tests/Doctrine/Tests/Models/CMS/CmsGroup.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,29 @@
1616

1717
/**
1818
* Description of CmsGroup
19-
*
20-
* @Entity
21-
* @Table(name="cms_groups")
2219
*/
20+
#[Table(name: 'cms_groups')]
21+
#[Entity]
2322
class CmsGroup implements IteratorAggregate
2423
{
2524
/**
2625
* @var int
27-
* @Id
28-
* @Column(type="integer")
29-
* @GeneratedValue
3026
*/
27+
#[Id]
28+
#[Column(type: 'integer')]
29+
#[GeneratedValue]
3130
public $id;
3231

3332
/**
3433
* @var string
35-
* @Column(length=50)
3634
*/
35+
#[Column(length: 50)]
3736
public $name;
3837

3938
/**
4039
* @psalm-var Collection<int, CmsUser>
41-
* @ManyToMany(targetEntity="CmsUser", mappedBy="groups")
4240
*/
41+
#[ManyToMany(targetEntity: 'CmsUser', mappedBy: 'groups')]
4342
public $users;
4443

4544
public function __construct()

tests/Doctrine/Tests/Models/CMS/CmsPhonenumber.php

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,22 @@
1111
use Doctrine\ORM\Mapping\ManyToOne;
1212
use Doctrine\ORM\Mapping\Table;
1313

14-
/**
15-
* @Entity
16-
* @Table(name="cms_phonenumbers")
17-
*/
14+
#[Table(name: 'cms_phonenumbers')]
15+
#[Entity]
1816
class CmsPhonenumber
1917
{
2018
/**
2119
* @var string
22-
* @Id
23-
* @Column(length=50)
2420
*/
21+
#[Id]
22+
#[Column(length: 50)]
2523
public $phonenumber;
2624

2725
/**
2826
* @var CmsUser
29-
* @ManyToOne(targetEntity="CmsUser", inversedBy="phonenumbers", cascade={"merge"})
30-
* @JoinColumn(name="user_id", referencedColumnName="id")
3127
*/
28+
#[ManyToOne(targetEntity: 'CmsUser', inversedBy: 'phonenumbers', cascade: ['merge'])]
29+
#[JoinColumn(name: 'user_id', referencedColumnName: 'id')]
3230
public $user;
3331

3432
public function setUser(CmsUser $user): void

tests/Doctrine/Tests/Models/CMS/CmsTag.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,29 @@
1414

1515
/**
1616
* Description of CmsTag
17-
*
18-
* @Entity
19-
* @Table(name="cms_tags")
2017
*/
18+
#[Table(name: 'cms_tags')]
19+
#[Entity]
2120
class CmsTag
2221
{
2322
/**
2423
* @var int
25-
* @Id
26-
* @Column(type="integer")
27-
* @GeneratedValue
2824
*/
25+
#[Id]
26+
#[Column(type: 'integer')]
27+
#[GeneratedValue]
2928
public $id;
3029

3130
/**
3231
* @var string
33-
* @Column(length=50, name="tag_name", nullable=true)
3432
*/
33+
#[Column(length: 50, name: 'tag_name', nullable: true)]
3534
public $name;
3635

3736
/**
3837
* @psalm-var Collection<int, CmsUser>
39-
* @ManyToMany(targetEntity="CmsUser", mappedBy="tags")
4038
*/
39+
#[ManyToMany(targetEntity: 'CmsUser', mappedBy: 'tags')]
4140
public $users;
4241

4342
public function setName(string $name): void

0 commit comments

Comments
 (0)