Merge pull request #644 from humanmade/backport-609-to-v16-branch

[Backport v16-branch]  Enable xdebug only when starting server with --xdebug

docker/php.ini

@@ -2,10 +2,3 @@
 
 # Set sendmail to use mailhog.
 sendmail_path = ${PHP_SENDMAIL_PATH}
-
-# XDebug
-xdebug.mode = debug
-xdebug.start_with_request = yes
-xdebug.var_display_max_children = 1024
-xdebug.var_display_max_data = -1
-xdebug.var_display_max_depth = 10

docker/xdebug.ini

@@ -0,0 +1,9 @@
+# XDebug. Only loaded with local server is started with `--xdebug`.
+zend_extension=xdebug
+
+[Xdebug]
+xdebug.mode = debug
+xdebug.start_with_request = yes
+xdebug.var_display_max_children = 1024
+xdebug.var_display_max_data = -1
+xdebug.var_display_max_depth = 10

inc/composer/class-docker-compose-generator.php

@@ -90,9 +90,9 @@ public function __construct( string $root_dir, string $project_name, string $tld
 	 */
 	protected function get_php_reusable() : array {
 		$version_map = [
-			'8.2' => 'humanmade/altis-local-server-php:8.2.3',
-			'8.1' => 'humanmade/altis-local-server-php:6.0.5',
-			'8.0' => 'humanmade/altis-local-server-php:5.0.4',
+			'8.2' => 'humanmade/altis-local-server-php:8.2.5',
+			'8.1' => 'humanmade/altis-local-server-php:6.0.7',
+			'8.0' => 'humanmade/altis-local-server-php:5.0.7',
 			'7.4' => 'humanmade/altis-local-server-php:4.2.5',
 		];
 
@@ -112,6 +112,17 @@ protected function get_php_reusable() : array {
 
 		$image = $version_map[ $version ];
 
+		$volumes = [
+			$this->get_app_volume(),
+			"{$this->config_dir}/php.ini:/usr/local/etc/php/conf.d/altis.ini",
+			'socket:/var/run/php-fpm',
+			'tmp:/tmp',
+		];
+
+		if ( $this->args['xdebug'] !== 'off' ) {
+			$volumes[] = "{$this->config_dir}/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini";
+		}
+
 		$services = [
 			'init' => true,
 			'depends_on' => [
@@ -140,12 +151,7 @@ protected function get_php_reusable() : array {
 				"proxy:s3-{$this->hostname}",
 				"proxy:s3-{$this->project_name}.localhost",
 			],
-			'volumes' => [
-				$this->get_app_volume(),
-				"{$this->config_dir}/php.ini:/usr/local/etc/php/conf.d/altis.ini",
-				'socket:/var/run/php-fpm',
-				'tmp:/tmp',
-			],
+			'volumes' => $volumes,
 			'networks' => [
 				'proxy',
 				'default',