Remove type checks from AndroidConfig

Either static analysis or the Firebase API will report invalid types

Author: jeromegamez

src/Firebase/Messaging/AndroidConfig.php

@@ -8,9 +8,7 @@
 use Kreait\Firebase\Exception\Messaging\InvalidArgument;
 
 use function array_filter;
-use function array_key_exists;
 use function is_int;
-use function is_string;
 use function preg_match;
 use function sprintf;
 
@@ -122,8 +120,9 @@ public static function new(): self
      */
     public static function fromArray(array $config): self
     {
-        if (array_key_exists('ttl', $config) && $config['ttl'] !== null) {
-            $config['ttl'] = self::ensureValidTtl($config['ttl']);
+        $ttl = $config['ttl'] ?? null;
+        if ($ttl !== null) {
+            $config['ttl'] = self::ensureValidTtl($ttl);
         }
 
         return new self($config);
@@ -248,22 +247,25 @@ public function jsonSerialize(): array
     }
 
     /**
-     * @param int|string $value
-     *
      * @throws InvalidArgument
-     *
      * @return non-empty-string
      */
-    private static function ensureValidTtl($value): string
+    private static function ensureValidTtl(int|string $value): string
     {
         $expectedPattern = '/^\d+s$/';
         $errorMessage = "The TTL of an AndroidConfig must be an positive integer or string matching {$expectedPattern}";
 
-        if (is_int($value) && $value >= 0) {
-            return sprintf('%ds', $value);
+        if (is_numeric($value)) {
+            $value = (int) $value;
         }
 
-        if (!is_string($value) || $value === '') {
+        if (is_int($value)) {
+            $value = sprintf('%ds', $value);
+        }
+
+        $value = trim($value);
+
+        if ($value === '') {
             throw new InvalidArgument($errorMessage);
         }
 

tests/Unit/Messaging/AndroidConfigTest.php

@@ -112,9 +112,7 @@ public static function validTtlValues(): Iterator
 
     public static function invalidTtlValues(): Iterator
     {
-        yield 'float' => [1.2];
         yield 'wrong suffix' => ['1m'];
-        yield 'not numeric' => [true];
         yield 'negative int' => [-1];
         yield 'negative string' => ['-1'];
         yield 'negative string with suffix' => ['-1s'];