Strategies

src/Hydrator/Strategy/ClosureStrategy.php

@@ -50,7 +50,7 @@ public function __construct(callable $extractionClosure = null, callable $hydrat
     /**
      * {@inheritDoc}
      */
-    public function extract($value, ExtractionContext $context = null)
+    public function extract($value, $property, ExtractionContext $context = null)
     {
         if (!$this->extractionClosure) {
             return $value;
@@ -64,7 +64,7 @@ public function extract($value, ExtractionContext $context = null)
     /**
      * {@inheritDoc}
      */
-    public function hydrate($value, HydrationContext $context = null)
+    public function hydrate($value, $property, HydrationContext $context = null)
     {
         if (!$this->hydrationClosure) {
             return $value;

src/Hydrator/Strategy/DateStrategy.php

@@ -65,7 +65,7 @@ public function getFormat()
     /**
      * {@inheritDoc}
      */
-    public function extract($value, ExtractionContext $context = null)
+    public function extract($value, $property, ExtractionContext $context = null)
     {
         if (is_int($value)) {
             $timestamp = $value;
@@ -83,7 +83,7 @@ public function extract($value, ExtractionContext $context = null)
     /**
      * {@inheritDoc}
      */
-    public function hydrate($value, HydrationContext $context = null)
+    public function hydrate($value, $property, HydrationContext $context = null)
     {
         return new DateTime($value);
     }

src/Hydrator/Strategy/HydratorStrategy.php

@@ -21,13 +21,16 @@
 use Hydrator\Context\ExtractionContext;
 use Hydrator\Context\HydrationContext;
 use Hydrator\HydratorInterface;
+use Hydrator\NamingStrategy\ProvidesNamingStrategyTrait;
 
 /**
  * This strategy allows to set another hydrator for a given strategy. This is especially
  * useful when you have embedded objects and want to hydrate/extract recursively
  */
 class HydratorStrategy implements StrategyInterface
 {
+    use ProvidesNamingStrategyTrait;
+
     /**
      * @var HydratorInterface
      */
@@ -44,10 +47,10 @@ public function __construct(HydratorInterface $hydrator)
     /**
      * {@inheritDoc}
      */
-    public function extract($value, ExtractionContext $context = null)
+    public function extract($value, $property, ExtractionContext $context = null)
     {
         if (is_object($value)) {
-            return $this->hydrator->extract($value, $context);
+            return $this->hydrator->extract($value);
         }
 
         return $value;
@@ -56,10 +59,14 @@ public function extract($value, ExtractionContext $context = null)
     /**
      * {@inheritDoc}
      */
-    public function hydrate($value, HydrationContext $context = null)
+    public function hydrate($value, $property, HydrationContext $context = null)
     {
         if (is_array($value)) {
-            return $this->hydrator->hydrate($value, $context);
+            $property = $this->namingStrategy->getNameForHydration($property, $context);
+            $method   = 'get' . $property;
+            $object = $context->object->{$method}();
+
+            return $this->hydrator->hydrate($value, $object);
         }
 
         return $value;

src/Hydrator/Strategy/StrategyInterface.php

@@ -21,18 +21,20 @@ interface StrategyInterface
     /**
      * Converts the given value so that it can be extracted by the hydrator
      *
-     * @param  mixed                  $value   The original value
+     * @param  mixed                  $value    The original value
+     * @param  string                 $property The name of the property
      * @param  ExtractionContext|null $context
      * @return mixed
      */
-    public function extract($value, ExtractionContext $context = null);
+    public function extract($value, $property, ExtractionContext $context = null);
 
     /**
      * Converts the given value so that it can be hydrated by the hydrator
      *
-     * @param  mixed                 $value   The original value
+     * @param  mixed                 $value    The original value
+     * @param  string                $property The name of the property
      * @param  HydrationContext|null $context
      * @return mixed
      */
-    public function hydrate($value, HydrationContext $context = null);
+    public function hydrate($value, $property, HydrationContext $context = null);
 }