Test on PHP 8.5

Author: theodorejb

.editorconfig

@@ -0,0 +1,17 @@
+# https://EditorConfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2

.github/workflows/php.yml

@@ -7,7 +7,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [ '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
 
     services:
       mysql:
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Docs: https://github.com/shivammathur/setup-php
       - name: Setup PHP
@@ -54,7 +54,7 @@ jobs:
 
       - name: Perform static analysis
         run: composer analyze -- --error-format=github
-        if: ${{ matrix.php == '8.4' }}
+        if: ${{ matrix.php == '8.5' }}
 
       - name: Run PHPUnit
         run: composer test-without-mssql
@@ -63,4 +63,4 @@ jobs:
 
       - name: Check Formatting
         run: vendor/bin/php-cs-fixer fix -v --dry-run --stop-on-violation --using-cache=no
-        if: ${{ matrix.php == '8.4' }}
+        if: ${{ matrix.php == '8.5' }}

composer.json

@@ -24,8 +24,8 @@
         "shrikeh/teapot": "^3.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.86",
-        "phpstan/phpstan": "^2.1.22",
+        "friendsofphp/php-cs-fixer": "^3.91",
+        "phpstan/phpstan": "^2.1.32",
         "phpunit/phpunit": "^10.5"
     },
     "autoload": {

src/Helpers.php

@@ -191,12 +191,11 @@ public static function getFieldPropMap(array $fields, array $propMap): array
 
                 if ($data->nullGroup) {
                     // check if any selected field is a child
-                    $parents = $data->parents;
-                    $parent = $parents[array_key_last($parents)];
-                    $length = strlen($parent);
+                    assert($data->parents !== []);
+                    $parent = $data->parents[array_key_last($data->parents)];
 
                     foreach ($fieldProps as $field => $_val) {
-                        if (substr($field, 0, $length) === $parent) {
+                        if (str_starts_with($field, $parent)) {
                             $dependedOn[$prop] = true;
                             break;
                         }