Simplified HydratorFactory get

TomHAnderson · Dec 13, 2023 · 0a5e7fd · 0a5e7fd
1 parent c12b5d1
commit 0a5e7fd
Showing 1 changed file with 17 additions and 22 deletions.
diff --git a/src/Hydrator/HydratorFactory.php b/src/Hydrator/HydratorFactory.php
@@ -14,7 +14,6 @@
 use Laminas\Hydrator\Filter;
 use Laminas\Hydrator\NamingStrategy\NamingStrategyEnabledInterface;
 use Laminas\Hydrator\NamingStrategy\NamingStrategyInterface;
-use Laminas\Hydrator\Strategy\StrategyEnabledInterface;
 use Laminas\Hydrator\Strategy\StrategyInterface;
 
 use function assert;
@@ -52,30 +51,26 @@ public function get(string $id): mixed
         $hydrator = new DoctrineObject($this->entityManager, $config['byValue']);
 
         // Create field strategy and assign to hydrator
-        if ($hydrator instanceof StrategyEnabledInterface) {
-            foreach ($config['fields'] as $fieldName => $fieldMetadata) {
-                assert(
-                    in_array(StrategyInterface::class, class_implements($fieldMetadata['hydratorStrategy'])),
-                    'Strategy must implement ' . StrategyInterface::class,
-                );
-
-                $hydrator->addStrategy($fieldName, $this->get($fieldMetadata['hydratorStrategy']));
-            }
+        foreach ($config['fields'] as $fieldName => $fieldMetadata) {
+            assert(
+                in_array(StrategyInterface::class, class_implements($fieldMetadata['hydratorStrategy'])),
+                'Strategy must implement ' . StrategyInterface::class,
+            );
+
+            $hydrator->addStrategy($fieldName, $this->get($fieldMetadata['hydratorStrategy']));
         }
 
         // Create filters and assign to hydrator
-        if ($hydrator instanceof Filter\FilterEnabledInterface) {
-            foreach ($config['hydratorFilters'] as $name => $filterConfig) {
-                // Default filters to AND
-                $condition   = $filterConfig['condition'] ?? Filter\FilterComposite::CONDITION_AND;
-                $filterClass = $filterConfig['filter'];
-                assert(
-                    in_array(Filter\FilterInterface::class, class_implements($filterClass)),
-                    'Filter must implement ' . StrategyInterface::class,
-                );
-
-                $hydrator->addFilter($name, $this->get($filterClass), $condition);
-            }
+        foreach ($config['hydratorFilters'] as $name => $filterConfig) {
+            // Default filters to AND
+            $condition   = $filterConfig['condition'] ?? Filter\FilterComposite::CONDITION_AND;
+            $filterClass = $filterConfig['filter'];
+            assert(
+                in_array(Filter\FilterInterface::class, class_implements($filterClass)),
+                'Filter must implement ' . StrategyInterface::class,
+            );
+
+            $hydrator->addFilter($name, $this->get($filterClass), $condition);
         }
 
         // Create naming strategy and assign to hydrator