Formal Support for Php8.5 (#4720)

Author: oleibman

.github/workflows/main.yml

@@ -14,10 +14,7 @@ jobs:
           - '8.2'
           - '8.3'
           - '8.4'
-
-        include:
-          - php-version: 'nightly'
-            experimental: true
+          - '8.5'
 
     name: PHP ${{ matrix.php-version }}
 

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org). This is a
 
 ## TBD - 2.4.2
 
+### Added
+
+- Formal support for Php8.5. This is the last version of Php which can be used with this branch.
+
 ### Fixed
 
  - Php8.5 deprecates use of null as array index. [PR #4635](https://github.com/PHPOffice/PhpSpreadsheet/pull/4635)

README.md

@@ -14,6 +14,8 @@ This branch (release222) is maintained (for security and some bug fixes), but it
 
 ## PHP Version Support
 
+This branch runs with Php 8.1, 8.2, 8.3, 8.4, or 8.5.
+
 LTS: For maintained branches, support for PHP versions will only be maintained for a period of six months beyond the
 [end of life](https://www.php.net/supported-versions) of that PHP version.
 

composer.json

@@ -66,7 +66,7 @@
         ]
     },
     "require": {
-        "php": "^8.1",
+        "php": ">=8.1.0 <8.6.0",
         "ext-ctype": "*",
         "ext-dom": "*",
         "ext-fileinfo": "*",
@@ -92,7 +92,7 @@
         "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
         "dompdf/dompdf": "^2.0 || ^3.0",
         "friendsofphp/php-cs-fixer": "^3.2",
-        "mitoteam/jpgraph": "^10.3",
+        "mitoteam/jpgraph": "^10.5",
         "mpdf/mpdf": "^8.1.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpstan/phpstan": "^1.1",