Merge branch '3.x' into 4.x

Author: jrfnl

CHANGELOG-3.x.md

@@ -2,6 +2,33 @@
 
 The file documents changes to the PHP_CodeSniffer project for the 3.x series of releases.
 
+## [3.13.5] - 2025-11-04
+
+### Added
+- Runtime support for PHP 8.5. All known PHP 8.5 deprecation notices have been fixed.
+    - Syntax support for new PHP 8.5 features will follow in a future release.
+    - If you find any PHP 8.5 deprecation notices which were missed, please report them.
+
+### Changed
+- Various housekeeping, including improvements to the tests and documentation.
+    - Thanks to [Rodrigo Primo][@rodrigoprimo] and [Juliette Reinders Folmer][@jrfnl] for their contributions.
+
+### Fixed
+- Fixed bug [#1216]: Tokenizer/PHP: added more defensive coding to prevent PHP 8.5 "Using null as an array offset" deprecation notices.
+    - Thanks to [Andrew Lyons][@andrewnicols] for the patch.
+- Fixed bug [#1279]: Tokenizer/PHP: on PHP < 8.0, an unclosed attribute (parse error) could end up removing some tokens from the token stream.
+    - This could lead to false positives and false negative from sniffs, but could also lead to incorrect fixes being made mangling the file under scan.
+    - Thanks to [Juliette Reinders Folmer](https://github.com/jrfnl) for the patch.
+
+### Other
+- Please be aware that the `master` branch has been renamed to `3.x` and the default branch has changed to the `4.x` branch.
+    - If you contribute to PHP_CodeSniffer, you will need to update your local git clone.
+    - If you develop against PHP_CodeSniffer and run your tests against dev branches of PHPCS, you will need to update your workflows.
+
+[#1216]: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/1216
+[#1279]: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/1279
+
+
 ## [3.13.4] - 2025-09-05
 
 ### Fixed
@@ -3777,6 +3804,7 @@ Additionally, thanks to [Alexander Turek][@derrabus] for consulting on the repo
 === Link list for release links ====
 -->
 
+[3.13.5]:     https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.13.4...3.13.5
 [3.13.4]:     https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.13.3...3.13.4
 [3.13.3]:     https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.13.2...3.13.3
 [3.13.2]:     https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.13.1...3.13.2
@@ -3843,6 +3871,7 @@ Additionally, thanks to [Alexander Turek][@derrabus] for consulting on the repo
 [@alekitto]:            https://github.com/alekitto
 [@anbuc]:               https://github.com/anbuc
 [@AndrewDawes]:         https://github.com/AndrewDawes
+[@andrewnicols]:        https://github.com/andrewnicols
 [@andypost]:            https://github.com/andypost
 [@annechko]:            https://github.com/annechko
 [@anomiex]:             https://github.com/anomiex

tests/Core/Tokenizers/PHP/NullableVsInlineThenParseErrorTest.php

@@ -3,7 +3,7 @@
  * Tests the retokenization of ? to T_NULLABLE or T_INLINE_THEN.
  *
  * @copyright 2025 PHPCSStandards and contributors
- * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/HEAD/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;