Skip to content

Commit ae63311

Browse files
committed
Merge remote-tracking branch 'origin/support/3.2' into develop
2 parents 52a1d8d + fc967c0 commit ae63311

File tree

123 files changed

+2909
-2160
lines changed

Some content is hidden

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

123 files changed

+2909
-2160
lines changed

composer.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
"type": "project",
55
"license": "AGPL-3.0-only",
66
"require": {
7-
"php": ">=8.1.0 <8.4.0",
7+
"php": ">=8.1.0 <8.5.0",
88
"ext-ctype": "*",
99
"ext-dom": "*",
1010
"ext-gd": "*",
1111
"ext-iconv": "*",
1212
"ext-json": "*",
1313
"ext-mysqli": "*",
1414
"ext-soap": "*",
15-
"apereo/phpcas": "~1.6.0",
16-
"firebase/php-jwt": "^6.4.0",
15+
"apereo/phpcas": "dev-master",
1716
"guzzlehttp/guzzle": "^7.5.1",
1817
"league/oauth2-google": "^4.0.1",
1918
"nikic/php-parser": "dev-master",
@@ -40,10 +39,16 @@
4039
"symfony/stopwatch": "~6.4.0",
4140
"symfony/web-profiler-bundle": "~6.4.0"
4241
},
43-
"repositories": [{
44-
"type": "vcs",
45-
"url": "https://github.com/Combodo/PHP-Parser"
46-
}],
42+
"repositories": [
43+
{
44+
"type": "vcs",
45+
"url": "https://github.com/Combodo/PHP-Parser"
46+
},
47+
{
48+
"type": "vcs",
49+
"url": "https://github.com/EsupPortail/phpCAS"
50+
}
51+
],
4752
"suggest": {
4853
"ext-libsodium": "Required to use the AttributeEncryptedString.",
4954
"ext-openssl": "Can be used as a polyfill if libsodium is not installed",

0 commit comments

Comments
 (0)