Fix: Switch order of parameters (#703)

localheinz · web-flow · commit 6c3a043c0dc6 · 2023-09-04T15:42:15.000+02:00
diff --git a/roave-bc-check.yaml b/roave-bc-check.yaml
@@ -18,3 +18,4 @@ parameters:
     - '#\[BC\] CHANGED: The parameter \$container of Faker\\Generator\#\_\_construct\(\) changed from Psr\\Container\\ContainerInterface\|null to Faker\\Container\\ContainerInterface\|null#'
     - '#\[BC\] CHANGED: The number of required arguments for Faker\\Container\\ContainerBuilder\#add\(\) increased from 1 to 2#'
     - '#\[BC\] CHANGED: The parameter \$name of Faker\\Container\\ContainerBuilder\#add\(\) changed from string\|null to a non-contravariant string#'
+    - '#\[BC\] CHANGED: The parameter \$value of Faker\\Container\\ContainerBuilder\#add\(\) changed from no type to a non-contravariant string#'
diff --git a/src/Faker/Container/ContainerBuilder.php b/src/Faker/Container/ContainerBuilder.php
@@ -29,7 +29,7 @@ final class ContainerBuilder
      *
      * @throws \InvalidArgumentException
      */
-    public function add($value, string $name): self
+    public function add(string $name, $value): self
     {
         if (!is_string($value) && !is_callable($value) && !is_object($value)) {
             throw new \InvalidArgumentException(sprintf(
@@ -71,7 +71,7 @@ public static function getDefault(): ContainerInterface
         $instance = new self();
 
         foreach (self::defaultExtensions() as $id => $definition) {
-            $instance->add($definition, $id);
+            $instance->add($id, $definition);
         }
 
         return $instance->build();
diff --git a/test/Faker/Extension/ContainerBuilderTest.php b/test/Faker/Extension/ContainerBuilderTest.php
@@ -29,7 +29,7 @@ public function testAddRejectsInvalidValue($value): void
             ContainerBuilder::class,
         ));
 
-        $containerBuilder->add($value, 'foo');
+        $containerBuilder->add('foo', $value);
     }
 
     /**
@@ -71,7 +71,7 @@ public function testBuild(): void
     {
         $builder = new ContainerBuilder();
 
-        $builder->add(File::class, 'foo');
+        $builder->add('foo', File::class);
 
         $container = $builder->build();
 
@@ -82,8 +82,8 @@ public function testBuildWithDuplicates(): void
     {
         $builder = new ContainerBuilder();
 
-        $builder->add(File::class, 'foo');
-        $builder->add(File::class, 'foo');
+        $builder->add('foo', File::class);
+        $builder->add('foo', File::class);
 
         $container = $builder->build();
 
@@ -94,7 +94,7 @@ public function testBuildWithObject(): void
     {
         $builder = new ContainerBuilder();
 
-        $builder->add(new File(), 'foo');
+        $builder->add('foo', new File());
 
         $container = $builder->build();
 
@@ -105,9 +105,9 @@ public function testBuildWithCallable(): void
     {
         $builder = new ContainerBuilder();
 
-        $builder->add(static function () {
+        $builder->add('foo', static function () {
             return new File();
-        }, 'foo');
+        });
 
         $container = $builder->build();
 
diff --git a/test/Faker/GeneratorTest.php b/test/Faker/GeneratorTest.php
@@ -135,7 +135,7 @@ public function testFormatTransfersArgumentsToFormatter(): void
     public function testFormatterCallsGenerator(): void
     {
         $builder = new ContainerBuilder();
-        $builder->add(Blood::class, BloodExtension::class);
+        $builder->add(BloodExtension::class, Blood::class);
         $faker = new Generator($builder->build());
 
         $output = $faker->format('bloodType');

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ final class ContainerBuilder`
`29`	`29`	`*`
`30`	`30`	`* @throws \InvalidArgumentException`
`31`	`31`	`*/`
`32`		`- public function add($value, string $name): self`
	`32`	`+ public function add(string $name, $value): self`
`33`	`33`	`{`
`34`	`34`	`if (!is_string($value) && !is_callable($value) && !is_object($value)) {`
`35`	`35`	`throw new \InvalidArgumentException(sprintf(`
`@@ -71,7 +71,7 @@ public static function getDefault(): ContainerInterface`
`71`	`71`	`$instance = new self();`
`72`	`72`
`73`	`73`	`foreach (self::defaultExtensions() as $id => $definition) {`
`74`		`- $instance->add($definition, $id);`
	`74`	`+ $instance->add($id, $definition);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`return $instance->build();`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public function testFormatTransfersArgumentsToFormatter(): void`
`135`	`135`	`public function testFormatterCallsGenerator(): void`
`136`	`136`	`{`
`137`	`137`	`$builder = new ContainerBuilder();`
`138`		`- $builder->add(Blood::class, BloodExtension::class);`
	`138`	`+ $builder->add(BloodExtension::class, Blood::class);`
`139`	`139`	`$faker = new Generator($builder->build());`
`140`	`140`
`141`	`141`	`$output = $faker->format('bloodType');`