Merge remote-tracking branch 'origin/main' into 11.x

Author: mstrelan

Makefile

@@ -7,7 +7,7 @@ endif
 DRUSH=$(EXEC) ./bin/drush
 DRUSH_INSTALL=$(DRUSH) -y site:install --account-pass=password
 GIT_SWITCH=cd app && git switch
-PHP_VERSION=8.0
+PHP_VERSION=8.2
 
 clean: composer minimal login
 
@@ -47,15 +47,15 @@ switch:
 	$(GIT_SWITCH) 9.4.x
 	make clean
 
-9.5: php8.0
+9.5: php8.1
 	$(GIT_SWITCH) 9.5.x
 	make clean
 
 10.0: php8.1
 	$(GIT_SWITCH) 10.0.x
 	make clean
 
-10.1: php8.1
+10.1: php8.2
 	$(GIT_SWITCH) 10.1.x
 	make clean