Skip to content

Commit 2f86bb8

Browse files
Merge branch 'deprecate_v1' of github.com:nathanjrobertson/simplesamlphp-module-sqlauth into deprecate_v1
2 parents 5061ea4 + ddf70c2 commit 2f86bb8

File tree

5 files changed

+309
-155
lines changed

5 files changed

+309
-155
lines changed

.github/workflows/autolock-conversations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
action:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: dessant/lock-threads@v5
21+
- uses: dessant/lock-threads@v6
2222
with:
2323
issue-inactive-days: '90'
2424
pr-inactive-days: '90'

.github/workflows/php.yml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
php-version: ['8.1', '8.2', '8.3', '8.4']
22+
php-version: ['8.3', '8.4', '8.5']
2323

24-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.10.6
24+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.0
2525
with:
2626
php-version: ${{ matrix.php-version }}
2727

@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232

33-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.10.6
33+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.0
3434
with:
3535
enable_eslinter: false
3636
enable_jsonlinter: true
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
operating-system: [ubuntu-latest]
48-
php-versions: ['8.2', '8.3', '8.4', '8.5']
48+
php-versions: ['8.3', '8.4', '8.5']
4949

5050
steps:
5151
- name: Setup PHP, with composer and extensions
@@ -54,7 +54,7 @@ jobs:
5454
with:
5555
php-version: ${{ matrix.php-versions }}
5656
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre,\
57-
pdo, pdo_sqlite, posix, spl, xml
57+
pdo, pdo_sqlite, posix, sodium, spl, xml
5858
tools: composer
5959
ini-values: error_reporting=E_ALL
6060
coverage: pcov
@@ -76,9 +76,9 @@ jobs:
7676
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
7777

7878
- name: Cache composer dependencies
79-
uses: actions/cache@v4
79+
uses: actions/cache@v5
8080
with:
81-
path: $COMPOSER_CACHE
81+
path: ${{ env.COMPOSER_CACHE }}
8282
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
8383
restore-keys: ${{ runner.os }}-composer-
8484

@@ -95,7 +95,7 @@ jobs:
9595

9696
- name: Save coverage data
9797
if: ${{ matrix.php-versions == '8.5' }}
98-
uses: actions/upload-artifact@v5
98+
uses: actions/upload-artifact@v6
9999
with:
100100
name: coverage-data
101101
path: ${{ github.workspace }}/build
@@ -108,7 +108,7 @@ jobs:
108108
fail-fast: true
109109
matrix:
110110
operating-system: [windows-latest]
111-
php-versions: ['8.2', '8.3', '8.4', '8.5']
111+
php-versions: ['8.3', '8.4', '8.5']
112112

113113
steps:
114114
- name: Setup PHP, with composer and extensions
@@ -117,7 +117,7 @@ jobs:
117117
with:
118118
php-version: ${{ matrix.php-versions }}
119119
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre,\
120-
pdo, pdo_sqlite, posix, spl, xml, zip
120+
pdo, pdo_sqlite, posix, sodium, spl, xml, zip
121121
tools: composer
122122
ini-values: error_reporting=E_ALL
123123
coverage: none
@@ -139,9 +139,9 @@ jobs:
139139
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
140140

141141
- name: Cache composer dependencies
142-
uses: actions/cache@v4
142+
uses: actions/cache@v5
143143
with:
144-
path: $COMPOSER_CACHE
144+
path: ${{ env.COMPOSER_CACHE }}
145145
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
146146
restore-keys: ${{ runner.os }}-composer-
147147

@@ -165,7 +165,8 @@ jobs:
165165
# Should be the higest supported version, so we can use the newest tools
166166
php-version: '8.5'
167167
tools: composer, composer-require-checker, composer-unused, phpcs, phpstan
168-
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, pdo, posix, spl, xml
168+
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre,\
169+
pdo, posix, sodium, spl, xml
169170

170171
- name: Setup problem matchers for PHP
171172
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
@@ -176,9 +177,9 @@ jobs:
176177
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
177178

178179
- name: Cache composer dependencies
179-
uses: actions/cache@v4
180+
uses: actions/cache@v5
180181
with:
181-
path: $COMPOSER_CACHE
182+
path: ${{ env.COMPOSER_CACHE }}
182183
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
183184
restore-keys: ${{ runner.os }}-composer-
184185

@@ -216,8 +217,9 @@ jobs:
216217
uses: shivammathur/setup-php@v2
217218
with:
218219
# Should be the lowest supported version
219-
php-version: '8.2'
220-
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, pdo, posix, spl, xml, zip
220+
php-version: '8.3'
221+
extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre,\
222+
pdo, posix, sodium, spl, xml, zip
221223
tools: composer
222224
coverage: none
223225

@@ -230,9 +232,9 @@ jobs:
230232
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
231233

232234
- name: Cache composer dependencies
233-
uses: actions/cache@v4
235+
uses: actions/cache@v5
234236
with:
235-
path: $COMPOSER_CACHE
237+
path: ${{ env.COMPOSER_CACHE }}
236238
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
237239
restore-keys: ${{ runner.os }}-composer-
238240

@@ -255,7 +257,7 @@ jobs:
255257
steps:
256258
- uses: actions/checkout@v6
257259

258-
- uses: actions/download-artifact@v6
260+
- uses: actions/download-artifact@v7
259261
with:
260262
name: coverage-data
261263
path: ${{ github.workspace }}/build

codecov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ comment:
99
layout: "diff"
1010
behavior: once
1111
require_changes: true
12-
require_base: no
13-
require_head: yes
12+
require_base: false
13+
require_head: true
1414
branches: null
1515

1616
github_checks:

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
}
3636
},
3737
"require": {
38-
"php": "^8.2",
38+
"php": "^8.3",
3939
"ext-pdo": "*",
4040

41-
"simplesamlphp/assert": "~1.9.1",
42-
"simplesamlphp/composer-module-installer": "~1.6.0",
43-
"simplesamlphp/simplesamlphp": "^2.2"
41+
"simplesamlphp/assert": "~1.9",
42+
"simplesamlphp/composer-module-installer": "~1.6",
43+
"simplesamlphp/simplesamlphp": "^2.5@RC"
4444
},
4545
"require-dev": {
46-
"simplesamlphp/simplesamlphp-test-framework": "~1.10.3"
46+
"simplesamlphp/simplesamlphp-test-framework": "~1.11"
4747
},
4848
"support": {
4949
"issues": "https://github.com/simplesamlphp/simplesamlphp-module-sqlauth/issues",

0 commit comments

Comments
 (0)