feat: add compatibility with PHP 8.5

Author: fox91

.github/workflows/php-ci.yml

@@ -29,6 +29,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         dependencies:
           - "lowest"
           - "highest"

CLAUDE.md

@@ -6,7 +6,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 This is a PHP_CodeSniffer coding standard package that provides two rulesets: `Fox91CodingStandard` (standard) and `Fox91CodingStandardStrict` (strict). The project is distributed as a Composer package and integrates multiple PHP coding standard tools.
 
-**Supported PHP Versions**: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4
+**Supported PHP Versions**: 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5
 
 ## Essential Commands
 
@@ -41,7 +41,7 @@ composer install
 ```
 
 The test script:
-- Creates fixed versions for PHP 7.4, 8.0, 8.1, 8.2, 8.3, and 8.4
+- Creates fixed versions for PHP 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, and 8.5
 - Runs `phpcbf` against test inputs in `tests/input/`
 - Outputs fixed files to `tests/fixed/php-{version}/{Standard}/`
 
@@ -99,7 +99,7 @@ Optional:
 ## CI/CD
 
 GitHub Actions workflow (`.github/workflows/php-ci.yml`) tests against:
-- All supported PHP versions (7.4 through 8.4)
+- All supported PHP versions (7.4 through 8.5)
 - Both "lowest" and "highest" dependency versions
 - Validates composer.json
 - Lists installed standards and sniffs

README.md

@@ -4,7 +4,7 @@
 [![Downloads](https://img.shields.io/packagist/dt/fox91/coding-standard.svg?colorB=007EC6)](https://packagist.org/packages/fox91/coding-standard)
 [![Build status](https://github.com/fox91/php-coding-standard/workflows/php-ci/badge.svg?branch=main)](https://github.com/fox91/php-coding-standard/actions?query=workflow%3Aphp-ci+branch%3Amain)
 
-Compatible with PHP `7.4`, `8.0`, `8.1`, `8.2`, `8.3` and `8.4`.
+Compatible with PHP `7.4`, `8.0`, `8.1`, `8.2`, `8.3`, `8.4` and `8.5`.
 
 ## Included tools
 

composer.json

@@ -16,7 +16,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+        "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
         "phpcompatibility/php-compatibility": "^9.3",
         "sirbrillig/phpcs-import-detection": "^1.3",

tests/fixed/php-8.5/Fox91CodingStandard/ClassPropertySpacing.php

@@ -0,0 +1,19 @@
+<?php
+declare(strict_types=1);
+
+namespace Spacing;
+
+final class ClassPropertySpacing
+{
+    public bool $foo;
+
+    /** @var array<string> */
+    public array $bar;
+
+    /** @var array<string> */
+    public array $baz;
+
+    public int $qux;
+
+    public int $fred;
+}

tests/fixed/php-8.5/Fox91CodingStandard/ControlStructures.php

@@ -0,0 +1,130 @@
+<?php
+declare(strict_types=1);
+
+namespace ControlStructures;
+
+use InvalidArgumentException;
+use Throwable;
+
+use const PHP_VERSION;
+
+class ControlStructures
+{
+    private const VERSION = PHP_VERSION;
+
+    /** @return iterable<int> */
+    public function varAndIfNoSpaceBetween(): iterable
+    {
+        $var = 1;
+        if (self::VERSION === 0) {
+            yield 0;
+        }
+    }
+
+    /** @return iterable<int> */
+    public function ifAndYieldSpaceBetween(): iterable
+    {
+        if (self::VERSION === 0) {
+            yield 0;
+        }
+        yield 1;
+    }
+
+    /** @return iterable<int> */
+    public function ifAndYieldFromSpaceBetween(): iterable
+    {
+        if (self::VERSION === 0) {
+            yield 0;
+        }
+        yield from [];
+    }
+
+    public function ifAndThrowSpaceBetween(): void
+    {
+        if (self::VERSION === 0) {
+            return;
+        }
+        throw new InvalidArgumentException();
+    }
+
+    public function ifAndReturnSpaceBetween(): int
+    {
+        if (self::VERSION === 0) {
+            return 0;
+        }
+
+        return 1;
+    }
+
+    public function noSpaceAroundCase(): void
+    {
+        switch (self::VERSION) {
+            case 1:
+            case 2:
+                // do something
+                break;
+            case 3:
+                // do something else
+                break;
+            default:
+        }
+    }
+
+    public function spaceBelowBlocks(): void
+    {
+        if (true) {
+            echo 1;
+        }
+        do {
+            echo 2;
+        } while (true);
+        while (true) {
+            echo 3;
+        }
+        for ($i = 0; $i < 1; $i++) {
+            echo $i;
+        }
+        foreach ([] as $item) {
+            echo $item;
+        }
+        switch (true) {
+            default:
+        }
+        try {
+            echo 4;
+        } catch (Throwable) {
+        }
+        echo 5;
+    }
+
+    public function spaceAroundMultilineIfs(): void
+    {
+        if (true
+            && false
+        ) {
+            echo 1;
+        } elseif (false
+            || true
+        ) {
+            echo 2;
+        }
+    }
+
+    public function spacingAroundCasesWithBreakAndReturn(): void
+    {
+        switch (true) {
+            case 1:
+                throw new InvalidArgumentException();
+
+            case 2:
+                return;
+
+            case 3:
+                break;
+
+            case 4:
+                echo 1;
+
+        }
+    }
+}

tests/fixed/php-8.5/Fox91CodingStandard/EarlyReturn.php

@@ -0,0 +1,51 @@
+<?php
+declare(strict_types=1);
+
+namespace Example;
+
+class EarlyReturn
+{
+    public function bar(): bool
+    {
+        if ($bar === 'bar') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function foo(): ?string
+    {
+        foreach ($items as $item) {
+            if (!($item->isItem())) {
+                return 'There is an item that is not an item';
+            } else {
+                continue;
+            }
+        }
+
+        return null;
+    }
+
+    public function baz(): string
+    {
+        if ($number > 0) {
+            return 'Number is grater then 0';
+        } else {
+            exit;
+        }
+    }
+
+    public function quoox(): bool
+    {
+        if (true === 'true') {
+            if (false === false) {
+                return true;
+            }
+        } else {
+            return false;
+        }
+
+        return true;
+    }
+}

tests/fixed/php-8.5/Fox91CodingStandard/ExampleBackedEnum.php

@@ -0,0 +1,8 @@
+<?php
+declare(strict_types=1);
+
+namespace ExampleBackedEnum;
+
+enum ExampleBackedEnum : int
+{
+}

tests/fixed/php-8.5/Fox91CodingStandard/Exceptions.php

@@ -0,0 +1,12 @@
+<?php
+declare(strict_types=1);
+
+namespace Exceptions;
+
+use Exception;
+use Throwable;
+
+try {
+    throw new Exception();
+} catch (Throwable $throwable) {
+}

tests/fixed/php-8.5/Fox91CodingStandard/LowCaseTypes.php

@@ -0,0 +1,17 @@
+<?php
+declare(strict_types=1);
+
+namespace Types;
+
+class LowCaseTypes
+{
+    public function stringToInt(String $string): int
+    {
+        return (int) $string;
+    }
+
+    public function returnString(): String
+    {
+        return 'foo';
+    }
+}