Restore SimpleSAML_XHTML_Template::getLanguageCookie() and setLanguageCookie()...

Restore SimpleSAML_XHTML_Template::getLanguageCookie() and setLanguageCookie() temporarily, as wrappers over the new methods in SimpleSAML\Locale\Language.

lib/SimpleSAML/XHTML/Template.php

@@ -50,6 +50,8 @@ class SimpleSAML_XHTML_Template
 
 
     /**
+     * Temporary wrapper for SimpleSAML\Locale\Translate::getPreferredTranslation().
+     *
      * @deprecated This method will be removed in SSP 2.0. Please use
      * SimpleSAML\Locale\Translate::getPreferredTranslation() instead.
      */
@@ -96,25 +98,6 @@ class SimpleSAML_XHTML_Template
     }
 
 
-    /**
-     * Merge two translation arrays.
-     *
-     * @param array $def The array holding string definitions.
-     * @param array $lang The array holding translations for every string.
-     * @return array The recursive merge of both arrays.
-     * @deprecated This method will be removed in SimpleSAMLphp 2.0. Please use array_merge_recursive() instead.
-     */
-    public static function lang_merge($def, $lang)
-    {
-        foreach ($def as $key => $value) {
-            if (array_key_exists($key, $lang)) {
-                $def[$key] = array_merge($value, $lang[$key]);
-            }
-        }
-        return $def;
-    }
-
-
     /**
      * Find template path.
      *
@@ -195,4 +178,45 @@ class SimpleSAML_XHTML_Template
 
         throw new Exception($error);
     }
+
+
+    /**
+     * Merge two translation arrays.
+     *
+     * @param array $def The array holding string definitions.
+     * @param array $lang The array holding translations for every string.
+     * @return array The recursive merge of both arrays.
+     * @deprecated This method will be removed in SimpleSAMLphp 2.0. Please use array_merge_recursive() instead.
+     */
+    public static function lang_merge($def, $lang)
+    {
+        foreach ($def as $key => $value) {
+            if (array_key_exists($key, $lang)) {
+                $def[$key] = array_merge($value, $lang[$key]);
+            }
+        }
+        return $def;
+    }
+
+
+    /**
+     * @return null|string
+     * @deprecated This method will be removed in SSP 2.0. Please use \SimpleSAML\Locale\Language::getLanguageCookie()
+     * instead.
+     */
+    public static function getLanguageCookie()
+    {
+        return \SimpleSAML\Locale\Language::getLanguageCookie();
+    }
+
+
+    /**
+     * @param $language
+     * @deprecated This method will be removed in SSP 2.0. Please use \SimpleSAML\Locale\Language::setLanguageCookie()
+     * instead.
+     */
+    public static function setLanguageCookie($language)
+    {
+        \SimpleSAML\Locale\Language::setLanguageCookie($language);
+    }
 }