Skip to content

Commit e477718

Browse files
committed
Merge upstream/master into ci/add-github-actions-coding-standards-
Resolve composer.lock conflict by regenerating with composer update.
2 parents 3079eb8 + d7f7004 commit e477718

48 files changed

Lines changed: 821 additions & 265 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
ubuntu:
55
strategy:
66
matrix:
7-
version: ['8.1', '8.2', '8.3', '8.4']
7+
version: ['8.3', '8.4', '8.5']
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout PhD

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ jobs:
55
name: test
66
strategy:
77
matrix:
8-
version: ['8.1', '8.2', '8.3', '8.4']
8+
version: ['8.3', '8.4', '8.5']
9+
continue-on-error: ${{ matrix.version == '8.5' }}
910
runs-on: ubuntu-latest
1011
steps:
1112
- name: Checkout PhD

composer.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
],
2020
"require": {
21-
"php": ">=8.1.0",
21+
"php": ">=8.3",
2222
"ext-dom": "*",
2323
"ext-sqlite3": "*",
2424
"ext-xmlreader": "*"
@@ -30,8 +30,13 @@
3030
"easybook/geshi": "For using GeSHi as code highlighter"
3131
},
3232
"autoload": {
33-
"psr-0": {
34-
"phpdotnet\\": "."
33+
"psr-4": {
34+
"phpdotnet\\phd\\": "src/"
35+
}
36+
},
37+
"autoload-dev": {
38+
"psr-4": {
39+
"phpdotnet\\phd\\Tests\\": "tests/"
3540
}
3641
},
3742
"scripts": {

0 commit comments

Comments
 (0)