Merge branch '4.6RC'4.6

1 files changed, 12 insertions, 16 deletions

diff --git a/vendor/commerceguys/intl/src/Language/LanguageRepositoryInterface.php b/vendor/commerceguys/intl/src/Language/LanguageRepositoryInterface.php
index dd14250e0..12480fc1b 100644
--- a/vendor/commerceguys/intl/src/Language/LanguageRepositoryInterface.php
+++ b/vendor/commerceguys/intl/src/Language/LanguageRepositoryInterface.php
@@ -8,34 +8,30 @@ namespace CommerceGuys\Intl\Language;
 interface LanguageRepositoryInterface
 {
     /**
-     * Returns a language instance matching the provided language code.
+     * Gets a language matching the provided language code.
      *
-     * @param string $languageCode   The language code.
-     * @param string $locale         The locale (i.e. fr-FR).
-     * @param string $fallbackLocale A fallback locale (i.e "en").
+     * @param string $languageCode The language code.
+     * @param string $locale       The locale (i.e. fr-FR).
      *
-     * @return LanguageInterface
+     * @return Language
      */
-    public function get($languageCode, $locale = null, $fallbackLocale = null);
+    public function get($languageCode, $locale = null);
 
     /**
-     * Returns all language instances.
+     * Gets all languages.
      *
-     * @param string $locale         The locale (i.e. fr-FR).
-     * @param string $fallbackLocale A fallback locale (i.e "en").
+     * @param string $locale The locale (i.e. fr-FR).
      *
-     * @return array An array of languages implementing the LanguageInterface,
-     *               keyed by language code.
+     * @return Language[] An array of languages, keyed by language code.
      */
-    public function getAll($locale = null, $fallbackLocale = null);
+    public function getAll($locale = null);
 
     /**
-     * Returns a list of languages.
+     * Gets a list of languages.
      *
-     * @param string $locale         The locale (i.e. fr-FR).
-     * @param string $fallbackLocale A fallback locale (i.e "en").
+     * @param string $locale The locale (i.e. fr-FR).
      *
      * @return array An array of language names, keyed by language code.
      */
-    public function getList($locale = null, $fallbackLocale = null);
+    public function getList($locale = null);
 }