feat: Require PHP >= 8.2

Author: rybakit

.gitattributes

@@ -3,7 +3,7 @@ examples export-ignore
 tests export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-.php_cs.dist export-ignore
+.php-cs-fixer.dist.php export-ignore
 dockerfile.sh export-ignore
 phpunit.xml.dist export-ignore
 psalm.xml export-ignore

.github/workflows/qa.yml

@@ -11,17 +11,10 @@ jobs:
       matrix:
         operating-system: [ubuntu-latest]
         env:
-          - PHP_IMAGE: php:7.3-cli
-
-          - PHP_IMAGE: php:7.4-cli
-            COVERAGE_FILE: coverage.clover
-
-          - PHP_IMAGE: php:8.0-cli
-            QA: 1
-
-          - PHP_IMAGE: php:8.1-cli
           - PHP_IMAGE: php:8.2-cli
+            COVERAGE_FILE: coverage.clover
           - PHP_IMAGE: php:8.3-cli
+            QA: 1
           - PHP_IMAGE: php:8.4-cli
           - PHP_IMAGE: php:8.5-cli
 

.php_cs.dist .php-cs-fixer.dist.php.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -3,22 +3,35 @@
 namespace MessagePack;
 
 use PhpCsFixer\Config;
+use PhpCsFixer\Fixer\ConfigurableFixerInterface;
 use PhpCsFixer\Fixer\ConstantNotation\NativeConstantInvocationFixer;
-use PhpCsFixer\Fixer\FixerInterface;
 use PhpCsFixer\Fixer\FunctionNotation\NativeFunctionInvocationFixer;
+use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
+use PhpCsFixer\FixerDefinition\FixerDefinition;
+use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
 use PhpCsFixer\Tokenizer\Tokens;
 
-final class FilterableFixer implements FixerInterface
+final class FilterableFixer implements ConfigurableFixerInterface
 {
-    private $fixer;
-    private $pathRegex;
+    private ConfigurableFixerInterface $fixer;
+    private string $pathRegex;
 
-    public function __construct(FixerInterface $fixer, string $pathRegex)
+    public function __construct(ConfigurableFixerInterface $fixer, string $pathRegex)
     {
         $this->fixer = $fixer;
         $this->pathRegex = $pathRegex;
     }
 
+    public function configure(array $configuration): void
+    {
+        $this->fixer->configure($configuration);
+    }
+
+    public function getConfigurationDefinition(): FixerConfigurationResolver
+    {
+        return $this->fixer->getConfigurationDefinition();
+    }
+
     public function isCandidate(Tokens $tokens) : bool
     {
         return $this->fixer->isCandidate($tokens);
@@ -52,7 +65,12 @@ public function supports(\SplFileInfo $file) : bool
 
         return $this->fixer->supports($file);
     }
-};
+
+    public function getDefinition() : FixerDefinitionInterface
+    {
+        return $this->fixer->getDefinition();
+    }
+}
 
 $header = <<<EOF
 This file is part of the rybakit/msgpack.php package.
@@ -63,7 +81,7 @@ public function supports(\SplFileInfo $file) : bool
 file that was distributed with this source code.
 EOF;
 
-return Config::create()
+return (new Config())
     ->setUsingCache(false)
     ->setRiskyAllowed(true)
     ->registerCustomFixers([
@@ -75,13 +93,17 @@ public function supports(\SplFileInfo $file) : bool
         '@Symfony:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'binary_operator_spaces' => ['operators' => ['=' => null, '=>' => null]],
-        'is_null' => false, // https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4015
+        'fully_qualified_strict_types' => false,
+        'integer_literal_case' => false,
+        'is_null' => false,
         'native_constant_invocation' => false,
         'native_function_invocation' => false,
-        'FilterableFixer/native_constant_invocation' => true,
-        'FilterableFixer/native_function_invocation' => true,
+        'FilterableFixer/native_constant_invocation' => ['strict' => false],
+        'FilterableFixer/native_function_invocation' => ['strict' => false],
         'no_useless_else' => true,
         'no_useless_return' => true,
+        'no_useless_concat_operator' => false,
+        'no_superfluous_phpdoc_tags' => false,
         'ordered_imports' => [
             'sort_algorithm' => 'alpha',
             'imports_order' => ['class', 'function', 'const'],
@@ -90,6 +112,7 @@ public function supports(\SplFileInfo $file) : bool
         'phpdoc_order' => true,
         'phpdoc_to_comment' => false,
         'return_type_declaration' => ['space_before' => 'one'],
+        'statement_indentation' => false,
         'strict_comparison' => true,
         'header_comment' => [
             'comment_type' => 'PHPDoc',

LICENSE

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

composer.json

@@ -11,13 +11,14 @@
         }
     ],
     "require": {
-        "php": "^7.1.1|^8"
+        "php": "^8.2"
     },
     "require-dev": {
+        "ext-decimal": "*",
         "ext-gmp": "*",
-        "friendsofphp/php-cs-fixer": "^2.14",
-        "phpunit/phpunit": "^7.1|^8|^9",
-        "vimeo/psalm": "^3.9|^4"
+        "friendsofphp/php-cs-fixer": "^3",
+        "phpunit/phpunit": "^11",
+        "vimeo/psalm": "^5 || ^6"
     },
     "suggest": {
         "ext-decimal": "For converting overflowed integers to Decimal objects",

examples/MessagePack/DateTimeExtension.php

@@ -15,7 +15,7 @@
 use MessagePack\Extension;
 use MessagePack\Packer;
 
-class DateTimeExtension implements Extension
+final class DateTimeExtension implements Extension
 {
     private $type;
 
@@ -24,11 +24,16 @@ public function __construct(int $type)
         $this->type = $type;
     }
 
+    #[\Override]
     public function getType() : int
     {
         return $this->type;
     }
 
+    /**
+     * @param mixed $value
+     */
+    #[\Override]
     public function pack(Packer $packer, $value) : ?string
     {
         if (!$value instanceof \DateTimeInterface) {
@@ -38,6 +43,10 @@ public function pack(Packer $packer, $value) : ?string
         return $packer->packExt($this->type, $value->format('YmdHisue'));
     }
 
+    /**
+     * @return \DateTimeImmutable|false
+     */
+    #[\Override]
     public function unpackExt(BufferUnpacker $unpacker, int $extLength)
     {
         return \DateTimeImmutable::createFromFormat('YmdHisue', $unpacker->read($extLength));

examples/MessagePack/StructListExtension.php

@@ -15,7 +15,7 @@
 use MessagePack\Extension;
 use MessagePack\Packer;
 
-class StructListExtension implements Extension
+final class StructListExtension implements Extension
 {
     private $type;
 
@@ -24,11 +24,16 @@ public function __construct(int $type)
         $this->type = $type;
     }
 
+    #[\Override]
     public function getType() : int
     {
         return $this->type;
     }
 
+    /**
+     * @param mixed $value
+     */
+    #[\Override]
     public function pack(Packer $packer, $value) : ?string
     {
         if (!$value instanceof StructList) {
@@ -40,7 +45,12 @@ public function pack(Packer $packer, $value) : ?string
             return $packer->packArray($value->list);
         }
 
-        $keys = \array_keys(\reset($value->list));
+        $first = \reset($value->list);
+        if (false === $first) {
+            return $packer->packArray($value->list);
+        }
+
+        $keys = \array_keys($first);
 
         $values = '';
         foreach ($value->list as $item) {
@@ -56,6 +66,10 @@ public function pack(Packer $packer, $value) : ?string
         );
     }
 
+    /**
+     * @return array<int, array<array-key, mixed>>
+     */
+    #[\Override]
     public function unpackExt(BufferUnpacker $unpacker, int $extLength)
     {
         $keys = $unpacker->unpackArray();

examples/MessagePack/TextExtension.php

@@ -15,7 +15,7 @@
 use MessagePack\Extension;
 use MessagePack\Packer;
 
-class TextExtension implements Extension
+final class TextExtension implements Extension
 {
     private $type;
     private $minLength;
@@ -26,11 +26,16 @@ public function __construct(int $type, int $minLength = 100)
         $this->minLength = $minLength;
     }
 
+    #[\Override]
     public function getType() : int
     {
         return $this->type;
     }
 
+    /**
+     * @param mixed $value
+     */
+    #[\Override]
     public function pack(Packer $packer, $value) : ?string
     {
         if (!$value instanceof Text) {
@@ -43,18 +48,31 @@ public function pack(Packer $packer, $value) : ?string
         }
 
         $context = \deflate_init(\ZLIB_ENCODING_GZIP);
+        if (false === $context) {
+            return $packer->packStr($value->str);
+        }
+
         $compressed = \deflate_add($context, $value->str, \ZLIB_FINISH);
+        if (false === $compressed) {
+            return $packer->packStr($value->str);
+        }
 
         return isset($compressed[$length - 1])
             ? $packer->packStr($value->str)
             : $packer->packExt($this->type, $compressed);
     }
 
+    /**
+     * @return string|false
+     */
+    #[\Override]
     public function unpackExt(BufferUnpacker $unpacker, int $extLength)
     {
         $compressed = $unpacker->read($extLength);
         $context = \inflate_init(\ZLIB_ENCODING_GZIP);
 
-        return \inflate_add($context, $compressed, \ZLIB_FINISH);
+        return false === $context
+            ? false
+            : \inflate_add($context, $compressed, \ZLIB_FINISH);
     }
 }

examples/MessagePack/TraversableExtension.php

@@ -15,7 +15,7 @@
 use MessagePack\Extension;
 use MessagePack\Packer;
 
-class TraversableExtension implements Extension
+final class TraversableExtension implements Extension
 {
     private $type;
 
@@ -24,11 +24,16 @@ public function __construct(int $type)
         $this->type = $type;
     }
 
+    #[\Override]
     public function getType() : int
     {
         return $this->type;
     }
 
+    /**
+     * @param mixed $value
+     */
+    #[\Override]
     public function pack(Packer $packer, $value) : ?string
     {
         if (!$value instanceof \Traversable) {
@@ -47,6 +52,10 @@ public function pack(Packer $packer, $value) : ?string
         );
     }
 
+    /**
+     * @return \Generator
+     */
+    #[\Override]
     public function unpackExt(BufferUnpacker $unpacker, int $extLength)
     {
         $size = $unpacker->unpackArrayHeader();

examples/MessagePack/Uint64.php

@@ -29,6 +29,7 @@ public function __toString() : string
         return $this->value;
     }
 
+    #[\Override]
     public function pack(Packer $packer) : string
     {
         return "\xcf".\gmp_export($this->value);