Merge branch 'main' into new/polls

Author: BentiGorlich

composer.lock

@@ -19,8 +19,8 @@ You can start with a smaller server and add more resources later if you are usin
 
 ## Software Requirements
 
-- Debian 12 or Ubuntu 22.04 LTS or later
-- PHP v8.3 or higher
+- Debian 12 or Ubuntu 24.04 LTS or later
+- PHP v8.5 or higher
 - NodeJS v22 or higher
 - Valkey / KeyDB / Redis (pick one)
 - PostgreSQL
@@ -49,7 +49,7 @@ Install prequirements:
 sudo apt-get install lsb-release ca-certificates curl wget unzip gnupg apt-transport-https software-properties-common python3-launchpadlib git redis-server postgresql postgresql-contrib nginx acl -y
 ```
 
-On **Ubuntu 22.04 LTS** or older, prepare latest PHP package repositoy (8.4) by using a Ubuntu PPA (this step is optional for Ubuntu 23.10 or later) via:
+On **Ubuntu 24.04 LTS** or older, prepare latest PHP package repositoy (8.5) by using a Ubuntu PPA (this step is optional for Ubuntu 24.10 or later) via:
 
 ```bash
 sudo add-apt-repository ppa:ondrej/php -y
@@ -64,15 +64,15 @@ sudo dpkg -i /tmp/debsuryorg-archive-keyring.deb
 sudo sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
 ```
 
-Install _PHP 8.4_ with the required additional PHP extensions:
+Install _PHP 8.5_ with the required additional PHP extensions:
 
 ```bash
 sudo apt-get update
-sudo apt-get install php8.4 php8.4-common php8.4-fpm php8.4-cli php8.4-amqp php8.4-bcmath php8.4-pgsql php8.4-gd php8.4-curl php8.4-xml php8.4-redis php8.4-mbstring php8.4-zip php8.4-bz2 php8.4-intl php8.4-bcmath -y
+sudo apt-get install php8.5 php8.5-common php8.5-fpm php8.5-cli php8.5-amqp php8.5-bcmath php8.5-pgsql php8.5-gd php8.5-curl php8.5-xml php8.5-redis php8.5-mbstring php8.5-zip php8.5-bz2 php8.5-intl php8.5-bcmath -y
 ```
 
 > [!NOTE]
-> If you are upgrading to PHP 8.3 from an older version, please re-review the [PHP configuration](#php) section of this guide as existing `ini` settings are NOT automatically copied to new versions. Additionally review which php-fpm version is configured in your Nginx site.
+> If you are upgrading to PHP 8.5 from an older version, please re-review the [PHP configuration](#php) section of this guide as existing `ini` settings are NOT automatically copied to new versions. Additionally review which php-fpm version is configured in your Nginx site.
 
 > [!IMPORTANT]
 > **Never** even install `xdebug` PHP extension in production environments. Even if you don't enabled it but only installed `xdebug` can give massive performance issues.
@@ -220,7 +220,7 @@ MERCURE_JWT_SECRET="{!SECRET!!KEY!-32_3-!}"
 # Configure your media URL correctly:
 KBIN_STORAGE_URL=https://domain.tld/media
 
-# Ubuntu 22.04 installs PostgreSQL v14 by default, Debian 12 PostgreSQL v15 is the default
+# Ubuntu 24.04 installs PostgreSQL v16 by default, Debian 12 PostgreSQL v15 is the default
 POSTGRES_VERSION=18
 
 # Configure email, eg. using SMTP
@@ -271,7 +271,7 @@ See also: [Mbin config files](../02-configuration/01-mbin_config_files.md) for m
 Edit some PHP settings within your `php.ini` file:
 
 ```bash
-sudo nano /etc/php/8.4/fpm/php.ini
+sudo nano /etc/php/8.5/fpm/php.ini
 ```
 
 ```ini
@@ -315,7 +315,7 @@ More info: [Symfony Performance docs](https://symfony.com/doc/current/performanc
 Edit your PHP `www.conf` file as well, to increase the amount of PHP child processes (optional):
 
 ```bash
-sudo nano /etc/php/8.4/fpm/pool.d/www.conf
+sudo nano /etc/php/8.5/fpm/pool.d/www.conf
 ```
 
 With the content (these are personal preferences, adjust to your needs):
@@ -331,7 +331,7 @@ pm.max_spare_servers = 10
 Be sure to restart (or reload) the PHP-FPM service after you applied any changing to the `php.ini` file:
 
 ```bash
-sudo systemctl restart php8.4-fpm.service
+sudo systemctl restart php8.5-fpm.service
 ```
 
 ### Composer
@@ -479,13 +479,13 @@ curl -1sLf "https://keys.openpgp.org/vks/v1/by-fingerprint/0A9AF2115F4687BD29803
 sudo tee /etc/apt/sources.list.d/rabbitmq.list <<EOF
 ## Modern Erlang/OTP releases
 ##
-deb [arch=amd64 signed-by=/usr/share/keyrings/com.rabbitmq.team.gpg] https://deb1.rabbitmq.com/rabbitmq-erlang/ubuntu/jammy jammy main
-deb [arch=amd64 signed-by=/usr/share/keyrings/com.rabbitmq.team.gpg] https://deb2.rabbitmq.com/rabbitmq-erlang/ubuntu/jammy jammy main
+deb [arch=amd64 signed-by=/usr/share/keyrings/com.rabbitmq.team.gpg] https://deb1.rabbitmq.com/rabbitmq-erlang/ubuntu/noble noble main
+deb [arch=amd64 signed-by=/usr/share/keyrings/com.rabbitmq.team.gpg] https://deb2.rabbitmq.com/rabbitmq-erlang/ubuntu/noble noble main
 
 ## Latest RabbitMQ releases
 ##
-deb [arch=amd64 signed-by=/usr/share/keyrings/com.rabbitmq.team.gpg] https://deb1.rabbitmq.com/rabbitmq-server/ubuntu/jammy jammy main
-deb [arch=amd64 signed-by=/usr/share/keyrings/com.rabbitmq.team.gpg] https://deb2.rabbitmq.com/rabbitmq-server/ubuntu/jammy jammy main
+deb [arch=amd64 signed-by=/usr/share/keyrings/com.rabbitmq.team.gpg] https://deb1.rabbitmq.com/rabbitmq-server/ubuntu/noble noble main
+deb [arch=amd64 signed-by=/usr/share/keyrings/com.rabbitmq.team.gpg] https://deb2.rabbitmq.com/rabbitmq-server/ubuntu/noble noble main
 EOF
 
 ## Update package indices

docs/02-admin/01-installation/01-bare_metal.md

@@ -185,7 +185,7 @@ Followed by restarting the services that are depending on the (new) configuratio
 
 ```bash
 # Clear PHP Opcache by restarting the PHP FPM service
-sudo systemctl restart php8.4-fpm.service
+sudo systemctl restart php8.5-fpm.service
 
 # Restarting the PHP messenger jobs and Mercure service (also reread the latest configuration)
 sudo supervisorctl reread && sudo supervisorctl update && sudo supervisorctl restart all

docs/02-admin/FAQ.md

@@ -97,7 +97,7 @@ For more information, read the [Testing](#testing) section on this page.
 
 Requirements:
 
-- PHP v8.3 or higher
+- PHP v8.5 or higher
 - NodeJS v20 or higher
 - Valkey / KeyDB / Redis (pick one)
 - PostgreSQL
@@ -135,18 +135,18 @@ git clone git@github.com:MbinOrg/mbin.git
 1. Install PHP + additional PHP extensions:
 
 ```sh
-sudo apt install php8.4 php8.4-common php8.4-fpm php8.4-cli php8.4-amqp php8.4-bcmath php8.4-pgsql php8.4-gd php8.4-curl php8.4-xml php8.4-redis php8.4-mbstring php8.4-zip php8.4-bz2 php8.4-intl php8.4-bcmath -y
+sudo apt install php8.5 php8.5-common php8.5-fpm php8.5-cli php8.5-amqp php8.5-bcmath php8.5-pgsql php8.5-gd php8.5-curl php8.5-xml php8.5-redis php8.5-mbstring php8.5-zip php8.5-bz2 php8.5-intl php8.5-bcmath -y
 ```
 
 2. Fine-tune PHP settings:
 
-- Increase execution time in PHP config file: `/etc/php/8.4/fpm/php.ini`:
+- Increase execution time in PHP config file: `/etc/php/8.5/fpm/php.ini`:
 
 ```ini
 max_execution_time = 120
 ```
 
-- _Optional:_ Increase/set max_nesting_level in `/etc/php/8.4/fpm/conf.d/20-xdebug.ini` (in case you have the `xdebug` extension installed):
+- _Optional:_ Increase/set max_nesting_level in `/etc/php/8.5/fpm/conf.d/20-xdebug.ini` (in case you have the `xdebug` extension installed):
 
 ```ini
 xdebug.max_nesting_level=512
@@ -155,7 +155,7 @@ xdebug.max_nesting_level=512
 3. Restart the PHP-FPM service:
 
 ```sh
-sudo systemctl restart php8.4-fpm.service
+sudo systemctl restart php8.5-fpm.service
 ```
 
 ### Prepare PostgreSQL DB
@@ -315,19 +315,19 @@ For more info read: [Symfony Testing guide](https://symfony.com/doc/current/test
 
 ### Prepare testing
 
-1. First increase execution time in your PHP config file: `/etc/php/8.4/fpm/php.ini`:
+1. First increase execution time in your PHP config file: `/etc/php/8.5/fpm/php.ini`:
 
 ```ini
 max_execution_time = 120
 ```
 
-2. _Optional:_ Increase/set max_nesting_level in `/etc/php/8.4/fpm/conf.d/20-xdebug.ini` (in case you have the `xdebug` extension installed):
+2. _Optional:_ Increase/set max_nesting_level in `/etc/php/8.5/fpm/conf.d/20-xdebug.ini` (in case you have the `xdebug` extension installed):
 
 ```ini
 xdebug.max_nesting_level=512
 ```
 
-3. Restart the PHP-FPM service: `sudo systemctl restart php8.4-fpm.service`
+3. Restart the PHP-FPM service: `sudo systemctl restart php8.5-fpm.service`
 4. Copy the dot env file (if you haven't already): `cp .env.example .env`
 5. Install composer packages: `composer install --no-scripts`