Merge branch '6.4' into 7.1

derrabus · derrabus · commit 637cbb1f58c0 · 2024-09-20T10:28:38.000+02:00
* 6.4:
  Make more data providers static
  fix merge
  Mutate remaining data providers to static ones
diff --git a/Tests/Normalizer/AbstractObjectNormalizerTest.php b/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -1191,7 +1191,7 @@ public function testDenormalizeBooleanTypesWithNotMatchingData(array $data, stri
         $normalizer->denormalize($data, $type);
     }
 
-    public function provideBooleanTypesData()
+    public static function provideBooleanTypesData()
     {
         return [
             [['foo' => true], FalsePropertyDummy::class],

Original file line number	Diff line number	Diff line change
`@@ -1191,7 +1191,7 @@ public function testDenormalizeBooleanTypesWithNotMatchingData(array $data, stri`
`1191`	`1191`	`$normalizer->denormalize($data, $type);`
`1192`	`1192`	`}`
`1193`	`1193`
`1194`		`- public function provideBooleanTypesData()`
	`1194`	`+ public static function provideBooleanTypesData()`
`1195`	`1195`	`{`
`1196`	`1196`	`return [`
`1197`	`1197`	`[['foo' => true], FalsePropertyDummy::class],`