php/composer: turn into meta package as 7.4 is EOL; php8.[01] and composer8.[01]: add alternatives groups. #38536

TinfoilSubmarine · 2022-08-08T16:45:07Z

Should not be merged until PHP 7.4 EOL (28 Nov 2022): https://www.php.net/supported-versions.php

Testing the changes

I tested the changes in this PR: YES

Packages depending on php:

ampache ampache: update to 5.5.1. #38973
composer (need to decide how to handle running with multiple PHP versions)
phoronix-test-suite (verified to work with the php8.1 interpreter after symlinking /usr/bin/php8.1 to /usr/bin/php. Since it works with both, I don't think there is any change needed to the phoronix-test-suite package.)
phpMyAdmin phpMyAdmin: update to 5.2.0, fix update check. #38984

Packages depending on php-gd:

zabbix-frontend-php zabbix: update to 6.2.2. #38982

Packages depending on php-mysql:

zabbix-frontend-php zabbix: update to 6.2.2. #38982

Packages with php-devel in *makedepends:

libguestfs (configures and compiles fine with 8.1, but php is not enabled by default anyway)

Other things to take care of:

php-pear

paper42 · 2022-08-08T23:37:33Z

I think this is a bit too fragile and we should wait with this for php 7.4 EOL which should be in November. Which /usr/bin/php gets chosen when the user has php (7) and php8.0 installed? Are we sure it always works as expected and won't break the setup for some users who rely on /usr/bin/php being php7, etc?

Chocimier · 2022-08-09T18:08:16Z

It does not work correctly:

before:

composer --version
Composer version 2.2.4 2022-01-08 12:30:42

after:

composer --version
PHP 7.4.30 (cli) (built: Aug  9 2022 17:56:39) ( NTS )
Copyright (c) The PHP Group

composer -h       
Usage: php [options] [-f] <file> [--] [args...]

TinfoilSubmarine · 2022-08-09T18:45:20Z

It does not work correctly:

before:

composer --version
Composer version 2.2.4 2022-01-08 12:30:42

after:

composer --version
PHP 7.4.30 (cli) (built: Aug  9 2022 17:56:39) ( NTS )
Copyright (c) The PHP Group

composer -h       
Usage: php [options] [-f] <file> [--] [args...]

Should be fixed, I dropped the -f from /usr/bin/composer${_php_version}

TinfoilSubmarine · 2022-08-29T12:49:47Z

So, the one thing that I'm unsure of is for composer. Currently, there is a package for each PHP version with a shim script to invoke composer with the right interpreter:

void-packages/srcpkgs/composer8.0/files/composer8.0

Line 2 in b1800a9

php8.0 /usr/libexec/composer.phar8.0 "$@"

void-packages/srcpkgs/composer8.1/files/composer8.1

Line 2 in b1800a9

php8.1 /usr/libexec/composer.phar8.1 "$@"

This could also be handled by having a single composer package with the shim script, but call php which is handled by alternatives. But I think that may be confusing since it isn't as explicit.

TinfoilSubmarine · 2022-08-30T18:42:13Z

So, the one thing that I'm unsure of is for composer. Currently, there is a package for each PHP version with a shim script to invoke composer with the right interpreter:

void-packages/srcpkgs/composer8.0/files/composer8.0

Line 2 in b1800a9

php8.0 /usr/libexec/composer.phar8.0 "$@"

void-packages/srcpkgs/composer8.1/files/composer8.1

Line 2 in b1800a9

php8.1 /usr/libexec/composer.phar8.1 "$@"

This could also be handled by having a single composer package with the shim script, but call php which is handled by alternatives. But I think that may be confusing since it isn't as explicit.

After thinking about this, I think that it's best to keep the separate composer packages, since collapsing into one and relying on xbps-alternatives to choose a php version restricts the utility of having alternatives in the first place. If I want to have both a PHP 8.0 and 8.1 installation on a single machine, I would still like to be able to use composer with both 8.0 and 8.1.

srcpkgs/composer/template

paper42 · 2022-11-27T10:33:15Z

I think it would be nice to make every package depend on a specific version that's the last supported one.

TinfoilSubmarine · 2022-12-01T13:15:18Z

Anything else needed for this? 7.4 is officially EOL now

srcpkgs/composer8.1/template

srcpkgs/php8.0/template

srcpkgs/xdebug8.1/template

paper42 · 2022-12-04T13:52:26Z

srcpkgs/php8.1/template

+php-fpm_package() {
+	depends="${sourcepkg}-fpm"
+	build_style=meta
+	short_desc="PHP FastCGI Process Manager meta package"


I can imagine that people will be confused by these meta packages a bit - they will install php-fpm, enable the php8.1-fpm service and then on an update php will be updated to 8.2 and php-fpm will be orphaned and removed. Do you think we could somehow clarify that php-* packages will move in short_desc or even as a page in void-docs?

I think something like that could be helpful. Probably want a page since it's fairly easy to miss a short_desc if you just do xi php-fpm. Reminds me of #38306

OK, I opened void-linux/void-docs#731

srcpkgs/php-meta/template

srcpkgs/php8.1/template

srcpkgs/composer8.0/template

7.4 is EOL, so pull all packages into a single location to enable easier version transitions fix symlinks

jchook · 2023-04-08T03:34:52Z

@TinfoilSubmarine thank you very much my man. Very appreciative of this much-needed change! Also very educational to read the PR as well.

TinfoilSubmarine force-pushed the maint/php branch from 471ceed to efda04b Compare August 9, 2022 18:43

TinfoilSubmarine mentioned this pull request Aug 24, 2022

php8.0: update to 8.0.22. php8.1: update to 8.1.9. composer8.[01]: update to 2.4.1. #38893

Merged

TinfoilSubmarine changed the title ~~php/php8.0/php8.1 and composer/composer8.0/composer8.1: add alternatives groups.~~ [NOMERGE] php/composer: turn into meta package as 7.4 is EOL; php8.[01] and composer8.[01]: add alternatives groups. Aug 29, 2022

TinfoilSubmarine force-pushed the maint/php branch from efda04b to fcbf961 Compare August 29, 2022 12:37

TinfoilSubmarine changed the title ~~[NOMERGE] php/composer: turn into meta package as 7.4 is EOL; php8.[01] and composer8.[01]: add alternatives groups.~~ [WIP] [NOMERGE] php/composer: turn into meta package as 7.4 is EOL; php8.[01] and composer8.[01]: add alternatives groups. Aug 29, 2022

TinfoilSubmarine force-pushed the maint/php branch 5 times, most recently from 07ee36f to fb6fe09 Compare August 29, 2022 14:57

paper42 reviewed Aug 30, 2022

View reviewed changes

srcpkgs/composer/template Outdated Show resolved Hide resolved

TinfoilSubmarine force-pushed the maint/php branch from fb6fe09 to 533ce6a Compare August 31, 2022 12:41

TinfoilSubmarine mentioned this pull request Sep 1, 2022

phpMyAdmin: update to 5.2.0, use mariadb, change maintainer #39030

Closed

classabbyamp marked this pull request as draft September 22, 2022 07:11

TinfoilSubmarine force-pushed the maint/php branch from 533ce6a to de357bc Compare November 17, 2022 14:33

TinfoilSubmarine force-pushed the maint/php branch from de357bc to 552a09c Compare November 28, 2022 20:01

TinfoilSubmarine changed the title ~~[WIP] [NOMERGE] php/composer: turn into meta package as 7.4 is EOL; php8.[01] and composer8.[01]: add alternatives groups.~~ php/composer: turn into meta package as 7.4 is EOL; php8.[01] and composer8.[01]: add alternatives groups. Nov 28, 2022

TinfoilSubmarine marked this pull request as ready for review November 28, 2022 20:01

paper42 reviewed Dec 4, 2022

View reviewed changes

TinfoilSubmarine force-pushed the maint/php branch from 552a09c to 72af78c Compare December 6, 2022 17:34

paper42 reviewed Dec 6, 2022

View reviewed changes

srcpkgs/php-meta/template Outdated Show resolved Hide resolved

srcpkgs/php8.1/template Outdated Show resolved Hide resolved

TinfoilSubmarine force-pushed the maint/php branch from 72af78c to 445fd49 Compare December 7, 2022 14:25

TinfoilSubmarine mentioned this pull request Dec 8, 2022

config/php.md: new PHP docs to help users with the php metapackage transition void-linux/void-docs#731

Merged

TinfoilSubmarine force-pushed the maint/php branch from 445fd49 to c9944b4 Compare January 20, 2023 15:38

TinfoilSubmarine mentioned this pull request Feb 15, 2023

php8.0: patch for openssl3 #42231

Closed

TinfoilSubmarine force-pushed the maint/php branch from c9944b4 to 662df16 Compare February 15, 2023 19:29

TinfoilSubmarine force-pushed the maint/php branch from 662df16 to 3d99e75 Compare March 1, 2023 13:23

paper42 approved these changes Mar 1, 2023

View reviewed changes

paper42 reviewed Mar 2, 2023

View reviewed changes

srcpkgs/composer8.0/template Show resolved Hide resolved

TinfoilSubmarine added 7 commits March 2, 2023 16:56

php: turn into meta package.

a038d53

7.4 is EOL, so pull all packages into a single location to enable easier version transitions fix symlinks

php8.0: add php alternatives group.

dbb50ca

php8.1: add php alternatives group.

9c74ae5

composer8.0: add composer alternatives group.

e20d64d

composer8.1: add composer alternatives group.

6c666d7

phoronix-test-suite: depend on php8.1.

e2b84c7

phpMyAdmin: depend on php8.1.

515ba17

TinfoilSubmarine force-pushed the maint/php branch from 3d99e75 to 515ba17 Compare March 2, 2023 21:58

paper42 merged commit 4e83b32 into void-linux:master Mar 4, 2023

php/composer: turn into meta package as 7.4 is EOL; php8.[01] and composer8.[01]: add alternatives groups. #38536

php/composer: turn into meta package as 7.4 is EOL; php8.[01] and composer8.[01]: add alternatives groups. #38536

Uh oh!

Conversation

TinfoilSubmarine commented Aug 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Should not be merged until PHP 7.4 EOL (28 Nov 2022): https://www.php.net/supported-versions.php

Testing the changes

Uh oh!

paper42 commented Aug 8, 2022

Uh oh!

Chocimier commented Aug 9, 2022

Uh oh!

TinfoilSubmarine commented Aug 9, 2022

Uh oh!

TinfoilSubmarine commented Aug 29, 2022

Uh oh!

TinfoilSubmarine commented Aug 30, 2022

Uh oh!

Uh oh!

paper42 commented Nov 27, 2022

Uh oh!

TinfoilSubmarine commented Dec 1, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

paper42 Dec 4, 2022

Choose a reason for hiding this comment

Uh oh!

TinfoilSubmarine Dec 6, 2022

Choose a reason for hiding this comment

Uh oh!

TinfoilSubmarine Dec 8, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jchook commented Apr 8, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

TinfoilSubmarine commented Aug 8, 2022 •

edited

Loading