Add constructor to inject collator

Adding the possibility for instantiating \OC\NaturalSort with an
injected collator. This makes the use of a specific collator enforcable.

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/private/naturalsort.php b/lib/private/naturalsort.php
index d511bfa3f66..57947f56afa 100644
--- a/lib/private/naturalsort.php
+++ b/lib/private/naturalsort.php
@@ -15,6 +15,19 @@ class NaturalSort {
 	private $cache = array();
 
 	/**
+	 * Instantiate a new \OC\NaturalSort instance.
+	 * @param object $injectedCollator
+	 */
+	public function __construct($injectedCollator = null) {
+		// inject an instance of \Collator('en_US') to force using the php5-intl Collator
+		// or inject an instance of \OC\NaturalSort_DefaultCollator to force using Owncloud's default collator
+		if (isset($injectedCollator)) {
+			$this->collator = $injectedCollator;
+			\OC_Log::write('core', 'forced use of '.get_class($injectedCollator), \OC_Log::DEBUG);
+		}
+	}
+
+	/**
 	 * Split the given string in chunks of numbers and strings
 	 * @param string $t string
 	 * @return array of strings and number chunks