Skip to content

Commit 8edd6a2

Browse files
GromNaNpaulinevosdependabot[bot]
authored
PHPORM-418 Test with PHP 8.5 and reduce test matrix (#3459)
* Improve change log categories (#3442) So that anything labeled `feature` is added to the Features category and docs changes are listed as a separate category * Bump actions/labeler from 5 to 6 (#3445) Bumps [actions/labeler](https://github.com/actions/labeler) from 5 to 6. - [Release notes](https://github.com/actions/labeler/releases) - [Commits](actions/labeler@v5...v6) --- updated-dependencies: - dependency-name: actions/labeler dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Remove explicit dependency to symfony/http-kernel as it's not used directly (#3446) * Bump mongodb-labs/drivers-github-tools from 2 to 3 (#3452) Bumps [mongodb-labs/drivers-github-tools](https://github.com/mongodb-labs/drivers-github-tools) from 2 to 3. - [Release notes](https://github.com/mongodb-labs/drivers-github-tools/releases) - [Commits](mongodb-labs/drivers-github-tools@v2...v3) --- updated-dependencies: - dependency-name: mongodb-labs/drivers-github-tools dependency-version: '3' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github/codeql-action from 3 to 4 (#3455) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3 to 4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@v3...v4) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Test with PHP 8.5 and reduce test matrix * Test all server versions with the lowest PHP and latest Laravel --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Pauline Vos <pvos88@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 7aeffd7 commit 8edd6a2

File tree

10 files changed

+61
-53
lines changed

10 files changed

+61
-53
lines changed

‎.github/release.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ changelog:
1212
- title: New Features
1313
labels:
1414
- enhancement
15+
- feature
1516
- title: Fixed
1617
labels:
1718
- bug
1819
- fixed
20+
- title: Documentation Changes
21+
labels:
22+
- docs
1923
- title: Other Changes
2024
labels:
2125
- "*"

‎.github/workflows/build-ci-atlas.yml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- "[0-9]+.[0-9x]+"
7-
- "feature/*"
87
pull_request:
98
branches:
109
- "[0-9]+.[0-9x]+"
@@ -16,28 +15,34 @@ env:
1615

1716
jobs:
1817
build:
19-
runs-on: "${{ matrix.os }}"
18+
runs-on: "ubuntu-latest"
2019

2120
name: "PHP/${{ matrix.php }} Laravel/${{ matrix.laravel }} Driver/${{ matrix.driver }}"
2221

2322
strategy:
2423
matrix:
25-
os:
26-
- "ubuntu-latest"
2724
php:
2825
- "8.2"
2926
- "8.3"
3027
- "8.4"
28+
- "8.5"
3129
laravel:
32-
- "11.*"
3330
- "12.*"
3431
driver:
35-
- 1
32+
- 2
3633
include:
34+
# Test Laravel 10
35+
- php: "8.1"
36+
laravel: "10.*"
37+
driver: 1
38+
# Test Laravel 11
39+
- php: "8.2"
40+
laravel: "11.*"
41+
driver: 1
42+
# Test Driver v1
3743
- php: "8.4"
3844
laravel: "12.*"
39-
os: "ubuntu-latest"
40-
driver: 2
45+
driver: 1
4146

4247
steps:
4348
- uses: "actions/checkout@v5"

‎.github/workflows/build-ci.yml‎

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- "[0-9]+.[0-9x]+"
7-
- "feature/*"
87
pull_request:
98
branches:
109
- "[0-9]+.[0-9x]+"
@@ -16,53 +15,63 @@ env:
1615

1716
jobs:
1817
build:
19-
runs-on: "${{ matrix.os }}"
18+
runs-on: "ubuntu-latest"
2019

2120
name: "PHP/${{ matrix.php }} Laravel/${{ matrix.laravel }} Driver/${{ matrix.driver }} Server/${{ matrix.mongodb }} ${{ matrix.mode }}"
2221

2322
strategy:
2423
matrix:
25-
os:
26-
- "ubuntu-latest"
2724
mongodb:
28-
- "4.4"
29-
- "5.0"
30-
- "6.0"
31-
- "7.0"
3225
- "8.0"
3326
php:
34-
- "8.1"
3527
- "8.2"
3628
- "8.3"
3729
- "8.4"
30+
- "8.5"
3831
laravel:
39-
- "10.*"
40-
- "11.*"
4132
- "12.*"
4233
driver:
4334
- 2
4435
include:
36+
# Test Lowest dependencies
4537
- php: "8.1"
4638
laravel: "10.*"
4739
mongodb: "5.0"
4840
mode: "low-deps"
49-
os: "ubuntu-latest"
5041
driver: 1
42+
# Test Driver v1
5143
- php: "8.3"
52-
laravel: "11.*"
53-
mongodb: "8.0"
54-
os: "ubuntu-latest"
44+
laravel: "10.*"
45+
mongodb: "4.4"
5546
driver: 1
5647
- php: "8.4"
5748
laravel: "12.*"
5849
mongodb: "8.0"
59-
os: "ubuntu-latest"
6050
driver: 1
61-
exclude:
62-
- php: "8.1"
51+
# Test Laravel 10
52+
- php: "8.5"
53+
laravel: "10.*"
54+
mongodb: "8.0"
55+
# Test Laravel 11
56+
- php: "8.5"
6357
laravel: "11.*"
64-
- php: "8.1"
58+
mongodb: "8.0"
59+
# Test all server versions with the lowest PHP and latest Laravel
60+
- php: "8.2"
61+
laravel: "12.*"
62+
mongodb: "4.4"
63+
- php: "8.2"
64+
laravel: "12.*"
65+
mongodb: "5.0"
66+
- php: "8.2"
6567
laravel: "12.*"
68+
mongodb: "6.0"
69+
- php: "8.2"
70+
laravel: "12.*"
71+
mongodb: "7.0"
72+
- php: "8.2"
73+
laravel: "12.*"
74+
mongodb: "8.0"
6675

6776
steps:
6877
- uses: "actions/checkout@v5"

‎.github/workflows/coding-standards.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- "[0-9]+.[0-9x]+"
7-
- "feature/*"
87
pull_request:
98
branches:
109
- "[0-9]+.[0-9x]+"

‎.github/workflows/labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ jobs:
99
pull-requests: write
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v5
12+
- uses: actions/labeler@v6

‎.github/workflows/merge-up.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- "[0-9]+.[0-9x]+"
7-
- "feature/*"
87

98
env:
109
GH_TOKEN: ${{ secrets.MERGE_UP_TOKEN }}

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: echo '🎬 Release process for version ${{ inputs.version }} started by @${{ github.triggering_actor }}' >> $GITHUB_STEP_SUMMARY
2424

2525
- name: "Generate token and checkout repository"
26-
uses: mongodb-labs/drivers-github-tools/secure-checkout@v2
26+
uses: mongodb-labs/drivers-github-tools/secure-checkout@v3
2727
with:
2828
app_id: ${{ vars.APP_ID }}
2929
private_key: ${{ secrets.APP_PRIVATE_KEY }}
@@ -71,7 +71,7 @@ jobs:
7171
#
7272

7373
- name: "Set up drivers-github-tools"
74-
uses: mongodb-labs/drivers-github-tools/setup@v2
74+
uses: mongodb-labs/drivers-github-tools/setup@v3
7575
with:
7676
aws_role_arn: ${{ secrets.AWS_ROLE_ARN }}
7777
aws_region_name: ${{ vars.AWS_REGION_NAME }}
@@ -82,7 +82,7 @@ jobs:
8282
run: echo "RELEASE_URL=$(gh release create ${{ inputs.version }} --target ${{ github.ref_name }} --title "${{ inputs.version }}" --generate-notes --draft)" >> "$GITHUB_ENV"
8383

8484
- name: "Create release tag"
85-
uses: mongodb-labs/drivers-github-tools/tag-version@v2
85+
uses: mongodb-labs/drivers-github-tools/tag-version@v3
8686
with:
8787
version: ${{ inputs.version }}
8888
tag_message_template: 'Release ${VERSION}'
@@ -121,22 +121,22 @@ jobs:
121121

122122
steps:
123123
- name: "Generate token and checkout repository"
124-
uses: mongodb-labs/drivers-github-tools/secure-checkout@v2
124+
uses: mongodb-labs/drivers-github-tools/secure-checkout@v3
125125
with:
126126
app_id: ${{ vars.APP_ID }}
127127
private_key: ${{ secrets.APP_PRIVATE_KEY }}
128128
ref: refs/tags/${{ inputs.version }}
129129

130130
# Sets the S3_ASSETS environment variable used later
131131
- name: "Set up drivers-github-tools"
132-
uses: mongodb-labs/drivers-github-tools/setup@v2
132+
uses: mongodb-labs/drivers-github-tools/setup@v3
133133
with:
134134
aws_role_arn: ${{ secrets.AWS_ROLE_ARN }}
135135
aws_region_name: ${{ vars.AWS_REGION_NAME }}
136136
aws_secret_id: ${{ secrets.AWS_SECRET_ID }}
137137

138138
- name: "Generate SSDLC Reports"
139-
uses: mongodb-labs/drivers-github-tools/full-report@v2
139+
uses: mongodb-labs/drivers-github-tools/full-report@v3
140140
with:
141141
product_name: "MongoDB Laravel Integration"
142142
release_version: ${{ inputs.version }}
@@ -147,7 +147,7 @@ jobs:
147147
continue-on-error: true
148148

149149
- name: Upload S3 assets
150-
uses: mongodb-labs/drivers-github-tools/upload-s3-assets@v2
150+
uses: mongodb-labs/drivers-github-tools/upload-s3-assets@v3
151151
with:
152152
version: ${{ inputs.version }}
153153
product_name: laravel-mongodb

‎.github/workflows/static-analysis.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- "[0-9]+.[0-9x]+"
7-
- "feature/*"
87
pull_request:
98
branches:
109
- "[0-9]+.[0-9x]+"
@@ -17,7 +16,7 @@ on:
1716
required: true
1817

1918
env:
20-
PHP_VERSION: "8.2"
19+
PHP_VERSION: "8.5"
2120
DRIVER_VERSION: "stable"
2221
MONGODB_EXT_V1: mongodb-1.21.0
2322
MONGODB_EXT_V2: mongodb-mongodb/mongo-php-driver@v2.x
@@ -34,9 +33,12 @@ jobs:
3433
- '8.2'
3534
- '8.3'
3635
- '8.4'
36+
- '8.5'
3737
driver:
38-
- 1
3938
- 2
39+
include:
40+
- php: "8.4"
41+
driver: 1
4042
steps:
4143
- name: Checkout
4244
uses: actions/checkout@v5
@@ -89,13 +91,13 @@ jobs:
8991

9092
- name: "Upload SARIF report"
9193
if: ${{ github.event_name != 'workflow_dispatch' }}
92-
uses: "github/codeql-action/upload-sarif@v3"
94+
uses: "github/codeql-action/upload-sarif@v4"
9395
with:
9496
sarif_file: phpstan.sarif
9597

9698
- name: "Upload SARIF report"
9799
if: ${{ github.event_name == 'workflow_dispatch' }}
98-
uses: "github/codeql-action/upload-sarif@v3"
100+
uses: "github/codeql-action/upload-sarif@v4"
99101
with:
100102
sarif_file: phpstan.sarif
101103
ref: ${{ inputs.ref }}

‎composer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
"illuminate/database": "^10.30|^11|^12",
3232
"illuminate/events": "^10.0|^11|^12",
3333
"illuminate/support": "^10.0|^11|^12",
34-
"mongodb/mongodb": "^1.21|^2",
35-
"symfony/http-foundation": "^6.4|^7"
34+
"mongodb/mongodb": "^1.21|^2"
3635
},
3736
"require-dev": {
3837
"laravel/scout": "^10.3",

‎src/Session/MongoDbSessionHandler.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
<?php
22

3-
/*
4-
* This file is part of the Symfony package.
5-
*
6-
* (c) Fabien Potencier <fabien@symfony.com>
7-
*
8-
* For the full copyright and license information, please view the LICENSE
9-
* file that was distributed with this source code.
10-
*/
11-
123
namespace MongoDB\Laravel\Session;
134

145
use Illuminate\Session\DatabaseSessionHandler;

0 commit comments

Comments
 (0)