Skip to content

Commit

Permalink
Merge pull request #6 from mlocati/master
Browse files Browse the repository at this point in the history
Fork Sync: Update from parent repository
  • Loading branch information
vanderletenpartners authored Jun 21, 2023
2 parents c4d1457 + b3c4c55 commit cc8fcf9
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 2 deletions.
5 changes: 5 additions & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ The `pdo_sqlsrv` and `sqlsrv` PHP extensions require the Microsoft ODBC Driver f
On Alpine Linux there's no way to automatically install its latest version, so we install it manually.
We need to monitor new releases at https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server#alpine18

### uv

The only available versions of the `uv` PHP extension are all beta.
We should switch to the stable release once it will be available.

## xdiff

The `xdiff` PHP extension uses the LibXDiff library.
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ install-php-extensions @fix_letsencrypt
| uopz | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| uploadprogress | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| uuid | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| uv | | | | | | | | ✓ | ✓ | ✓ |
| vips[*](#special-requirements-for-vips) | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| wddx | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | |
| xdebug | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
Expand All @@ -325,7 +326,7 @@ install-php-extensions @fix_letsencrypt
| zookeeper | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| zstd | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
*Number of supported extensions: 135*
*Number of supported extensions: 136*
<!-- END OF EXTENSIONS TABLE -->
PS: the pre-installed PHP extensions are excluded from this list.
Expand Down
1 change: 1 addition & 0 deletions data/supported-extensions
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ timezonedb 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
uopz 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
uploadprogress 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
uuid 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
uv 8.0 8.1 8.2
vips 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
wddx 5.5 5.6 7.0 7.1 7.2 7.3
xdebug 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
Expand Down
19 changes: 18 additions & 1 deletion install-php-extensions
Original file line number Diff line number Diff line change
Expand Up @@ -1336,6 +1336,14 @@ buildRequiredPackageLists() {
uuid@debian)
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile uuid-dev"
;;
uv@alpine)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libuv"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libuv-dev"
;;
uv@debian)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libuv1"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libuv1-dev"
;;
vips@alpine)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent vips"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile vips-dev"
Expand Down Expand Up @@ -3096,7 +3104,7 @@ installRemoteModule() {
installRemoteModule_version=3.12.4
else
# See https://github.com/protocolbuffers/protobuf/issues/10619
installRemoteModule_version=3.23.2
installRemoteModule_version=3.23.3
fi
fi
;;
Expand Down Expand Up @@ -3571,6 +3579,15 @@ installRemoteModule() {
fi
fi
;;
uv)
if test -z "$installRemoteModule_version"; then
if test $PHP_MAJMIN_VERSION -lt 800; then
installRemoteModule_version=0.2.4
else
installRemoteModule_version=beta
fi
fi
;;
xdebug)
if test -z "$installRemoteModule_version"; then
if test $PHP_MAJMIN_VERSION -le 500; then
Expand Down

0 comments on commit cc8fcf9

Please sign in to comment.