fix fatal on null if orphan feature (#30)

* fix fatal on null if orphan feature * remove false values from feature array * update version number Co-authored-by: Cédric Robert <crobert@openstudio.fr>
thelia-modules · May 3, 2021 · ba2355f · ba2355f
1 parent c409beb
commit ba2355f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -20,7 +20,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>1.0.13</version>
+    <version>1.0.14</version>
     <authors>
         <author>
             <name>Vincent Lopes-Vicente</name>

diff --git a/Model/Api/Product.php b/Model/Api/Product.php
@@ -158,21 +158,27 @@ public function createFromTheliaModel($theliaModel, $locale = null)
         parent::createFromTheliaModel($theliaModel, $locale);
 
         $modelFactory = $this->modelFactory;
-        $this->features = array_map(
-            function (FeatureProduct $featureProduct) use ($modelFactory){
-                $propelFeature = $featureProduct->getFeature();
-
-                if (null !== $featureProduct->getFeatureAv()) {
-                    // Temporary set only product feature av to build good feature av list
-                    $propelFeature->addFeatureAv($featureProduct->getFeatureAv());
-                }
-
-                $feature = $modelFactory->buildModel('Feature', $propelFeature);
-
-                $propelFeature->clearFeatureAvs();
-                return $feature;
-            },
-            iterator_to_array($theliaModel->getFeatureProducts())
+        $this->features = array_filter(
+            array_map(
+                function (FeatureProduct $featureProduct) use ($modelFactory){
+                    $propelFeature = $featureProduct->getFeature();
+                    if(null === $propelFeature){
+                        return false;
+                    }
+                    if (null !== $featureProduct->getFeatureAv()) {
+                        // Temporary set only product feature av to build good feature av list
+                        $propelFeature->addFeatureAv($featureProduct->getFeatureAv());
+                    }
+                    $feature = $modelFactory->buildModel('Feature', $propelFeature);
+
+                    $propelFeature->clearFeatureAvs();
+                    return $feature;
+                },
+                iterator_to_array($theliaModel->getFeatureProducts())
+            ),
+            function($value){
+                return $value;
+            }
         );
 
         $this->categories = array_map(