do not instantiate an ObjectPersister if model is missing

fazland · Jan 31, 2017 · 1869c0c · 1869c0c
1 parent 9978cf8
commit 1869c0c
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/DependencyInjection/FazlandElasticaExtension.php b/DependencyInjection/FazlandElasticaExtension.php
@@ -418,6 +418,10 @@ private function loadObjectPersister(array $typeConfig, Reference $typeRef, Cont
             return $typeConfig['persister']['service'];
         }
 
+        if (!isset($typeConfig['model'])) {
+            return null;
+        }
+
         $arguments = [
             $typeRef,
             new Reference($transformerId),
@@ -457,13 +461,11 @@ private function loadObjectPersister(array $typeConfig, Reference $typeRef, Cont
      * @param string           $objectPersisterId
      * @param string           $indexName
      * @param string           $typeName
-     *
-     * @return string
      */
     private function loadTypeProvider(array $typeConfig, ContainerBuilder $container, $objectPersisterId, $indexName, $typeName)
     {
-        if (isset($typeConfig['provider']['service'])) {
-            return $typeConfig['provider']['service'];
+        if (null === $objectPersisterId || isset($typeConfig['provider']['service'])) {
+            return;
         }
 
         /* Note: provider services may conflict with "prototype.driver", if the
@@ -480,8 +482,6 @@ private function loadTypeProvider(array $typeConfig, ContainerBuilder $container
             'typeName' => $typeName,
         ]));
         $container->setDefinition($providerId, $providerDef);
-
-        return $providerId;
     }
 
     /**
@@ -492,13 +492,11 @@ private function loadTypeProvider(array $typeConfig, ContainerBuilder $container
      * @param string           $objectPersisterId
      * @param string           $indexName
      * @param string           $typeName
-     *
-     * @return string
      */
     private function loadTypeListener(array $typeConfig, ContainerBuilder $container, $objectPersisterId, $indexName, $typeName)
     {
-        if (isset($typeConfig['listener']['service'])) {
-            return $typeConfig['listener']['service'];
+        if (null === $objectPersisterId || isset($typeConfig['listener']['service'])) {
+            return;
         }
 
         /* Note: listener services may conflict with "prototype.driver", if the
@@ -538,8 +536,6 @@ private function loadTypeListener(array $typeConfig, ContainerBuilder $container
         }
 
         $container->setDefinition($listenerId, $listenerDef);
-
-        return $listenerId;
     }
 
     /**