Skip to content

Commit 2f8503b

Browse files
authored
Merge branch 'php:master' into docs/replace-svn-with-git
2 parents e8dbd3a + 5d705c2 commit 2f8503b

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout PhD
11-
uses: actions/checkout@v5
11+
uses: actions/checkout@v6
1212

1313
- name: Setup PHP
1414
uses: shivammathur/setup-php@v2

.github/workflows/full_render_doc-en_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Checkout PhD
9-
uses: actions/checkout@v5
9+
uses: actions/checkout@v6
1010
with:
1111
path: "phd"
1212

1313
- name: "Checkout php/doc-en"
14-
uses: "actions/checkout@v5"
14+
uses: "actions/checkout@v6"
1515
with:
1616
path: "en"
1717
repository: "php/doc-en"
1818

1919
- name: "Checkout php/doc-base"
20-
uses: "actions/checkout@v5"
20+
uses: "actions/checkout@v6"
2121
with:
2222
path: "doc-base"
2323
repository: "php/doc-base"

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout PhD
12-
uses: actions/checkout@v5
12+
uses: actions/checkout@v6
1313

1414
- name: Setup PHP
1515
uses: shivammathur/setup-php@v2

phpdotnet/phd/ObjectStorage.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@
33

44
class ObjectStorage extends \SplObjectStorage
55
{
6-
public function attach(object $object, mixed $info = array()): void {
6+
public function attach(object $object, mixed $info = []): void {
77
if (!($object instanceof Format)) {
88
throw new \InvalidArgumentException(
99
'Only classess inheriting ' . __NAMESPACE__ . '\\Format supported'
1010
);
1111
}
1212
if (empty($info)) {
13-
$info = array(
13+
$info = [
1414
\XMLReader::ELEMENT => $object->getElementMap(),
1515
\XMLReader::TEXT => $object->getTextMap(),
16-
);
16+
];
1717
}
18-
parent::attach($object, $info);
18+
19+
$this->offsetSet($object, $info);
1920
}
2021
}
2122

0 commit comments

Comments
 (0)