Upgrade PHPStan (#216)

Author: Minishlink

composer.json

@@ -26,7 +26,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^7.0",
-    "phpstan/phpstan": "^0.9.2"
+    "phpstan/phpstan": "^0.11"
   },
   "autoload": {
     "psr-4" : {

src/Encryption.php

@@ -87,6 +87,9 @@ public static function deterministicEncrypt(string $payload, string $userPublicK
         // get local key pair
         list($localPublicKeyObject, $localPrivateKeyObject) = $localKeyObject;
         $localPublicKey = hex2bin(Utils::serializePublicKey($localPublicKeyObject));
+        if (!$localPublicKey) {
+            throw new \ErrorException('Failed to convert local public key from hexadecimal to binary');
+        }
 
         // get user public key object
         [$userPublicKeyObjectX, $userPublicKeyObjectY] = Utils::unserializePublicKey($userPublicKey);
@@ -98,6 +101,9 @@ public static function deterministicEncrypt(string $payload, string $userPublicK
         // get shared secret from user public key and local private key
         $sharedSecret = $curve->mul($userPublicKeyObject->getPoint(), $localPrivateKeyObject->getSecret())->getX();
         $sharedSecret = hex2bin(str_pad(gmp_strval($sharedSecret, 16), 64, '0', STR_PAD_LEFT));
+        if (!$sharedSecret) {
+            throw new \ErrorException('Failed to convert shared secret from hexadecimal to binary');
+        }
 
         // section 4.3
         $ikm = self::getIKM($userAuthToken, $userPublicKey, $localPublicKey, $sharedSecret, $contentEncoding);
@@ -115,6 +121,7 @@ public static function deterministicEncrypt(string $payload, string $userPublicK
 
         // encrypt
         // "The additional data passed to each invocation of AEAD_AES_128_GCM is a zero-length octet sequence."
+        $tag = '';
         $encryptedText = openssl_encrypt($payload, 'aes-128-gcm', $contentEncryptionKey, OPENSSL_RAW_DATA, $nonce, $tag);
 
         // return values in url safe base64

src/VAPID.php

@@ -60,7 +60,12 @@ public static function validate(array $vapid): array
                 gmp_init(bin2hex(Base64Url::decode($jwk->get('x'))), 16),
                 gmp_init(bin2hex(Base64Url::decode($jwk->get('y'))), 16)
             ));
-            $vapid['publicKey'] = base64_encode(hex2bin(Utils::serializePublicKey($publicKey)));
+
+            $binaryPublicKey = hex2bin(Utils::serializePublicKey($publicKey));
+            if (!$binaryPublicKey) {
+                throw new \ErrorException('Failed to convert VAPID public key from hexadecimal to binary');
+            }
+            $vapid['publicKey'] = base64_encode($binaryPublicKey);
             $vapid['privateKey'] = base64_encode(str_pad(Base64Url::decode($jwk->get('d')), 2 * self::PRIVATE_KEY_LENGTH, '0', STR_PAD_LEFT));
         }
 
@@ -122,6 +127,9 @@ public static function getVapidHeaders(string $audience, string $subject, string
             'exp' => $expiration,
             'sub' => $subject,
         ], JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK);
+        if (!$jwtPayload) {
+            throw new \ErrorException('Failed to encode JWT payload in JSON');
+        }
 
         list($x, $y) = Utils::unserializePublicKey($publicKey);
         $jwk = JWK::create([
@@ -163,16 +171,27 @@ public static function getVapidHeaders(string $audience, string $subject, string
      * DO NOT create keys at each initialization! Save those keys and reuse them.
      *
      * @return array
+     * @throws \ErrorException
      */
     public static function createVapidKeys(): array
     {
         $curve = NistCurve::curve256();
         $privateKey = $curve->createPrivateKey();
         $publicKey = $curve->createPublicKey($privateKey);
 
+        $binaryPublicKey = hex2bin(Utils::serializePublicKey($publicKey));
+        if (!$binaryPublicKey) {
+            throw new \ErrorException('Failed to convert VAPID public key from hexadecimal to binary');
+        }
+
+        $binaryPrivateKey = hex2bin(str_pad(gmp_strval($privateKey->getSecret(), 16), 2 * self::PRIVATE_KEY_LENGTH, '0', STR_PAD_LEFT));
+        if (!$binaryPrivateKey) {
+            throw new \ErrorException('Failed to convert VAPID private key from hexadecimal to binary');
+        }
+
         return [
-            'publicKey' => base64_encode(hex2bin(Utils::serializePublicKey($publicKey))),
-            'privateKey' => base64_encode(hex2bin(str_pad(gmp_strval($privateKey->getSecret(), 16), 2 * self::PRIVATE_KEY_LENGTH, '0', STR_PAD_LEFT)))
+            'publicKey' => base64_encode($binaryPublicKey),
+            'privateKey' => base64_encode($binaryPrivateKey)
         ];
     }
 }

src/WebPush.php

@@ -152,6 +152,7 @@ public function flush(?int $batchSize = null): \Generator
     {
         if (null === $this->notifications || empty($this->notifications)) {
             yield from [];
+            return;
         }
 
         if (null === $batchSize) {