Skip to content

Commit 39f35ab

Browse files
committed
Merge branch '6.1' into 6.2
2 parents 7bf7547 + 62b0e81 commit 39f35ab

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
name: Deploy
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
with:
2626
fetch-depth: 0
27-
- uses: actions/setup-python@v5
27+
- uses: actions/setup-python@v6
2828
with:
2929
python-version: '3.x'
3030
- run: pip3 install -r requirements.txt

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
name: Test
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v4
19-
- uses: actions/setup-python@v5
18+
- uses: actions/checkout@v5
19+
- uses: actions/setup-python@v6
2020
with:
2121
python-version: '3.x'
2222
- run: pip3 install -r requirements.txt

docs/php/api/user_activity_events.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To integrate user activity events into your package, you have to register object
1414
</type>
1515
```
1616

17-
Specify multiple object types if you want to provide multiple types of user activity events.
17+
Specify multiple object types if you want to provide multiple types of user activity events.
1818

1919
Example of the implementation of the `wcf\system\user\activity\event\IUserActivityEvent` interface:
2020

@@ -29,7 +29,7 @@ use wcf\system\WCF;
2929
use wcf\util\StringUtil;
3030
use wcf\system\file\processor\ImageData;
3131

32-
final class FooUserActivityEvent implements IUserActivityEvent
32+
final class FooUserActivityEvent extends SingletonFactory implements IUserActivityEvent
3333
{
3434
public function prepare(array $events)
3535
{

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Markdown==3.8.2
1+
Markdown==3.9
22
mike==2.1.3
33
mkdocs-git-revision-date-plugin==0.3.2
4-
mkdocs-macros-plugin==1.3.7
5-
mkdocs-material==9.6.15
4+
mkdocs-macros-plugin==1.4.0
5+
mkdocs-material==9.6.21
66
mkdocs==1.6.1
77
setuptools==80.9.0

0 commit comments

Comments
 (0)