Merge pull request #11 from whitecube/php8.1

Add PHP 8.1 compatibility & Fix minimum PHP version to 7.4
whitecube · Jan 17, 2022 · 0c72dd6 · 0c72dd6
2 parents ddaf693 + 9834958
commit 0c72dd6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -5,6 +5,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
+        "php": "^7.4|^8.0",
         "brick/money": "0.5.*"
     },
     "require-dev": {

diff --git a/src/Formatting/CustomFormatter.php b/src/Formatting/CustomFormatter.php
@@ -12,7 +12,7 @@ class CustomFormatter extends Formatter
     protected $name;
 
     /**
-     * The custom formatter function 
+     * The custom formatter function
      *
      * @var callable
      */
@@ -52,6 +52,10 @@ public function name(string $name)
      */
     public function is($name = null)
     {
+        if (is_null($name)) {
+            return is_null($this->name);
+        }
+
         return strtolower($name) === strtolower($this->name);
     }
 

diff --git a/src/Price.php b/src/Price.php
@@ -268,7 +268,7 @@ public function __toString()
      *
      * @return array
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         $excl = $this->exclusive();
         $incl = $this->inclusive();