Pass Exporter to ObjectExporter::export()

sebastianbergmann · Mar 29, 2024 · db75879 · db75879
1 parent 14a035b
commit db75879
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/Exporter.php b/src/Exporter.php
@@ -345,7 +345,7 @@ private function exportObject(object $value, RecursionContext $processed, string
         $processed->add($value);
 
         if ($this->objectExporter !== null && $this->objectExporter->handles($value)) {
-            $buffer = $this->objectExporter->export($value);
+            $buffer = $this->objectExporter->export($value, $this);
         } else {
             $buffer = $this->defaultObjectExport($value, $processed, $whitespace, $indentation);
         }

diff --git a/src/ObjectExporter.php b/src/ObjectExporter.php
@@ -13,5 +13,5 @@ interface ObjectExporter
 {
     public function handles(object $object): bool;
 
-    public function export(object $object): string;
+    public function export(object $object, Exporter $exporter): string;
 }
diff --git a/src/ObjectExporterChain.php b/src/ObjectExporterChain.php
@@ -38,11 +38,11 @@ public function handles(object $object): bool
     /**
      * @throws ObjectNotSupportedException
      */
-    public function export(object $object): string
+    public function export(object $object, Exporter $exporter): string
     {
-        foreach ($this->exporter as $exporter) {
-            if ($exporter->handles($object)) {
-                return $exporter->export($object);
+        foreach ($this->exporter as $objectExporter) {
+            if ($objectExporter->handles($object)) {
+                return $objectExporter->export($object, $exporter);
             }
         }
 

diff --git a/tests/ObjectExporterChainTest.php b/tests/ObjectExporterChainTest.php
@@ -11,10 +11,12 @@
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Small;
+use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
 #[CoversClass(ObjectExporterChain::class)]
+#[UsesClass(Exporter::class)]
 #[Small]
 final class ObjectExporterChainTest extends TestCase
 {
@@ -45,7 +47,7 @@ public function testDelegatesExportingToFirstExporterThatHandlesAnObject(): void
 
         $chain = new ObjectExporterChain([$firstExporter, $secondExporter]);
 
-        $this->assertSame('string', $chain->export(new stdClass));
+        $this->assertSame('string', $chain->export(new stdClass, new Exporter));
     }
 
     public function testCannotExportObjectWhenNoExporterHandlesIt(): void
@@ -57,6 +59,6 @@ public function testCannotExportObjectWhenNoExporterHandlesIt(): void
 
         $this->expectException(ObjectNotSupportedException::class);
 
-        $this->assertSame('string', $chain->export(new stdClass));
+        $this->assertSame('string', $chain->export(new stdClass, new Exporter));
     }
 }