Add support for PHP 8.5

Author: heinrichschiller

.cs.php

@@ -19,7 +19,7 @@
             'array_syntax' => ['syntax' => 'short'],
             'cast_spaces' => ['space' => 'none'],
             'concat_space' => ['spacing' => 'one'],
-            'compact_nullable_typehint' => true,
+            'compact_nullable_type_declaration' => true,
             'declare_equal_normalize' => ['space' => 'single'],
             'general_phpdoc_annotation_remove' => [
                 'annotations' => [
@@ -36,7 +36,11 @@
             'phpdoc_order' => true, // psr-5
             'phpdoc_no_useless_inheritdoc' => false,
             'protected_to_private' => false,
-            'yoda_style' => false,
+            'yoda_style' => [
+                'equal' => false,
+                'identical' => false,
+                'less_and_greater' => false
+            ],
             'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
             'ordered_imports' => [
                 'sort_algorithm' => 'alpha',

.github/workflows/build.yml

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

LICENSE

@@ -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

README.md

@@ -35,7 +35,7 @@ Audio format detection library for PHP.
 
 ## Requirements
 
-* PHP 8.1+
+* PHP 8.1 - 8.5
 
 ## Installation
 

composer.json

@@ -10,13 +10,13 @@
     ],
     "homepage": "https://github.com/selective-php/audio-type",
     "require": {
-        "php": "^7.3 || ^8.0"
+        "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3",
-        "phpstan/phpstan": "^1",
-        "phpunit/phpunit": "^10",
-        "squizlabs/php_codesniffer": "^3"
+        "phpstan/phpstan": "^2",
+        "phpunit/phpunit": "^11",
+        "squizlabs/php_codesniffer": "^4"
     },
     "autoload": {
         "psr-4": {
@@ -33,23 +33,24 @@
     },
     "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",
         "stan": "phpstan analyse -c phpstan.neon --no-progress --ansi",
-        "test": "phpunit --configuration phpunit.xml --do-not-cache-result --colors=always",
+        "test": "phpunit --configuration phpunit.xml --do-not-cache-result --colors=always --display-warnings --display-deprecations",
         "test:all": [
             "@cs:check",
             "@sniffer:check",
             "@stan",
             "@test"
         ],
-        "test:coverage": "php -d xdebug.mode=coverage -r \"require 'vendor/bin/phpunit';\" -- --configuration phpunit.xml --do-not-cache-result --colors=always --coverage-clover build/logs/clover.xml --coverage-html build/coverage"
+        "test:coverage": [
+            "@putenv XDEBUG_MODE=coverage",
+            "phpunit --configuration phpunit.xml --do-not-cache-result --colors=always --display-warnings --display-deprecations --coverage-clover build/coverage/clover.xml --coverage-html build/coverage --coverage-text"
+        ]
     }
 }

phpunit.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true"
-         backupGlobals="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
+         backupGlobals="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
          cacheDirectory=".phpunit.cache" backupStaticProperties="false">
     <coverage/>
     <testsuites>

src/Detector/FlacDetector.php

@@ -24,7 +24,7 @@ public function detect(SplFileObject $file): ?AudioType
         // Signature bytes
         $signature = (string)$file->fread(4);
 
-        return 'fLaC' === $signature ? new AudioType(
+        return $signature === 'fLaC' ? new AudioType(
             AudioFormat::FLAC,
             AudioMimeType::AUDIO_FLAC
         ) : null;

tests/AudioTypeDetectorTest.php

@@ -2,6 +2,7 @@
 
 namespace Selective\AudioType\Test;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Selective\AudioType\AudioFormat;
 use Selective\AudioType\AudioMimeType;
@@ -34,14 +35,13 @@ private function createDetector(): AudioTypeDetector
     /**
      * Test.
      *
-     * @dataProvider providerGetAudioTypeFromFile
-     *
      * @param string $file The file
      * @param string $format The expected format
      * @param string $mime The expected mime type
      *
      * @return void
      */
+    #[DataProvider('providerGetAudioTypeFromFile')]
     public function testGetAudioTypeFromFile(string $file, string $format, string $mime): void
     {
         $this->assertFileExists($file);