Add support for PHP 8.5

Author: heinrichschiller

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ ubuntu-latest ]
-        php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
+        php-versions: [ '8.2', '8.3', '8.4', '8.5' ]
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
 
     steps:

.scrutinizer.yml

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 odan
+Copyright (c) 2026 odan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -19,7 +19,7 @@ Note: This package does not support extracting / unpacking rar archives.
 
 ## Requirements
 
-* PHP 8.1 - 8.4
+* PHP 8.2 - 8.5
 
 > The [PECL RAR package](https://www.php.net/manual/en/book.rar.php) is **NOT** required
 

README.md

@@ -11,12 +11,12 @@
     ],
     "homepage": "https://github.com/selective-php/rar",
     "require": {
-        "php": "8.1.* || 8.2.* || 8.3.* || 8.4.*"
+        "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3",
         "phpstan/phpstan": "^1 || ^2",
-        "phpunit/phpunit": "^10",
+        "phpunit/phpunit": "^11",
         "squizlabs/php_codesniffer": "^3"
     },
     "autoload": {
@@ -34,12 +34,10 @@
     },
     "scripts": {
         "cs:check": [
-            "@putenv PHP_CS_FIXER_IGNORE_ENV=1",
-            "php-cs-fixer fix --dry-run --format=txt --verbose --diff --config=.cs.php --ansi"
+            "php-cs-fixer fix --dry-run --format=txt --verbose --diff --config=.cs.php --ansi --allow-unsupported-php-version=yes"
         ],
         "cs:fix": [
-            "@putenv PHP_CS_FIXER_IGNORE_ENV=1",
-            "php-cs-fixer fix --config=.cs.php --ansi --verbose"
+            "php-cs-fixer fix --config=.cs.php --ansi --verbose --allow-unsupported-php-version=yes"
         ],
         "sniffer:check": "phpcs --standard=phpcs.xml",
         "sniffer:fix": "phpcbf --standard=phpcs.xml",

composer.json

@@ -22,7 +22,7 @@
     </rule>
     <rule ref="Generic.Metrics.NestingLevel">
         <properties>
-            <property name="nestingLevel" value="2"/>
+            <property name="nestingLevel" value="3"/>
             <property name="absoluteNestingLevel" value="4"/>
         </properties>
     </rule>

phpcs.xml

@@ -3,7 +3,7 @@
          bootstrap="vendor/autoload.php"
          colors="true"
          backupGlobals="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
          cacheDirectory=".phpunit.cache"
          backupStaticProperties="false">
     <coverage/>

phpunit.xml

@@ -40,7 +40,9 @@ public function readInt(SplFileObject $file): int
      */
     public function readByte(SplFileObject $file): int
     {
-        return ord((string)$file->fread(1));
+        $data = (string)$file->fread(1);
+
+        return $data === '' ? 0 : ord($data);
     }
 
     public function readVint(SplFileObject $file): int

src/BinaryFileReader.php

@@ -2,6 +2,7 @@
 
 namespace Selective\Rar\Test;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Selective\Rar\RarFileReader;
 use SplFileObject;
@@ -71,12 +72,11 @@ public function testOpenFileRar5ChinaWindows(): void
     /**
      * Test.
      *
-     * @dataProvider providerTestOpenFile2
-     *
      * @param string $filename The filename
      *
      * @return void
      */
+    #[DataProvider('providerTestOpenFile2')]
     public function disabledTestOpenFile2(string $filename): void
     {
         $this->assertFileExists($filename);
@@ -183,9 +183,9 @@ public function testOpenFileRarWinRarMultiVolume0002(): void
     }
 
     /**
-     * @dataProvider providerTestOpenFileTestfile
      * @param string $filename
      */
+    #[DataProvider('providerTestOpenFileTestfile')]
     public function testOpenFileTestfile(string $filename): void
     {
         $this->assertFileExists($filename);