Merge branch 'v16-branch' into backport-634-to-v16-branch

humanmade · Nov 14, 2023 · 964e0f4 · 964e0f4
2 parents f22a0d0 + 23684d6
commit 964e0f4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/docker/php.ini b/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
diff --git a/docker/xdebug.ini b/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
diff --git a/inc/composer/class-docker-compose-generator.php b/inc/composer/class-docker-compose-generator.php
@@ -155,12 +155,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',