fix merge

Minishlink · Minishlink · commit adc63d2dd092 · 2016-11-02T11:30:35.000+01:00
diff --git a/src/VAPID.php b/src/VAPID.php
@@ -39,7 +39,7 @@ public static function validate(array $vapid)
 
         $publicKey = Base64Url::decode($vapid['publicKey']);
 
-        if (Utils::safe_strlen($publicKey) !== 65) {
+        if (Utils::safeStrlen($publicKey) !== 65) {
             throw new \ErrorException('[VAPID] Public key should be 65 bytes long when decoded.');
         }
 
@@ -49,7 +49,7 @@ public static function validate(array $vapid)
 
         $privateKey = Base64Url::decode($vapid['privateKey']);
 
-        if (Utils::safe_strlen($privateKey) !== 32) {
+        if (Utils::safeStrlen($privateKey) !== 32) {
             throw new \ErrorException('[VAPID] Private key should be 32 bytes long when decoded.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static function validate(array $vapid)`
`39`	`39`
`40`	`40`	`$publicKey = Base64Url::decode($vapid['publicKey']);`
`41`	`41`
`42`		`- if (Utils::safe_strlen($publicKey) !== 65) {`
	`42`	`+ if (Utils::safeStrlen($publicKey) !== 65) {`
`43`	`43`	`throw new \ErrorException('[VAPID] Public key should be 65 bytes long when decoded.');`
`44`	`44`	`}`
`45`	`45`
`@@ -49,7 +49,7 @@ public static function validate(array $vapid)`
`49`	`49`
`50`	`50`	`$privateKey = Base64Url::decode($vapid['privateKey']);`
`51`	`51`
`52`		`- if (Utils::safe_strlen($privateKey) !== 32) {`
	`52`	`+ if (Utils::safeStrlen($privateKey) !== 32) {`
`53`	`53`	`throw new \ErrorException('[VAPID] Private key should be 32 bytes long when decoded.');`
`54`	`54`	`}`
`55`	`55`