From 493307ade1c76f49c17277e0e0fe18f54c59aa7d Mon Sep 17 00:00:00 2001 From: Scott Date: Wed, 6 Jun 2018 13:34:55 -0400 Subject: [PATCH 1/3] Allow random_compat v9.99.99 on PHP 7 projects. For PHP 7+ software, we have a special tag at `v9.99.99` which is essentially empty. The purpose of this tag is to allow it to be loaded by Composer for PHP 7 software, and then not create conflicting definitions for static analysis tools and/or IDEs' type hinting. See https://twitter.com/CiPHPerCoder/status/1004230888169852928 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e90db62..44c1e42 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ } }, "require": { - "paragonie/random_compat": "~2.0", + "paragonie/random_compat": ">= 2", "ext-openssl": "*", "php": ">=5.4.0" }, From f86e2b7d54b5526e3670903061e0b7cbfce8c10e Mon Sep 17 00:00:00 2001 From: Scott Date: Tue, 24 Jul 2018 09:59:11 -0400 Subject: [PATCH 2/3] RedundantConidition is just being explicit --- psalm.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/psalm.xml b/psalm.xml index 94cf182..7e4c600 100644 --- a/psalm.xml +++ b/psalm.xml @@ -7,6 +7,7 @@ + From 050bcc2ccaaf018dc9920eb769dd7bbe06dc36b8 Mon Sep 17 00:00:00 2001 From: Scott Date: Tue, 24 Jul 2018 10:18:59 -0400 Subject: [PATCH 3/3] Update Encoding.php --- src/Encoding.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Encoding.php b/src/Encoding.php index 8f933cf..30a60a8 100644 --- a/src/Encoding.php +++ b/src/Encoding.php @@ -46,6 +46,7 @@ public static function binToHex($byte_string) * @throws Ex\EnvironmentIsBrokenException * * @return string + * @psalm-suppress TypeDoesNotContainType */ public static function hexToBin($hex_string) {