mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 00:12:42 +02:00
Code Issues Projects Releases Wiki Activity

MDL-70970 quizaccess_seb: consistent property array sorting by key.

Browse Source 
In PHP8.0 using `ksort` was producing incorrect results by sorting
keys differing only in case in the wrong order. This change makes
sorting consistent between PHP versions.

Co-Authored-By: Tim Hunt <T.J.Hunt@open.ac.uk>
This commit is contained in:
Paul Holden 2021-04-20 12:06:03 +01:00
parent 0fd37bf5d8
commit 6c159262f0
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mod/quiz/accessrule/seb/classes/property_list.php
View File

@ -34,9 +34,9 @@ use CFPropertyList\CFNumber;
use CFPropertyList\CFPropertyList;
use CFPropertyList\CFString;
use CFPropertyList\CFType;
use \Collator;
use \DateTime;
defined('MOODLE_INTERNAL') || die();
/**
* Wrapper for CFPropertyList to handle low level iteration.
@ -322,6 +322,8 @@ class property_list {
/**
* Recursively sort array alphabetically by key.
*
* @link https://safeexambrowser.org/developer/seb-config-key.html
*
* @param array $array Top level array to process.
* @return array Processed array.
*/
@ -331,10 +333,23 @@ class property_list {
$array[$key] = $this->array_sort($array[$key]);
}
}
// Sort assoc array. From SEB docs - "Use non-localized (culture invariant), non-ASCII value based case
// insensitive ordering."
// Sort assoc array. From SEB docs:
//
// All <dict> elements from the plist XML must be ordered (alphabetically sorted) by their key names. Use
// a recursive method to apply ordering also to nested dictionaries contained in the root-level dictionary
// and in arrays. Use non-localized (culture invariant), non-ASCII value based case insensitive ordering.
// For example the key <key>allowWlan</key> comes before <key>allowWLAN</key>. Cocoa/Obj-C and .NET/C#
// usually use this case insensitive ordering as default, but PHP for example doesn't.
if ($this->is_associative_array($array)) {
ksort($array, SORT_STRING | SORT_FLAG_CASE);
// Note this is a pragmatic solution as none of the native PHP *sort method appear to sort strings that
// differ only in case (e.g. ["allowWLAN", "allowWlan"] is expected to have the lower version first).
$keys = array_keys($array);
(new Collator('root'))->asort($keys); // Use Unicode Collation Algorithm (UCA).
$original = $array;
$array = [];
foreach ($keys as $key) {
$array[$key] = $original[$key];
}
}
return $array;