drop support for laravel 10 and older dependencies, add return type hints

Author: opheus2

composer.json

@@ -18,12 +18,12 @@
         }
     ],
     "require": {
-        "illuminate/support": "^10.0|^11.0|^12.0"
+        "illuminate/support": "^11.0|^12.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.0|^11.0|^12.0",
-        "mockery/mockery": "^1.4|^1.5|^1.6",
-        "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0"
+        "phpunit/phpunit": "^11.0|^12.0",
+        "mockery/mockery": "^1.5|^1.6",
+        "orchestra/testbench": "^9.0|^10.0"
     },
     "autoload": {
         "psr-4": {

src/Country.php

@@ -126,7 +126,7 @@ public function toArray()
             'numericCode' => $this->getNumericCode(),
             'officialName' => $this->getOfficialName(),
             'commonName' => $this->getCommonName(),
-            'currency' => $this->getCurrency(),
+            'currency' => $this->getCurrency()->toArray(),
         ];
     }
 
@@ -211,7 +211,7 @@ public static function __callStatic($method, $parameters)
      *
      * @return array
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return $this->toArray();
     }

src/Currency.php

@@ -19,6 +19,25 @@ public function __construct(string $code, string $name, string $symbol)
         $this->symbol = $symbol;
     }
 
+    /**
+     * Create a new instance of Currency
+     *
+     * @param array $data
+     * @return void
+     */
+    public static function make(array $data)
+    {
+        if (!isset($data['code'], $data['name'], $data['symbol'])) {
+            throw new \InvalidArgumentException('The currency data is invalid.');
+        }
+
+        return new static(
+            $data['code'],
+            $data['name'],
+            $data['symbol']
+        );
+    }
+
     /**
      * Get the currency's name.
      *
@@ -49,24 +68,6 @@ public function getSymbol()
         return $this->symbol;
     }
 
-    public function __toString()
-    {
-        return $this->name;
-    }
-
-    public static function make(array $data)
-    {
-        if (!isset($data['code'], $data['name'], $data['symbol'])) {
-            throw new \InvalidArgumentException('The currency data is invalid.');
-        }
-
-        return new static(
-            $data['code'],
-            $data['name'],
-            $data['symbol']
-        );
-    }
-
     public function toArray()
     {
         return [
@@ -76,19 +77,18 @@ public function toArray()
         ];
     }
 
-    /**
-     * Get the instance as JSON.
-     *
-     * @param  int  $options
-     * @return string
-     */
     public function toJson($options = 0)
     {
         return json_encode($this->toArray(), $options);
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return $this->toArray();
     }
+
+    public function __toString()
+    {
+        return $this->name;
+    }
 }

src/Facades/Countries.php

@@ -21,7 +21,7 @@
  * @method static Array<\Orpheus\LaravelCountries\Country> getBySubregion(string $subregion)
  * @method static Array<\Orpheus\LaravelCountries\Country> getByCurrency(string $currency)
  * @method static Array<\Orpheus\LaravelCountries\Country> getAll(array $countries = [], bool $asCollection = false)
- * @method static \Orpheus\LaravelCountries\CountriesRepository getListForDropdown(string $key = 'alpha3Code', bool $official = false, string $localization = 'en')
+ * @method static \Orpheus\LaravelCountries\CountriesRepository getListForDropdown(string $key = 'cca3', bool $official = false, string $localization = 'en')
  * @method static \Orpheus\LaravelCountries\CountriesRepository getRawData()
  */
 class Countries extends Facade