Upgrades, min PHP 7.4

.envrc

@@ -1 +1,2 @@
 use nix
+watch_file flake.nix flake.lock

.github/workflows/main.yaml

@@ -10,30 +10,30 @@ env:
 
 jobs:
   tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         php:
+          - '8.4'
+          - '8.3'
           - '8.2'
           - '8.1'
           - '8.0'
           - '7.4'
-          - '7.3'
-          - '7.2'
         include:
           - php: '7.4'
             cs_fixer: true
           - php: '8.0'
             phpstan: true
     name: 'Check with PHP ${{ matrix.php }}'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v20
+        uses: cachix/install-nix-action@v31
 
       - name: Set up Nix cache
-        uses: cachix/cachix-action@v12
+        uses: cachix/cachix-action@v16
         with:
           # Use cache from https://github.com/fossar/nix-phps
           name: fossar
@@ -46,7 +46,7 @@ jobs:
         run: |
           echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.gitignore

@@ -1,2 +1,6 @@
 composer.lock
-vendor
+vendor/
+.direnv/
+.php-cs-fixer.cache
+.phpunit.result.cache
+phpstan.neon

.php-cs-fixer.php

@@ -5,9 +5,10 @@
 
 $rules = [
     '@Symfony' => true,
-    '@PHP71Migration' => true,
-    '@PHP71Migration:risky' => true,
-    'phpdoc_to_param_type' => true,
+    '@PHP74Migration' => true,
+    '@PHP74Migration:risky' => true,
+    'phpdoc_to_property_type' => true,
+    // 'phpdoc_to_param_type' => true, // requires PHP 8.0
     'phpdoc_to_return_type' => true,
     // overwrite some Symfony rules
     'concat_space' => ['spacing' => 'one'],

CHANGELOG.md

@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## [3.0.0] – unreleased
 
 - Mb: Make encoding detection stricter.
+- Raise minimum PHP version to 7.4.0.
 
 
 ## [2.0.0] – 2023-03-07

composer.json

@@ -17,10 +17,12 @@
         "ddeboer/transcoder": "self.version"
     },
     "require": {
-        "php": ">=7.2.5"
+        "php": ">=7.4.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^6.2"
+        "symfony/phpunit-bridge": "^6.2 || ^7.0",
+        "phpstan/phpstan": "^2.1",
+        "friendsofphp/php-cs-fixer": "^3.4"
     },
     "suggest": {
         "ext-mbstring": "For using the MbTranscoder",
@@ -34,7 +36,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.2.5"
+            "php": "7.4.0"
         }
     },
     "scripts": {

flake.nix

@@ -48,10 +48,12 @@
             # Composer and PHP.
             php
             phpBase.packages.composer
-
-            phpBase.packages.php-cs-fixer
-            phpBase.packages.phpstan
+            pkgs.phpactor
           ];
+
+          env = pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
+            LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
+          };
         };
       };
 }

src/IconvTranscoder.php

@@ -10,10 +10,7 @@
 
 class IconvTranscoder implements TranscoderInterface
 {
-    /**
-     * @var string
-     */
-    private $defaultEncoding;
+    private string $defaultEncoding;
 
     /**
      * Create an Iconv-based transcoder.
@@ -29,9 +26,6 @@ public function __construct(string $defaultEncoding = 'UTF-8')
         $this->defaultEncoding = $defaultEncoding;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function transcode(string $string, ?string $from = null, ?string $to = null): string
     {
         set_error_handler(

src/MbTranscoder.php

@@ -13,12 +13,9 @@ class MbTranscoder implements TranscoderInterface
     /**
      * @var array<string, int>
      */
-    private static $encodings;
+    private static array $encodings;
 
-    /**
-     * @var string
-     */
-    private $defaultEncoding;
+    private string $defaultEncoding;
 
     /**
      * Create a Mb-based transcoder.
@@ -31,7 +28,7 @@ public function __construct(string $defaultEncoding = 'UTF-8')
             throw new ExtensionMissingException('mb');
         }
 
-        if (null === self::$encodings) {
+        if (!isset(self::$encodings)) {
             self::$encodings = array_change_key_case(
                 array_flip(mb_list_encodings()),
                 CASE_LOWER
@@ -43,8 +40,6 @@ public function __construct(string $defaultEncoding = 'UTF-8')
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param array<string>|string|null $from
      */
     public function transcode(string $string, $from = null, ?string $to = null): string
@@ -77,9 +72,6 @@ public function transcode(string $string, $from = null, ?string $to = null): str
             $from
         );
 
-        // For PHPStan: We check the encoding is valid.
-        assert($result !== false);
-
         return $result;
     }
 

src/Transcoder.php

@@ -12,12 +12,12 @@ class Transcoder implements TranscoderInterface
     /**
      * @var array<string, TranscoderInterface>
      */
-    private static $chain;
+    private static array $chain;
 
     /**
      * @var TranscoderInterface[]
      */
-    private $transcoders = [];
+    private array $transcoders = [];
 
     /**
      * @param TranscoderInterface[] $transcoders
@@ -27,9 +27,6 @@ public function __construct(array $transcoders)
         $this->transcoders = $transcoders;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function transcode(string $string, ?string $from = null, ?string $to = null): string
     {
         foreach ($this->transcoders as $transcoder) {

tests/IconvTranscoderTest.php

@@ -8,10 +8,7 @@
 
 class IconvTranscoderTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var IconvTranscoder
-     */
-    private $transcoder;
+    private IconvTranscoder $transcoder;
 
     /**
      * @before

tests/MbTranscoderTest.php

@@ -8,10 +8,7 @@
 
 class MbTranscoderTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var MbTranscoder
-     */
-    private $transcoder;
+    private MbTranscoder $transcoder;
 
     /**
      * @before

tests/TranscoderTest.php

@@ -9,10 +9,7 @@
 
 class TranscoderTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var TranscoderInterface
-     */
-    private $transcoder;
+    private TranscoderInterface $transcoder;
 
     /**
      * @before