[FEAT] QTI import: throw exception for sharedpassage issues in all cases

Learnosity · Aug 17, 2017 · 5a4b086 · 5a4b086
1 parent b6745df
commit 5a4b086
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Processors/QtiV2/In/SharedPassageMapper.php b/src/Processors/QtiV2/In/SharedPassageMapper.php
@@ -114,16 +114,17 @@ public function parseWithRubricBlockComponent(RubricBlock $rubricBlock)
                 $dom          = $this->getDomForXml($xml);
                 $innerContent = $this->getInnerXmlFragmentFromDom($dom);
                 $results      = $this->parseXml($dom->saveXML($innerContent));
-                if (empty($results['features'])) {
-                    throw new \Exception("Could not process <rubricBlock> passage");
-                }
             } elseif ($this->isEmptyAllowed()) {
                 $results      = $this->parseXml($xml);
             } else {
                 throw new MappingException('No content found; cannot create sharedpassage (isEmptyAllowed=false)');
             }
         }
 
+        if (empty($results['features'])) {
+            throw new MappingException("Could not process <rubricBlock> passage");
+        }
+
         return $results;
     }