Skip to content

Commit 0e9fb82

Browse files
jrushlowjrushlow
committed
replace constructor args instead of setters in csm test
1 parent 5bf56a3 commit 0e9fb82

2 files changed

Lines changed: 105 additions & 116 deletions

File tree

‎src/Doctrine/BaseRelation.php‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -47,40 +47,16 @@ public function getPropertyName(): string
4747
return $this->propertyName;
4848
}
4949

50-
public function setPropertyName(string $propertyName): self
51-
{
52-
trigger_deprecation('symfony/maker-bundle', '0.0.0', 'Set propertyname via constructor');
53-
$this->propertyName = $propertyName;
54-
55-
return $this;
56-
}
57-
5850
public function getTargetClassName(): string
5951
{
6052
return $this->targetClassName;
6153
}
6254

63-
public function setTargetClassName(string $targetClassName): self
64-
{
65-
trigger_deprecation('symfony/maker-bundle', '0.0.0', 'Set targetname via constructor');
66-
$this->targetClassName = $targetClassName;
67-
68-
return $this;
69-
}
70-
7155
public function getTargetPropertyName(): ?string
7256
{
7357
return $this->targetPropertyName;
7458
}
7559

76-
public function setTargetPropertyName(?string $targetPropertyName): self
77-
{
78-
trigger_deprecation('symfony/maker-bundle', '0.0.0', 'Set targetPropertyName via constructor');
79-
$this->targetPropertyName = $targetPropertyName;
80-
81-
return $this;
82-
}
83-
8460
public function isSelfReferencing(): bool
8561
{
8662
return $this->isSelfReferencing;
@@ -91,13 +67,6 @@ public function getMapInverseRelation(): bool
9167
return $this->mapInverseRelation;
9268
}
9369

94-
public function setMapInverseRelation(bool $mapInverseRelation): self
95-
{
96-
$this->mapInverseRelation = $mapInverseRelation;
97-
98-
return $this;
99-
}
100-
10170
public function shouldAvoidSetter(): bool
10271
{
10372
return $this->avoidSetter;

‎tests/Util/ClassSourceManipulatorTest.php‎

Lines changed: 105 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -377,62 +377,68 @@ public function getAddManyToOneRelationTests(): \Generator
377377
yield 'many_to_one_not_nullable' => [
378378
'User_simple.php',
379379
'User_simple_not_nullable.php',
380-
(new RelationManyToOne())
381-
->setPropertyName('category')
382-
->setTargetClassName('App\Entity\Category')
383-
->setTargetPropertyName('foods')
380+
(new RelationManyToOne(
381+
propertyName: 'category',
382+
targetClassName: \App\Entity\Category::class,
383+
targetPropertyName: 'foods',
384+
))
384385
->setIsNullable(false),
385386
];
386387

387388
yield 'many_to_one_nullable' => [
388389
'User_simple.php',
389390
'User_simple_nullable.php',
390-
(new RelationManyToOne())
391-
->setPropertyName('category')
392-
->setTargetClassName('App\Entity\Category')
393-
->setTargetPropertyName('foods')
391+
(new RelationManyToOne(
392+
propertyName: 'category',
393+
targetClassName: \App\Entity\Category::class,
394+
targetPropertyName: 'foods',
395+
))
394396
->setIsNullable(true),
395397
];
396398

397399
yield 'many_to_one_other_namespace' => [
398400
'User_simple.php',
399401
'User_simple_other_namespace.php',
400-
(new RelationManyToOne())
401-
->setPropertyName('category')
402-
->setTargetClassName('Foo\Entity\Category')
403-
->setTargetPropertyName('foods')
402+
(new RelationManyToOne(
403+
propertyName: 'category',
404+
targetClassName: \Foo\Entity\Category::class,
405+
targetPropertyName: 'foods',
406+
))
404407
->setIsNullable(true),
405408
];
406409

407410
yield 'many_to_one_empty_other_namespace' => [
408411
'User_empty.php',
409412
'User_empty_other_namespace.php',
410-
(new RelationManyToOne())
411-
->setPropertyName('category')
412-
->setTargetClassName('Foo\Entity\Category')
413-
->setTargetPropertyName('foods')
413+
(new RelationManyToOne(
414+
propertyName: 'category',
415+
targetClassName: \Foo\Entity\Category::class,
416+
targetPropertyName: 'foods',
417+
))
414418
->setIsNullable(true),
415419
];
416420

417421
yield 'many_to_one_same_and_other_namespaces' => [
418422
'User_with_relation.php',
419423
'User_with_relation_same_and_other_namespaces.php',
420-
(new RelationManyToOne())
421-
->setPropertyName('subCategory')
422-
->setTargetClassName('App\Entity\SubDirectory\Category')
423-
->setTargetPropertyName('foods')
424+
(new RelationManyToOne(
425+
propertyName: 'subCategory',
426+
targetClassName: \App\Entity\SubDirectory\Category::class,
427+
targetPropertyName: 'foods',
428+
))
424429
->setIsNullable(true),
425430
];
426431

427432
yield 'many_to_one_no_inverse' => [
428433
'User_simple.php',
429434
'User_simple_no_inverse.php',
430-
(new RelationManyToOne())
431-
->setPropertyName('category')
432-
->setTargetClassName('App\Entity\Category')
433-
->setTargetPropertyName('foods')
435+
(new RelationManyToOne(
436+
propertyName: 'category',
437+
targetClassName: \App\Entity\Category::class,
438+
targetPropertyName: 'foods',
439+
mapInverseRelation: false,
440+
))
434441
->setIsNullable(true)
435-
->setMapInverseRelation(false),
436442
];
437443
}
438444

@@ -476,10 +482,11 @@ public function getAddOneToManyRelationTests(): \Generator
476482
yield 'one_to_many_simple' => [
477483
'User_simple.php',
478484
'User_simple.php',
479-
(new RelationOneToMany())
480-
->setPropertyName('avatarPhotos')
481-
->setTargetClassName('App\Entity\UserAvatarPhoto')
482-
->setTargetPropertyName('user')
485+
(new RelationOneToMany(
486+
propertyName: 'avatarPhotos',
487+
targetClassName: \App\Entity\UserAvatarPhoto::class,
488+
targetPropertyName: 'user',
489+
))
483490
->setOrphanRemoval(false),
484491
];
485492

@@ -488,20 +495,22 @@ public function getAddOneToManyRelationTests(): \Generator
488495
yield 'one_to_many_simple_no_duplicate_use' => [
489496
'User_with_use_statements.php',
490497
'User_with_use_statements.php',
491-
(new RelationOneToMany())
492-
->setPropertyName('avatarPhotos')
493-
->setTargetClassName('App\Entity\UserAvatarPhoto')
494-
->setTargetPropertyName('user')
498+
(new RelationOneToMany(
499+
propertyName: 'avatarPhotos',
500+
targetClassName: \App\Entity\UserAvatarPhoto::class,
501+
targetPropertyName: 'user',
502+
))
495503
->setOrphanRemoval(false),
496504
];
497505

498506
yield 'one_to_many_orphan_removal' => [
499507
'User_simple.php',
500508
'User_simple_orphan_removal.php',
501-
(new RelationOneToMany())
502-
->setPropertyName('avatarPhotos')
503-
->setTargetClassName('App\Entity\UserAvatarPhoto')
504-
->setTargetPropertyName('user')
509+
(new RelationOneToMany(
510+
propertyName: 'avatarPhotos',
511+
targetClassName: \App\Entity\UserAvatarPhoto::class,
512+
targetPropertyName: 'user',
513+
))
505514
->setOrphanRemoval(true),
506515
];
507516

@@ -548,32 +557,35 @@ public function getAddManyToManyRelationTests(): \Generator
548557
yield 'many_to_many_owning' => [
549558
'User_simple.php',
550559
'User_simple_owning.php',
551-
(new RelationManyToMany())
552-
->setPropertyName('recipes')
553-
->setTargetClassName('App\Entity\Recipe')
554-
->setTargetPropertyName('foods')
560+
(new RelationManyToMany(
561+
propertyName: 'recipes',
562+
targetClassName: \App\Entity\Recipe::class,
563+
targetPropertyName: 'foods',
564+
))
555565
->setIsOwning(true),
556566
];
557567

558568
yield 'many_to_many_inverse' => [
559569
'User_simple.php',
560570
'User_simple_inverse.php',
561-
(new RelationManyToMany())
562-
->setPropertyName('recipes')
563-
->setTargetClassName('App\Entity\Recipe')
564-
->setTargetPropertyName('foods')
571+
(new RelationManyToMany(
572+
propertyName: 'recipes',
573+
targetClassName: \App\Entity\Recipe::class,
574+
targetPropertyName: 'foods',
575+
))
565576
->setIsOwning(false),
566577
];
567578

568579
yield 'many_to_many_owning_inverse' => [
569580
'User_simple.php',
570581
'User_simple_no_inverse.php',
571-
(new RelationManyToMany())
572-
->setPropertyName('recipes')
573-
->setTargetClassName('App\Entity\Recipe')
574-
->setTargetPropertyName('foods')
575-
->setIsOwning(true)
576-
->setMapInverseRelation(false),
582+
(new RelationManyToMany(
583+
propertyName: 'recipes',
584+
targetClassName: \App\Entity\Recipe::class,
585+
targetPropertyName: 'foods',
586+
mapInverseRelation: false,
587+
))
588+
->setIsOwning(true),
577589
];
578590
}
579591

@@ -617,10 +629,11 @@ public function getAddOneToOneRelationTests(): \Generator
617629
yield 'one_to_one_owning' => [
618630
'User_simple.php',
619631
'User_simple_owning.php',
620-
(new RelationOneToOne())
621-
->setPropertyName('userProfile')
622-
->setTargetClassName('App\Entity\UserProfile')
623-
->setTargetPropertyName('user')
632+
(new RelationOneToOne(
633+
propertyName: 'userProfile',
634+
targetClassName: \App\Entity\UserProfile::class,
635+
targetPropertyName: 'user',
636+
))
624637
->setIsNullable(true)
625638
->setIsOwning(true),
626639
];
@@ -629,76 +642,83 @@ public function getAddOneToOneRelationTests(): \Generator
629642
yield 'one_to_one_owning_self' => [
630643
'User_simple.php',
631644
'User_simple_self.php',
632-
(new RelationOneToOne())
633-
->setPropertyName('embeddedUser')
634-
->setTargetClassName('App\Entity\User')
635-
->setTargetPropertyName('user')
645+
(new RelationOneToOne(
646+
propertyName: 'embeddedUser',
647+
targetClassName: \App\Entity\User::class,
648+
targetPropertyName: 'user',
649+
))
636650
->setIsNullable(true)
637651
->setIsOwning(true),
638652
];
639653

640654
yield 'one_to_one_inverse' => [
641655
'UserProfile_simple.php',
642656
'UserProfile_simple_inverse.php',
643-
(new RelationOneToOne())
644-
->setPropertyName('user')
645-
->setTargetClassName('App\Entity\User')
646-
->setTargetPropertyName('userProfile')
657+
(new RelationOneToOne(
658+
propertyName: 'user',
659+
targetClassName: \App\Entity\User::class,
660+
targetPropertyName: 'userProfile',
661+
))
647662
->setIsNullable(true)
648663
->setIsOwning(false),
649664
];
650665

651666
yield 'one_to_one_inverse_not_nullable' => [
652667
'UserProfile_simple.php',
653668
'UserProfile_simple_inverse_not_nullable.php',
654-
(new RelationOneToOne())
655-
->setPropertyName('user')
656-
->setTargetClassName('App\Entity\User')
657-
->setTargetPropertyName('userProfile')
669+
(new RelationOneToOne(
670+
propertyName: 'user',
671+
targetClassName: \App\Entity\User::class,
672+
targetPropertyName: 'userProfile',
673+
))
658674
->setIsNullable(false)
659675
->setIsOwning(false),
660676
];
661677

662678
yield 'one_to_one_no_inverse' => [
663679
'User_simple.php',
664680
'User_simple_no_inverse.php',
665-
(new RelationOneToOne())
666-
->setPropertyName('userProfile')
667-
->setTargetClassName('App\Entity\UserProfile')
681+
(new RelationOneToOne(
682+
propertyName: 'userProfile',
683+
targetClassName: \App\Entity\UserProfile::class,
684+
mapInverseRelation: false,
685+
))
668686
->setIsNullable(true)
669-
->setIsOwning(true)
670-
->setMapInverseRelation(false),
687+
->setIsOwning(true),
671688
];
672689

673690
yield 'one_to_one_no_inverse_not_nullable' => [
674691
'User_simple.php',
675692
'User_simple_no_inverse_not_nullable.php',
676-
(new RelationOneToOne())
677-
->setPropertyName('userProfile')
678-
->setTargetClassName('App\Entity\UserProfile')
693+
(new RelationOneToOne(
694+
propertyName: 'userProfile',
695+
targetClassName: \App\Entity\UserProfile::class,
696+
mapInverseRelation: false,
697+
))
679698
->setIsNullable(false)
680-
->setIsOwning(true)
681-
->setMapInverseRelation(false),
699+
->setIsOwning(true),
682700
];
683701

684702
yield 'avoid_duplicate_use_statement' => [
685703
'User_with_use_statements.php',
686704
'User_with_use_statements_avoid_duplicate_use.php',
687-
(new RelationOneToOne())
688-
->setPropertyName('userProfile')
689-
->setTargetClassName('App\OtherEntity\UserProfile')
690-
->setTargetPropertyName('user')
705+
(new RelationOneToOne(
706+
propertyName: 'userProfile',
707+
targetClassName: \App\OtherEntity\UserProfile::class,
708+
targetPropertyName: 'user',
709+
))
691710
->setIsNullable(true)
692711
->setIsOwning(true),
693712
];
694713

695714
yield 'avoid_duplicate_use_statement_with_alias' => [
696715
'User_with_use_statements.php',
697716
'User_with_use_statements_avoid_duplicate_use_alias.php',
698-
(new RelationOneToOne())
699-
->setPropertyName('category')
700-
->setTargetClassName('App\OtherEntity\Category')
701-
->setTargetPropertyName('user')
717+
(new RelationOneToOne(
718+
propertyName: 'category',
719+
targetClassName: \App\OtherEntity\Category::class,
720+
targetPropertyName: 'user',
721+
))
702722
->setIsNullable(true)
703723
->setIsOwning(true),
704724
];

0 commit comments

Comments
 (0)