Merge pull request #30 from hutnikau/fix/case_insensitive_response_pr…

…ocessing_master Do not owerwrite `$var` variable
oat-sa · Apr 8, 2016 · 2af4072 · 2af4072
2 parents 71ed15a + 50f3948
commit 2af4072
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/qtism/runtime/expressions/MapResponseProcessor.php b/src/qtism/runtime/expressions/MapResponseProcessor.php
@@ -117,13 +117,13 @@ public function process()
  for ($i = 0; $i < count($mapEntries); $i++) {
 
  $mapKey = $rawMapKey = $mapEntries[$i]->getMapKey();
-
+ $processedVal = null;
  if ($val instanceof QtiString && $mapEntries[$i]->isCaseSensitive() === false) {
- $val = mb_strtolower($val->getValue(), 'UTF-8');
+ $processedVal = mb_strtolower($val->getValue(), 'UTF-8');
  $mapKey = mb_strtolower($mapKey, 'UTF-8');
  }
 
- if (($val instanceof Comparable && $val->equals($mapKey) === true) || $val === $mapKey) {
+ if (($val instanceof Comparable && $val->equals($mapKey) === true) || $processedVal === $mapKey) {
  if (in_array($rawMapKey, $mapped, true) === false) {
  $result += $mapEntries[$i]->getMappedValue();
  $mapped[] = $rawMapKey;

diff --git a/test/qtismtest/runtime/expressions/MapResponseProcessorTest.php b/test/qtismtest/runtime/expressions/MapResponseProcessorTest.php
@@ -143,8 +143,8 @@ public function testMultipleCardinalityIdentifierToFloat() {
  <value>Choice7</value>
  </correctResponse>
  <mapping>
- <mapEntry mapKey="Choice1" mappedValue="2"/>
- <mapEntry mapKey="Choice6" mappedValue="20"/>
+ <mapEntry mapKey="Choice1" mappedValue="2" caseSensitive="false"/>
+ <mapEntry mapKey="Choice6" mappedValue="20" caseSensitive="false"/>
  <mapEntry mapKey="Choice9" mappedValue="20"/>
  <mapEntry mapKey="Choice2" mappedValue="-20"/>
  <mapEntry mapKey="Choice3" mappedValue="-20"/>