1313use Orisai \ObjectMapper \Printers \TypeToStringConverter ;
1414use Orisai \ObjectMapper \Processing \Options ;
1515use Orisai \ObjectMapper \Processing \RequiredFields ;
16+ use ReflectionProperty ;
1617use stdClass ;
1718use Tests \Orisai \ObjectMapper \Doubles \AfterClassCallbackCurrentTypeInvalidDataVO ;
1819use Tests \Orisai \ObjectMapper \Doubles \AfterClassCallbackNewTypeInvalidDataVO ;
@@ -759,9 +760,9 @@ public function testRequiredNonDefaultFields(): void
759760 'required ' => null ,
760761 ], PropertiesInitVO::class, $ options );
761762
762- self ::assertTrue ($ vo ->isInitialized ('required ' ));
763- self ::assertTrue ($ vo ->isInitialized ('optional ' ));
764- self ::assertTrue ($ vo ->isInitialized ('structure ' ));
763+ self ::assertTrue ($ this ->isInitialized ($ vo , 'required ' ));
764+ self ::assertTrue ($ this ->isInitialized ($ vo , 'optional ' ));
765+ self ::assertTrue ($ this ->isInitialized ($ vo , 'structure ' ));
765766
766767 self ::assertNull ($ vo ->required );
767768 self ::assertNull ($ vo ->optional );
@@ -779,9 +780,9 @@ public function testRequireAllFields(): void
779780 'structure ' => [],
780781 ], PropertiesInitVO::class, $ options );
781782
782- self ::assertTrue ($ vo ->isInitialized ('required ' ));
783- self ::assertTrue ($ vo ->isInitialized ('optional ' ));
784- self ::assertTrue ($ vo ->isInitialized ('structure ' ));
783+ self ::assertTrue ($ this ->isInitialized ($ vo , 'required ' ));
784+ self ::assertTrue ($ this ->isInitialized ($ vo , 'optional ' ));
785+ self ::assertTrue ($ this ->isInitialized ($ vo , 'structure ' ));
785786
786787 self ::assertNull ($ vo ->required );
787788 self ::assertNull ($ vo ->optional );
@@ -824,19 +825,19 @@ public function testRequireNoneFields(): void
824825
825826 $ vo = $ this ->processor ->process ([], PropertiesInitVO::class, $ options );
826827
827- self ::assertFalse ($ vo ->isInitialized ('required ' ));
828- self ::assertFalse ($ vo ->isInitialized ('optional ' ));
829- self ::assertFalse ($ vo ->isInitialized ('structure ' ));
828+ self ::assertFalse ($ this ->isInitialized ($ vo , 'required ' ));
829+ self ::assertFalse ($ this ->isInitialized ($ vo , 'optional ' ));
830+ self ::assertFalse ($ this ->isInitialized ($ vo , 'structure ' ));
830831
831832 $ vo = $ this ->processor ->process ([
832833 'required ' => null ,
833834 'optional ' => null ,
834835 'structure ' => [],
835836 ], PropertiesInitVO::class, $ options );
836837
837- self ::assertTrue ($ vo ->isInitialized ('required ' ));
838- self ::assertTrue ($ vo ->isInitialized ('optional ' ));
839- self ::assertTrue ($ vo ->isInitialized ('structure ' ));
838+ self ::assertTrue ($ this ->isInitialized ($ vo , 'required ' ));
839+ self ::assertTrue ($ this ->isInitialized ($ vo , 'optional ' ));
840+ self ::assertTrue ($ this ->isInitialized ($ vo , 'structure ' ));
840841
841842 self ::assertNull ($ vo ->required );
842843 self ::assertNull ($ vo ->optional );
@@ -869,8 +870,8 @@ public function testSkipped(): void
869870
870871 self ::assertSame ('required ' , $ vo ->required );
871872 self ::assertSame ('optional ' , $ vo ->optional );
872- self ::assertFalse ($ vo ->isInitialized ('requiredSkipped ' ));
873- self ::assertFalse ($ vo ->isInitialized ('optionalSkipped ' ));
873+ self ::assertFalse ($ this ->isInitialized ($ vo , 'requiredSkipped ' ));
874+ self ::assertFalse ($ this ->isInitialized ($ vo , 'optionalSkipped ' ));
874875
875876 $ this ->processor ->processSkippedProperties ([
876877 'requiredSkipped ' ,
@@ -999,4 +1000,9 @@ public function testAttributes(): void
9991000 self ::assertSame ('foo ' , $ vo ->string );
10001001 }
10011002
1003+ private function isInitialized (MappedObject $ object , string $ property ): bool
1004+ {
1005+ return (new ReflectionProperty ($ object , $ property ))->isInitialized ($ object );
1006+ }
1007+
10021008}
0 commit comments