diff options
author | Remi Collet <fedora@famillecollet.com> | 2014-11-10 09:28:18 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2014-11-10 09:28:18 +0100 |
commit | e582d768cdc8b70d2ad88e8eb1c5e37353f1f208 (patch) | |
tree | 80c20c32834bf3540e7d8eafabe0201087e0c4ae /Horde_Test-upstream.patch | |
parent | f8d6ceddd2812b6ae16f1533353060527ba54695 (diff) |
php-horde-Horde-Test: add upstream patch to fix test failure in turba and kronolith, thanks to Koschei
Diffstat (limited to 'Horde_Test-upstream.patch')
-rw-r--r-- | Horde_Test-upstream.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/Horde_Test-upstream.patch b/Horde_Test-upstream.patch new file mode 100644 index 0000000..4603987 --- /dev/null +++ b/Horde_Test-upstream.patch @@ -0,0 +1,36 @@ +From af8a2dbe5decff46a19ae0e5a7ff5d3efff1dcb1 Mon Sep 17 00:00:00 2001 +From: Jan Schneider <jan@horde.org> +Date: Mon, 10 Nov 2014 09:07:18 +0100 +Subject: [PATCH] [jan] Add convertUsername() to Horde_Test_Stub_Registry. + +--- + framework/Test/lib/Horde/Test/Stub/Registry.php | 15 +++++++++++++++ + framework/Test/package.xml | 4 ++-- + 2 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/framework/Test/lib/Horde/Test/Stub/Registry.php b/framework/Test/lib/Horde/Test/Stub/Registry.php +index 6a71e14..e76c262 100644 +--- a/framework/Test/lib/Horde/Test/Stub/Registry.php ++++ b/framework/Test/lib/Horde/Test/Stub/Registry.php +@@ -58,6 +58,21 @@ public function __construct($user, $app) + } + + /** ++ * Converts an authentication username to a unique Horde username. ++ * ++ * @param string $userId The username to convert. ++ * @param boolean $toHorde If true, convert to a Horde username. If ++ * false, convert to the auth username. ++ * ++ * @return string The converted username. ++ * @throws Horde_Exception ++ */ ++ public function convertUsername($userId, $toHorde) ++ { ++ return $userId; ++ } ++ ++ /** + * Returns the currently logged in user, if there is one. + * + * @param string $format The return format, defaults to the unique Horde |