Merge pull request #51 from swlodarski-sumoheavy/2.2.x-php-8.5

bobbrodie · web-flow · commit 3f9963353270 · 2026-02-27T20:22:26.000-05:00
[#50] Add support for PHP 8.5
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,10 +8,10 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ["8.1", "8.2", "8.3", "8.4"]
+        php-version: ["8.1", "8.2", "8.3", "8.4", "8.5"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: php-actions/composer@v6
         with:
           php_version: ${{ matrix.php-version }}
@@ -21,14 +21,14 @@ jobs:
           configuration: phpunit.xml
           php_version: ${{ matrix.php-version }}
           php_extensions: bcmath gmp xdebug
-          version: 10.5.27
+          version: 10.5.63
         env:
           XDEBUG_MODE: coverage
   phpcs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: php-actions/composer@v6
         with:
           php_version: 8.1
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Add to your composer.json file by hand.
     ...
     "require": {
         ...
-        "bitpay/key-utils": "~2.0"
+        "bitpay/key-utils": "~2.2"
     }
     ...
 }
@@ -42,7 +42,7 @@ php composer.phar update bitpay/key-utils
 ### Install using composer
 
 ```bash
-php composer.phar require bitpay/key-utils:~2.0
+php composer.phar require bitpay/key-utils:~2.2
 ```
 
 # Usage
@@ -96,4 +96,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     }
   },
   "require": {
-    "php": "^8.1 || ^8.2 || ^8.3 || ^8.4",
+    "php": "^8.1 || ^8.2 || ^8.3 || ^8.4 || ^8.5",
     "ext-bcmath": "*",
     "ext-openssl": "*",
     "ext-curl": "*",
@@ -33,4 +33,4 @@
   "suggest": {
     "ext-gmp": "GMP provides better performance than BCMath"
   }
-}
+}
diff --git a/composer.lock b/composer.lock
diff --git a/examples.php b/examples.php
@@ -76,7 +76,6 @@
 
 $result = curl_exec($curlCli);
 $resultData = json_decode($result, TRUE);
-curl_close($curlCli);
 
 if (array_key_exists('error', $resultData)) {
     echo $resultData['error'];
diff --git a/test/unit/BitPayKeyUtils/KeyHelper/KeyTest.php b/test/unit/BitPayKeyUtils/KeyHelper/KeyTest.php
@@ -89,7 +89,6 @@ public function testIsGenerated(): void
     private function setProtectedPropertyValue(&$instance, $propertyName, $propertyValue): void
     {
         $reflection = new \ReflectionProperty(get_class($instance), $propertyName);
-        $reflection->setAccessible(true);
         $reflection->setValue($instance, $propertyValue);
     }
 
@@ -107,4 +106,4 @@ public function isValid(): bool
             }
         };
     }
-}
+}
diff --git a/test/unit/BitPayKeyUtils/KeyHelper/PrivateKeyTest.php b/test/unit/BitPayKeyUtils/KeyHelper/PrivateKeyTest.php
@@ -202,8 +202,7 @@ private function accessProtected($obj, $prop)
     {
         $reflection = new \ReflectionClass($obj);
         $property = $reflection->getProperty($prop);
-        $property->setAccessible(true);
 
         return $property->getValue($obj);
     }
-}
+}
diff --git a/test/unit/BitPayKeyUtils/KeyHelper/PublicKeyTest.php b/test/unit/BitPayKeyUtils/KeyHelper/PublicKeyTest.php
@@ -161,14 +161,12 @@ private function accessProtected($obj, $prop)
     {
         $reflection = new \ReflectionClass($obj);
         $property = $reflection->getProperty($prop);
-        $property->setAccessible(true);
         return $property->getValue($obj);
     }
 
     private function setProtectedPropertyValue(&$instance, $propertyName, $propertyValue): void
     {
         $reflection = new \ReflectionProperty(get_class($instance), $propertyName);
-        $reflection->setAccessible(true);
         $reflection->setValue($instance, $propertyValue);
     }
 
diff --git a/test/unit/BitPayKeyUtils/KeyHelper/SinKeyTest.php b/test/unit/BitPayKeyUtils/KeyHelper/SinKeyTest.php
@@ -81,7 +81,6 @@ private function getAccessibleProperty(string $class, string $property): \Reflec
     {
         $reflection = new \ReflectionClass($class);
         $property = $reflection->getProperty($property);
-        $property->setAccessible(true);
 
         return $property;
     }
diff --git a/test/unit/BitPayKeyUtils/Storage/test1.txt b/test/unit/BitPayKeyUtils/Storage/test1.txt
@@ -1 +1 @@
-O:7:"KeyMock":0:{}
+O:8:"KeyMock1":0:{}
diff --git a/test/unit/BitPayKeyUtils/Storage/test11.txt b/test/unit/BitPayKeyUtils/Storage/test11.txt
@@ -1 +1 @@
-7ebba060008a3f86d972e0d679fffaec7d0e99d02fa1ed9bf330dc26befd4ff8
+94c623a8d22aa01eb1e202c4616b503247b29efb0551bb15e0f30f53fb792473
diff --git a/test/unit/BitPayKeyUtils/Util/FingerprintTest.php b/test/unit/BitPayKeyUtils/Util/FingerprintTest.php
@@ -20,7 +20,6 @@ public function testGenerateIssetFinHash(): void
         $expectedValue = 'ce9c26116feb916c356b5313226ff177bf30f819';
 
         $reflection = new \ReflectionProperty(Fingerprint::class, 'finHash');
-        $reflection->setAccessible(true);
         $reflection->setValue(null, $expectedValue);
 
         $fingerprint = new Fingerprint();
diff --git a/test/unit/BitPayKeyUtils/Util/SecureRandomTest.php b/test/unit/BitPayKeyUtils/Util/SecureRandomTest.php
@@ -24,7 +24,6 @@ public function testHasOpenSSL(): void
         $secureRandom::hasOpenSSL();
 
         $reflection = new \ReflectionProperty($secureRandom, 'hasOpenSSL');
-        $reflection->setAccessible(true);
 
         self::assertTrue($reflection->getValue());
         self::assertTrue(property_exists($secureRandom, 'hasOpenSSL'));
@@ -42,7 +41,6 @@ public function testGenerateRandomException(): void
         $this->expectException(\Exception::class);
 
         $reflection = new \ReflectionProperty(SecureRandom::class, 'hasOpenSSL');
-        $reflection->setAccessible(true);
         $reflection->setValue(null, false);
 
         $secureRandom = $this->createClassObject();

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`}`
`21`	`21`	`},`
`22`	`22`	`"require": {`
`23`		`- "php": "^8.1 \|\| ^8.2 \|\| ^8.3 \|\| ^8.4",`
	`23`	`+ "php": "^8.1 \|\| ^8.2 \|\| ^8.3 \|\| ^8.4 \|\| ^8.5",`
`24`	`24`	`"ext-bcmath": "*",`
`25`	`25`	`"ext-openssl": "*",`
`26`	`26`	`"ext-curl": "*",`
`@@ -33,4 +33,4 @@`
`33`	`33`	`"suggest": {`
`34`	`34`	`"ext-gmp": "GMP provides better performance than BCMath"`
`35`	`35`	`}`
`36`		`-}`
	`36`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ public function testIsGenerated(): void`
`89`	`89`	`private function setProtectedPropertyValue(&$instance, $propertyName, $propertyValue): void`
`90`	`90`	`{`
`91`	`91`	`$reflection = new \ReflectionProperty(get_class($instance), $propertyName);`
`92`		`- $reflection->setAccessible(true);`
`93`	`92`	`$reflection->setValue($instance, $propertyValue);`
`94`	`93`	`}`
`95`	`94`
`@@ -107,4 +106,4 @@ public function isValid(): bool`
`107`	`106`	`}`
`108`	`107`	`};`
`109`	`108`	`}`
`110`		`-}`
	`109`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -202,8 +202,7 @@ private function accessProtected($obj, $prop)`
`202`	`202`	`{`
`203`	`203`	`$reflection = new \ReflectionClass($obj);`
`204`	`204`	`$property = $reflection->getProperty($prop);`
`205`		`- $property->setAccessible(true);`
`206`	`205`
`207`	`206`	`return $property->getValue($obj);`
`208`	`207`	`}`
`209`		`-}`
	`208`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -161,14 +161,12 @@ private function accessProtected($obj, $prop)`
`161`	`161`	`{`
`162`	`162`	`$reflection = new \ReflectionClass($obj);`
`163`	`163`	`$property = $reflection->getProperty($prop);`
`164`		`- $property->setAccessible(true);`
`165`	`164`	`return $property->getValue($obj);`
`166`	`165`	`}`
`167`	`166`
`168`	`167`	`private function setProtectedPropertyValue(&$instance, $propertyName, $propertyValue): void`
`169`	`168`	`{`
`170`	`169`	`$reflection = new \ReflectionProperty(get_class($instance), $propertyName);`
`171`		`- $reflection->setAccessible(true);`
`172`	`170`	`$reflection->setValue($instance, $propertyValue);`
`173`	`171`	`}`
`174`	`172`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ private function getAccessibleProperty(string $class, string $property): \Reflec`
`81`	`81`	`{`
`82`	`82`	`$reflection = new \ReflectionClass($class);`
`83`	`83`	`$property = $reflection->getProperty($property);`
`84`		`- $property->setAccessible(true);`
`85`	`84`
`86`	`85`	`return $property;`
`87`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-O:7:"KeyMock":0:{}`
	`1`	`+O:8:"KeyMock1":0:{}`