Merge branch 'develop' for v1.10.0

Author: mrrobot47

src/PHP.php

@@ -81,9 +81,9 @@ public function __construct() {
 	 * : Create separate db container instead of using global db.
 	 *
 	 * [--php=<php-version>]
-	 * : PHP version for site. Currently only supports PHP 5.6, 7.0, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4 and latest.
+	 * : PHP version for site. Currently only supports PHP 5.6, 7.0, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5, and latest.
 	 * ---
-	 * default: 8.3
+	 * default: 8.4
 	 * options:
 	 *	- 5.6
 	 *	- 7.0
@@ -95,6 +95,7 @@ public function __construct() {
 	 *	- 8.2
 	 *	- 8.3
 	 *	- 8.4
+	 *  - 8.5
 	 *	- latest
 	 * ---
 	 *
@@ -229,7 +230,7 @@ public function create( $args, $assoc_args ) {
 		}
 		$this->site_data['alias_domains'] = substr( $this->site_data['alias_domains'], 0, - 1 );
 
-		$supported_php_versions = [ 5.6, 7.0, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 'latest' ];
+		$supported_php_versions = [ 5.6, 7.0, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5, 'latest' ];
 		if ( ! in_array( $this->site_data['php_version'], $supported_php_versions ) ) {
 			$old_version = $this->site_data['php_version'];
 			$floor       = (int) floor( $this->site_data['php_version'] );
@@ -239,7 +240,7 @@ public function create( $args, $assoc_args ) {
 				$this->site_data['php_version'] = 7.4;
 				$old_version                    .= ' yet';
 			} elseif ( 8 === $floor ) {
-				$this->site_data['php_version'] = 8.3;
+				$this->site_data['php_version'] = 8.4;
 				$old_version                    .= ' yet';
 			} else {
 				EE::error( 'Unsupported PHP version: ' . $this->site_data['php_version'] );

src/Site_PHP_Docker.php

@@ -65,7 +65,7 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {
 			$db['networks']     = $network_default;
 		}
 		// PHP configuration.
-		$php_image_key = ( 'latest' === $filters['php_version'] ? 'easyengine/php8.3' : 'easyengine/php' . $filters['php_version'] );
+		$php_image_key = ( 'latest' === $filters['php_version'] ? 'easyengine/php8.4' : 'easyengine/php' . $filters['php_version'] );
 
 		$php['service_name'] = [ 'name' => 'php' ];
 		$php['image']        = [ 'name' => $php_image_key . ':' . $img_versions[ $php_image_key ] ];