Skip to content

Commit ec8d507

Browse files
authored
Php8.5-related Changes release390 (#4652)
1 parent 4b83080 commit ec8d507

File tree

13 files changed

+390
-311
lines changed

13 files changed

+390
-311
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: shivammathur/setup-php@v2
3636
with:
3737
php-version: ${{ matrix.php-version }}
38-
extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
38+
extensions: ctype, dom, fileinfo, gd, iconv, intl, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
3939
coverage: none
4040

4141
- name: Get composer cache directory
@@ -81,8 +81,8 @@ jobs:
8181
- name: Setup PHP, with composer and extensions
8282
uses: shivammathur/setup-php@v2
8383
with:
84-
php-version: 8.3
85-
extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
84+
php-version: 8.4
85+
extensions: ctype, dom, fileinfo, gd, iconv, intl, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
8686
coverage: none
8787

8888
# This is non-ideal because it only checks for the last commit of the PR, not all of them, but better than nothing
@@ -98,8 +98,8 @@ jobs:
9898
- name: Setup PHP, with composer and extensions
9999
uses: shivammathur/setup-php@v2
100100
with:
101-
php-version: 8.3
102-
extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
101+
php-version: 8.4
102+
extensions: ctype, dom, fileinfo, gd, iconv, intl, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
103103
coverage: none
104104
tools: cs2pr
105105

@@ -129,8 +129,8 @@ jobs:
129129
- name: Setup PHP, with composer and extensions
130130
uses: shivammathur/setup-php@v2
131131
with:
132-
php-version: 8.3
133-
extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
132+
php-version: 8.4
133+
extensions: ctype, dom, fileinfo, gd, iconv, intl, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
134134
coverage: none
135135
tools: cs2pr
136136

@@ -160,8 +160,8 @@ jobs:
160160
- name: Setup PHP, with composer and extensions
161161
uses: shivammathur/setup-php@v2
162162
with:
163-
php-version: 8.3
164-
extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
163+
php-version: 8.4
164+
extensions: ctype, dom, fileinfo, gd, iconv, intl, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
165165
coverage: none
166166
tools: cs2pr
167167

@@ -191,8 +191,8 @@ jobs:
191191
- name: Setup PHP, with composer and extensions
192192
uses: shivammathur/setup-php@v2
193193
with:
194-
php-version: 8.3
195-
extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
194+
php-version: 8.4
195+
extensions: ctype, dom, gd, fileinfo, iconv, intl, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
196196
coverage: none
197197
tools: cs2pr
198198

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"dealerdirect/phpcodesniffer-composer-installer": "dev-main",
9393
"dompdf/dompdf": "^2.0 || ^3.0",
9494
"friendsofphp/php-cs-fixer": "^3.2",
95-
"mitoteam/jpgraph": "^10.3",
95+
"mitoteam/jpgraph": "^10.3 || 10.5.0-beta",
9696
"mpdf/mpdf": "^8.1.1",
9797
"phpcompatibility/php-compatibility": "^9.3",
9898
"phpstan/phpstan": "^1.1",
@@ -102,7 +102,7 @@
102102
"tecnickcom/tcpdf": "^6.5"
103103
},
104104
"suggest": {
105-
"ext-intl": "PHP Internationalization Functions",
105+
"ext-intl": "PHP Internationalization Functions, required for NumberFormatter Wizard",
106106
"mpdf/mpdf": "Option for rendering PDF with PDF Writer",
107107
"dompdf/dompdf": "Option for rendering PDF with PDF Writer",
108108
"tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer",

0 commit comments

Comments
 (0)