Skip to content

Commit 98206d9

Browse files
authored
Merge pull request #4719 from oleibman/formalphp85try2
Formal Support for Php8.5
2 parents 1e40387 + 66422b1 commit 98206d9

File tree

6 files changed

+46
-37
lines changed

6 files changed

+46
-37
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
- '8.2'
1515
- '8.3'
1616
- '8.4'
17+
- '8.5'
1718

1819
include:
1920
- php-version: 'nightly'

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org). Thia is a
99

1010
### Added
1111

12+
- Formal support for Php8.5.
1213
- Limited Printarea support for Html/Pdf. [Issue #3941](https://github.com/PHPOffice/PhpSpreadsheet/issues/3941) [PR #4711](https://github.com/PHPOffice/PhpSpreadsheet/pull/4711)
1314
- Implement missing `INFO` function. [PR #4709](https://github.com/PHPOffice/PhpSpreadsheet/pull/4709)
1415
- Implement missing `BAHTTEXT` function. [PR #4715](https://github.com/PHPOffice/PhpSpreadsheet/pull/4715)

composer.lock

Lines changed: 42 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpstan-baseline.neon

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,3 @@ parameters:
1717
identifier: argument.type
1818
count: 1
1919
path: src/PhpSpreadsheet/ReferenceHelper.php
20-
21-
-
22-
message: '#^Cannot call method setParent\(\) on mixed\.$#'
23-
identifier: method.nonObject
24-
count: 1
25-
path: src/PhpSpreadsheet/Worksheet/AutoFilter.php

src/PhpSpreadsheet/Calculation/Calculation.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2764,6 +2764,7 @@ private function getArgumentDefaultValue(ReflectionParameter $methodArgument): m
27642764
// read constant value
27652765
if (str_contains($constantName, '::')) {
27662766
[$className, $constantName] = explode('::', $constantName);
2767+
/** @var class-string $className */
27672768
$constantReflector = new ReflectionClassConstant($className, $constantName);
27682769

27692770
return $constantReflector->getValue();

src/PhpSpreadsheet/Worksheet/AutoFilter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ public function __clone()
10991099
foreach ($value as $k => $v) {
11001100
$this->{$key}[$k] = clone $v; //* @phpstan-ignore-line
11011101
// attach the new cloned Column to this new cloned Autofilter object
1102-
$this->{$key}[$k]->setParent($this);
1102+
$this->{$key}[$k]->setParent($this); //* @phpstan-ignore-line
11031103
}
11041104
} else {
11051105
$this->{$key} = $value;

0 commit comments

Comments
 (0)