Enforce consistency

rinvex · Nov 26, 2016 · 4e84496 · 4e84496
1 parent 340680e
commit 4e84496
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/Country.php b/src/Country.php
@@ -95,7 +95,7 @@ public function getOfficialName()
     /**
      * Get the given native name or fallback to first native name.
      *
-     * @param string $language
+     * @param string|null $language
      *
      * @return string|null
      */
@@ -112,7 +112,7 @@ public function getNativeName($language = null)
     /**
      * Get the given native official name or fallback to first native official name.
      *
-     * @param string $language
+     * @param string|null $language
      *
      * @return string|null
      */
@@ -189,7 +189,7 @@ public function getIsoNumeric()
     /**
      * Get the given currency or fallback to first currency.
      *
-     * @param string $currency
+     * @param string|null $currency
      *
      * @return string|null
      */
@@ -243,7 +243,7 @@ public function getAltSpellings()
     /**
      * Get the given language or fallback to first language.
      *
-     * @param string $language
+     * @param string|null $language
      *
      * @return string|null
      */
@@ -267,7 +267,7 @@ public function getLanguages()
     /**
      * Get the translation.
      *
-     * @param string $language
+     * @param string|null $language
      *
      * @return array
      */

diff --git a/src/Loader.php b/src/Loader.php
@@ -69,27 +69,28 @@ public static function countries($longlist = false, $hydrate = false)
      * @param mixed  $value
      * @param bool   $strict
      *
-     * @return static
+     * @return array
      */
     public static function where($key, $value, $strict = true)
     {
         if (! isset(self::$countries['longlist'])) {
             self::$countries['longlist'] = json_decode(self::getFile(__DIR__.'/../resources/data/longlist.json'), true);
         }
 
-        return self::filter(function ($item) use ($key, $value, $strict) {
+        return self::filter(self::$countries['longlist'], function ($item) use ($key, $value, $strict) {
             return $strict ? self::get($item, $key) === $value : self::get($item, $key) == $value;
-        }, self::$countries['longlist']);
+        });
     }
 
     /**
      * Run a filter over each of the items.
      *
+     * @param array         $items
      * @param callable|null $callback
      *
-     * @return mixed
+     * @return array
      */
-    public static function filter(callable $callback = null, $items)
+    public static function filter($items, callable $callback = null)
     {
         if ($callback) {
             $return = [];