Merge branch 'L0RD-ZER0-develop' into develop

Author: mrrobot47

.github/workflows/test_and_build.yml

@@ -92,7 +92,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
     steps:
     - name: Check out source code
       uses: actions/checkout@v3

img-versions.json

@@ -15,6 +15,7 @@
     "easyengine/php8.2": "v4.9.1",
     "easyengine/php8.3": "v4.9.1",
     "easyengine/php8.4": "v4.9.1",
+    "easyengine/php8.5": "v4.10.0",
     "easyengine/postfix": "v4.8.1",
     "easyengine/redis": "v4.9.1",
     "easyengine/newrelic-daemon": "v4.9.0"

php/EE/Migration/Containers.php

@@ -39,6 +39,7 @@ public static function start_container_migration() {
 			'easyengine/php8.2',
 			'easyengine/php8.3',
 			'easyengine/php8.4',
+			'easyengine/php8.5',
 			'easyengine/newrelic-daemon',
 		];
 
@@ -140,7 +141,7 @@ public static function update_docker_compose() {
 			$fs = new Filesystem();
 			if ( ! $fs->exists( EE_BACKUP_DIR ) ) {
 				$fs->mkdir( EE_BACKUP_DIR );
-			}	
+			}
 			$fs->copy( $docker_compose_path, $docker_compose_backup_path );
 
 			EE::exec( "curl -L https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_new_path && chmod +x $docker_compose_new_path" );