Support PHP 8

paragonie · Nov 6, 2019 · 61502af · 61502af
1 parent 55af0dc
commit 61502af
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,18 @@
   "name": "paragonie/constant_time_encoding",
   "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
   "keywords": [
-    "base64", "encoding", "rfc4648", "base32", "base16", "hex", "bin2hex", "hex2bin", "base64_encode", "base64_decode", "base32_encode", "base32_decode"
+    "base64",
+    "encoding",
+    "rfc4648",
+    "base32",
+    "base16",
+    "hex",
+    "bin2hex",
+    "hex2bin",
+    "base64_encode",
+    "base64_decode",
+    "base32_encode",
+    "base32_decode"
   ],
   "license": "MIT",
   "type": "library",
@@ -26,11 +37,11 @@
     "source":   "https://github.com/paragonie/constant_time_encoding"
   },
   "require": {
-    "php": "^7"
+    "php": "^7|^8"
   },
   "require-dev": {
     "phpunit/phpunit": "^6|^7",
-    "vimeo/psalm": "^1|^2"
+    "vimeo/psalm": "^1|^2|^3"
   },
   "autoload": {
     "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,13 +9,7 @@
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="false"
-         syntaxCheck="true"
 >
-    <testsuites>
-        <testsuite name="Unit">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
     <testsuites>
         <testsuite name="Constant Time Encoding Test Suite">
             <directory suffix="Test.php">./tests</directory>

diff --git a/src/Hex.php b/src/Hex.php
@@ -125,7 +125,7 @@ public static function decode(string $hexString, bool $strictPadding = false): s
             }
         }
 
-        /** @var array<int, ing> $chunk */
+        /** @var array<int, int> $chunk */
         $chunk = \unpack('C*', $hexString);
         while ($hex_pos < $hex_len) {
             ++$hex_pos;