Merge pull request #408 from defuse/random-compat-v9

paragonie-scott · web-flow · commit 36f2e70b2177 · 2018-07-24T11:52:33.000-04:00
Allow random_compat v9.99.99 on PHP 7 projects.
diff --git 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"
     },
diff --git a/psalm.xml b/psalm.xml
@@ -7,6 +7,7 @@
     </projectFiles>
     <issueHandlers>
         <DocblockTypeContradiction errorLevel="info" />
+        <RedundantCondition errorLevel="info" />
         <RedundantConditionGivenDocblockType errorLevel="info" />
     </issueHandlers>
 </psalm>
diff --git 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)
     {

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ public static function binToHex($byte_string)`
`46`	`46`	`* @throws Ex\EnvironmentIsBrokenException`
`47`	`47`	`*`
`48`	`48`	`* @return string`
	`49`	`+ * @psalm-suppress TypeDoesNotContainType`
`49`	`50`	`*/`
`50`	`51`	`public static function hexToBin($hex_string)`
`51`	`52`	`{`