Add check for blank strings

Author: odan

src/ArrayReader.php

@@ -40,7 +40,7 @@ public function getInt(string $key, int $default = null): int
     {
         $value = $this->find($key, $default);
 
-        if ($value === null) {
+        if ($this->isNullOrBlank($value)) {
             throw new InvalidArgumentException(sprintf('No value found for key "%s"', $key));
         }
 
@@ -57,13 +57,13 @@ public function getInt(string $key, int $default = null): int
      */
     public function findInt(string $key, int $default = null)
     {
-        $result = $this->find($key, $default);
+        $value = $this->find($key, $default);
 
-        if ($result === null) {
+        if ($this->isNullOrBlank($value)) {
             return null;
         }
 
-        return (int)$result;
+        return (int)$value;
     }
 
     /**
@@ -120,7 +120,7 @@ public function getArray(string $key, array $default = null): array
     {
         $value = $this->find($key, $default);
 
-        if ($value === null) {
+        if ($this->isNullOrBlank($value)) {
             throw new InvalidArgumentException(sprintf('No value found for key "%s"', $key));
         }
 
@@ -139,7 +139,7 @@ public function findArray(string $key, array $default = null)
     {
         $value = $this->find($key, $default);
 
-        if ($value === null) {
+        if ($this->isNullOrBlank($value)) {
             return null;
         }
 
@@ -160,7 +160,7 @@ public function getFloat(string $key, float $default = null): float
     {
         $value = $this->find($key, $default);
 
-        if ($value === null) {
+        if ($this->isNullOrBlank($value)) {
             throw new InvalidArgumentException(sprintf('No value found for key "%s"', $key));
         }
 
@@ -179,7 +179,7 @@ public function findFloat(string $key, float $default = null)
     {
         $value = $this->find($key, $default);
 
-        if ($value === null) {
+        if ($this->isNullOrBlank($value)) {
             return null;
         }
 
@@ -200,7 +200,7 @@ public function getBool(string $key, bool $default = null): bool
     {
         $value = $this->find($key, $default);
 
-        if ($value === null) {
+        if ($this->isNullOrBlank($value)) {
             throw new InvalidArgumentException(sprintf('No value found for key "%s"', $key));
         }
 
@@ -219,7 +219,7 @@ public function findBool(string $key, bool $default = null)
     {
         $value = $this->find($key, $default);
 
-        if ($value === null) {
+        if ($this->isNullOrBlank($value)) {
             return null;
         }
 
@@ -240,7 +240,7 @@ public function getChronos(string $key, Chronos $default = null): Chronos
     {
         $value = $this->find($key, $default);
 
-        if ($value === null) {
+        if ($this->isNullOrBlank($value)) {
             throw new InvalidArgumentException(sprintf('No value found for key "%s"', $key));
         }
 
@@ -265,7 +265,11 @@ public function findChronos(string $key, Chronos $default = null)
     {
         $value = $this->find($key, $default);
 
-        if ($value === null || $value instanceof Chronos) {
+        if ($this->isNullOrBlank($value)) {
+            return null;
+        }
+
+        if ($value instanceof Chronos) {
             return $value;
         }
 
@@ -344,4 +348,16 @@ public function isEmpty(string $path): bool
     {
         return empty($this->find($path));
     }
+
+    /**
+     * Is null or blank.
+     *
+     * @param mixed $value The value
+     *
+     * @return bool The status
+     */
+    private function isNullOrBlank($value): bool
+    {
+        return $value === null || $value === '';
+    }
 }