bug #36119 [PropertyAccess] Added missing new args in PropertyAccessorBuilder (HeahDude)

fabpot · fabpot · commit 6902a56e751c · 2020-03-18T08:31:56.000+01:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [PropertyAccess] Added missing new args in `PropertyAccessorBuilder` | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | ~ | License | MIT | Doc PR | ~ Following #30704. Commits ------- e1be8cd [PropertyAccess] Added missing new args in PropertyAccessorBuilder
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\PropertyAccess;
 
 use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\PropertyInfo\PropertyReadInfoExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyWriteInfoExtractorInterface;
 
 /**
  * A configurable builder to create a PropertyAccessor.
@@ -29,6 +31,16 @@ class PropertyAccessorBuilder
      */
     private $cacheItemPool;
 
+    /**
+     * @var PropertyReadInfoExtractorInterface|null
+     */
+    private $readInfoExtractor;
+
+    /**
+     * @var PropertyWriteInfoExtractorInterface|null
+     */
+    private $writeInfoExtractor;
+
     /**
      * Enables the use of "__call" by the PropertyAccessor.
      *
@@ -157,13 +169,43 @@ public function getCacheItemPool()
         return $this->cacheItemPool;
     }
 
+    /**
+     * @return $this
+     */
+    public function setReadInfoExtractor(?PropertyReadInfoExtractorInterface $readInfoExtractor)
+    {
+        $this->readInfoExtractor = $readInfoExtractor;
+
+        return $this;
+    }
+
+    public function getReadInfoExtractor(): ?PropertyReadInfoExtractorInterface
+    {
+        return $this->readInfoExtractor;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setWriteInfoExtractor(?PropertyWriteInfoExtractorInterface $writeInfoExtractor)
+    {
+        $this->writeInfoExtractor = $writeInfoExtractor;
+
+        return $this;
+    }
+
+    public function getWriteInfoExtractor(): ?PropertyWriteInfoExtractorInterface
+    {
+        return $this->writeInfoExtractor;
+    }
+
     /**
      * Builds and returns a new PropertyAccessor object.
      *
      * @return PropertyAccessorInterface The built PropertyAccessor
      */
     public function getPropertyAccessor()
     {
-        return new PropertyAccessor($this->magicCall, $this->throwExceptionOnInvalidIndex, $this->cacheItemPool, $this->throwExceptionOnInvalidPropertyPath);
+        return new PropertyAccessor($this->magicCall, $this->throwExceptionOnInvalidIndex, $this->cacheItemPool, $this->throwExceptionOnInvalidPropertyPath, $this->readInfoExtractor, $this->writeInfoExtractor);
     }
 }
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorBuilderTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorBuilderTest.php
@@ -15,6 +15,8 @@
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\PropertyAccess\PropertyAccessorBuilder;
+use Symfony\Component\PropertyInfo\PropertyReadInfoExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyWriteInfoExtractorInterface;
 
 class PropertyAccessorBuilderTest extends TestCase
 {
@@ -63,4 +65,24 @@ public function testUseCache()
         $this->assertEquals($cacheItemPool, $this->builder->getCacheItemPool());
         $this->assertInstanceOf(PropertyAccessor::class, $this->builder->getPropertyAccessor());
     }
+
+    public function testUseReadInfoExtractor()
+    {
+        $readInfoExtractor = $this->createMock(PropertyReadInfoExtractorInterface::class);
+
+        $this->builder->setReadInfoExtractor($readInfoExtractor);
+
+        $this->assertSame($readInfoExtractor, $this->builder->getReadInfoExtractor());
+        $this->assertInstanceOf(PropertyAccessor::class, $this->builder->getPropertyAccessor());
+    }
+
+    public function testUseWriteInfoExtractor()
+    {
+        $writeInfoExtractor = $this->createMock(PropertyWriteInfoExtractorInterface::class);
+
+        $this->builder->setWriteInfoExtractor($writeInfoExtractor);
+
+        $this->assertSame($writeInfoExtractor, $this->builder->getWriteInfoExtractor());
+        $this->assertInstanceOf(PropertyAccessor::class, $this->builder->getPropertyAccessor());
+    }
 }
