Merge pull request #211 from keymanapp/maint/cherry-pick/php-84

maint: move to PHP 8.4, Apache 2.4.68 🍒

Author: mcdurdin

.htaccess

@@ -26,10 +26,10 @@ php_value display_startup_errors off
 # Keymanweb.com 2.0 rewrite rules for Keymanweb.com 1.0 /go/lang/kbd urls
 
 # Rewrite /go/lang/kbd/app[?...] to /?kmwlang=lang,kmwkbd=kbd
-RewriteRule "^go/([^/]+)/([^/]+)/([^?]+)(\?)?(.+)?$" "/index.php?kmwlang=$1&kmwkbd=Keyboard_$2&$5"
+RewriteRule "^go/([^/]+)/([^/]+)/([^?]+)(\?)?(.+)?$" "/index.php?kmwlang=$1&kmwkbd=Keyboard_$2&$5" [BCTLS]
 
 # Rewrite /go/lang/kbd[?...] to /?kmwlang=lang,kmwkbd=kbd
-RewriteRule "^go/([^/]+)/([^?]+)(\?)?(.+)?$" "/index.php?kmwlang=$1&kmwkbd=Keyboard_$2&$4"
+RewriteRule "^go/([^/]+)/([^?]+)(\?)?(.+)?$" "/index.php?kmwlang=$1&kmwkbd=Keyboard_$2&$4" [BCTLS]
 
 # Keymanweb.com 2.0 rewrite rules for Keymanweb.com 1.0 /lang/app.php urls
 

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM php:7.4-apache@sha256:c9d7e608f73832673479770d66aacc8100011ec751d1905ff63fae3fe2e0ca6d AS composer-builder
+FROM php:8.4-apache@sha256:51da594c844a97f31b1cd6b1ac6660982f40788f4fe13e75f7fd39e2f9b58651 AS composer-builder
 
 # Install Zip to use composer
 RUN apt-get update && apt-get install -y \
@@ -18,7 +18,7 @@ COPY composer.* /composer/
 RUN composer install
 
 # Site
-FROM php:7.4-apache@sha256:c9d7e608f73832673479770d66aacc8100011ec751d1905ff63fae3fe2e0ca6d
+FROM php:8.4-apache@sha256:51da594c844a97f31b1cd6b1ac6660982f40788f4fe13e75f7fd39e2f9b58651
 COPY resources/keyman-site.conf /etc/apache2/conf-available/
 RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 RUN chown -R www-data:www-data /var/www/html/

build.sh

@@ -30,6 +30,8 @@ builder_describe \
   start \
   stop \
   test \
+  "composer-start  Start a temporary container to maintain composer" \
+  "composer-stop   Stop and cleanup temporary container for maintaining composer" \
   "--no-unit-test" \
   "--no-lint" \
   "--no-link-check"
@@ -43,3 +45,6 @@ builder_run_action build      build_docker_container $KEYMANWEB_IMAGE_NAME $KEYM
 builder_run_action start      start_docker_container $KEYMANWEB_IMAGE_NAME $KEYMANWEB_CONTAINER_NAME $KEYMANWEB_CONTAINER_DESC $HOST_KEYMANWEB_COM $PORT_KEYMANWEB_COM $BUILDER_CONFIGURATION
 
 builder_run_action test       test_docker_container  $KEYMANWEB_CONTAINER_DESC $PORT_KEYMANWEB_COM /
+
+builder_run_action composer-start   docker_build_and_start_composer_container
+builder_run_action composer-stop    docker_stop_and_cleanup_composer_container

composer.json

@@ -3,10 +3,10 @@
     "require": {
         "sentry/sdk": "^3.1"
     },
-    "require-dev": {
-        "phpunit/phpunit": "^9.2"
-    },
     "config": {
         "allow-plugins": false
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.6"
     }
 }