paragonie · Jun 19, 2021 · Aug 8, 2021 · Aug 8, 2021 · Aug 8, 2021 · Aug 8, 2021
diff --git a/.gitattributes b/.gitattributes
@@ -4,7 +4,7 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.scrutinizer.yml export-ignore
-/.travis.yml export-ignore
+/.github export-ignore
 /build-phar.sh export-ignore
 /CHANGELOG.md export-ignore
 /RATIONALE.md export-ignore

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,95 +8,63 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: ['ubuntu-16.04']
+        operating-system: ['ubuntu-18.04']
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0']
-        phpunit-versions: ['7.5.20']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, intl
-          ini-values: post_max_size=256M, max_execution_time=180
-          tools: psalm, phpunit:${{ matrix.phpunit-versions }}
+          ini-values: error_reporting=-1, display_errors=On
+          coverage: none
 
-      - name: Install dependencies
-        run: composer self-update --1; composer install
+      - name: Use Composer 1.x
+        run: composer self-update --1
+
+      - name: Install Composer dependencies
+        uses: "ramsey/composer-install@v3"
 
       - name: PHPUnit tests
-        uses: php-actions/phpunit@v2
-        with:
-          memory_limit: 256M
+        run: vendor/bin/phpunit
 
-  moderate:
+  moderate-modern:
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
         operating-system: ['ubuntu-latest']
-        php-versions: ['7.1', '7.2', '7.3']
-        phpunit-versions: ['latest']
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+        php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: mbstring, intl, sodium
-          ini-values: post_max_size=256M, max_execution_time=180
-          tools: psalm, phpunit:${{ matrix.phpunit-versions }}
-
-      - name: Install dependencies
-        run: composer install
+    continue-on-error: ${{ matrix.php-versions == '8.4' }}
 
-      - name: Modernize dependencies
-        run: composer require --dev "phpunit/phpunit:>=4"
-
-      - name: PHPUnit tests
-        uses: php-actions/phpunit@v2
-        timeout-minutes: 30
-        with:
-          memory_limit: 256M
-
-  modern:
-    name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      matrix:
-        operating-system: ['ubuntu-latest']
-        php-versions: ['7.4', '8.0']
-        phpunit-versions: ['latest']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, intl, sodium
-          ini-values: post_max_size=256M, max_execution_time=180
-          tools: psalm, phpunit:${{ matrix.phpunit-versions }}
-
-      - name: Install dependencies
-        run: composer install
+          ini-values: error_reporting=-1, display_errors=On
+          coverage: none
 
       - name: Modernize dependencies
-        run: composer require --dev "phpunit/phpunit:>=4"
+        run: composer require --dev --no-update "phpunit/phpunit:>=4"
 
-      - name: PHPUnit tests
-        uses: php-actions/phpunit@v2
-        timeout-minutes: 30
-        with:
-          memory_limit: 256M
+      - name: Install Composer dependencies (PHP < 8.4)
+        if: ${{ matrix.php-versions != '8.4' }}
+        uses: "ramsey/composer-install@v3"
 
-      - name: Install Psalm
-        run: rm composer.lock && composer require --dev vimeo/psalm:^4
+      - name: Install Composer dependencies - ignore-platform-reqs (PHP 8.4)
+        if: ${{ matrix.php-versions == '8.4' }}
+        uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: --ignore-platform-reqs
 
-      - name: Static Analysis
-        run: vendor/bin/psalm
+      - name: PHPUnit tests
+        run: vendor/bin/phpunit
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -0,0 +1,30 @@
+name: Psalm
+
+on: [push]
+
+jobs:
+  psalm:
+    name: Psalm on PHP ${{ matrix.php-versions }}
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: ['ubuntu-latest']
+        php-versions: ['7.4']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          tools: psalm:4
+          coverage: none
+
+      - name: Install Composer dependencies
+        uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: --no-dev
+
+      - name: Static Analysis
+        run: psalm
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
     "php": ">=5.2.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.*|5.*"
+    "phpunit/phpunit": "*"
   },
   "suggest": {
     "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."

diff --git a/lib/random.php b/lib/random.php
@@ -183,7 +183,7 @@ class_exists('COM')
             try {
                 $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
                 /** @psalm-suppress TypeDoesNotContainType */
-                if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
+                if (is_callable(array($RandomCompatCOMtest, 'GetRandom'))) {
                     // See random_bytes_com_dotnet.php
                     require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_bytes_com_dotnet.php';
                 }

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="true" backupStaticAttributes="false" bootstrap="phpunit-autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" failOnRisky="true" failOnWarning="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="true" backupStaticAttributes="false" bootstrap="phpunit-autoload.php" colors="true" convertDeprecationsToExceptions="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" failOnRisky="true" failOnWarning="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <coverage processUncoveredFiles="true">
     <include>
       <directory suffix=".php">./lib</directory>

diff --git a/psalm.xml b/psalm.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <psalm
         autoloader="psalm-autoload.php"
+        errorLevel="1"
         useDocblockTypes="true"
-        totallyTyped="true"
 >
     <projectFiles>
         <directory name="lib" />

diff --git a/tests/unit/RandomBytesTest.php b/tests/unit/RandomBytesTest.php
@@ -40,7 +40,9 @@ public function testOutput()
             random_bytes(12),
             random_bytes(64),
             random_bytes(64),
-            random_bytes(1.5)
+            PHP_VERSION_ID < 80100
+                ? random_bytes(1.5)
+                : random_bytes(1)
         );
 
         $this->assertTrue(

diff --git a/tests/unit/RandomIntTest.php b/tests/unit/RandomIntTest.php
@@ -16,10 +16,14 @@ public function testOutput()
             random_int(-1000, 1000),
             random_int(~PHP_INT_MAX, PHP_INT_MAX),
             random_int("0", "1"),
-            random_int(0.11111, 0.99999),
+            PHP_VERSION_ID < 80100
+                ? random_int(0.11111, 0.99999)
+                : 0,
             random_int($half_neg_max, PHP_INT_MAX),
             random_int(0.0, 255.0),
-            random_int(-4.5, -4.5),
+            PHP_VERSION_ID < 80100
+                ? random_int(-4.5, -4.5)
+                : -4,
             random_int("1337e3","1337e3")
         );