Merge remote-tracking branch 'upstream/master'

Conflicts:
	doc/html/classRedmatrix_1_1Import_1_1Import-members.html
	doc/html/classRedmatrix_1_1Import_1_1Import.js

1 files changed, 23 insertions, 0 deletions

diff --git a/library/intl/tests/DummyRepository.php b/library/intl/tests/DummyRepository.php
new file mode 100644
index 000000000..0d9ca760b
--- /dev/null
+++ b/library/intl/tests/DummyRepository.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace CommerceGuys\Intl\Tests;
+
+use CommerceGuys\Intl\LocaleResolverTrait;
+
+/**
+ * Dummy repository used for testing the LocaleResolverTrait.
+ */
+class DummyRepository
+{
+    use LocaleResolverTrait;
+
+    public function __construct()
+    {
+        $this->definitionPath = 'vfs://resources/dummy/';
+    }
+
+    public function runResolveLocale($locale, $fallbackLocale = null)
+    {
+        return $this->resolveLocale($locale, $fallbackLocale);
+    }
+}