Bump upstream to PHP8.1-rc1 and xdebug.max_nesting_level=1000 (#3256)

* Use xdebug.max_nesting_level=1000 for TYPO3 * Try to simplify TestComposer with easier options on perms
ddev · Sep 24, 2021 · b8d9344 · b8d9344
1 parent c177e05
commit b8d9344
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 12 deletions.
diff --git a/containers/ddev-webserver/Dockerfile b/containers/ddev-webserver/Dockerfile
@@ -3,7 +3,7 @@
 ### Build ddev-php-base from ddev-webserver-base
 ### ddev-php-base is the basic of ddev-php-prod
 ### and ddev-webserver-* (For DDEV-Local)
-FROM drud/ddev-php-base:v1.18.0-rc1.1 as ddev-webserver-base
+FROM drud/ddev-php-base:v1.18.0-rc3.1 as ddev-webserver-base
 
 ENV BACKDROP_DRUSH_VERSION=1.4.0
 ENV MKCERT_VERSION=v1.4.6

diff --git a/containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/mods-available/xdebug.ini
@@ -3,4 +3,4 @@ xdebug.remote_enable=1
 xdebug.remote_host=host.docker.internal
 xdebug.remote_autostart=1
 xdebug.remote_port=9000
-xdebug.max_nesting_level=512
+xdebug.max_nesting_level=1000
diff --git a/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/mods-available/xdebug.ini
@@ -3,4 +3,4 @@ xdebug.remote_enable=1
 xdebug.remote_host=host.docker.internal
 xdebug.remote_autostart=1
 xdebug.remote_port=9000
-xdebug.max_nesting_level=512
+xdebug.max_nesting_level=1000
diff --git a/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/mods-available/xdebug.ini
@@ -3,4 +3,4 @@ xdebug.remote_enable=1
 xdebug.remote_host=host.docker.internal
 xdebug.remote_autostart=1
 xdebug.remote_port=9000
-xdebug.max_nesting_level=512
+xdebug.max_nesting_level=1000
diff --git a/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/mods-available/xdebug.ini
@@ -3,3 +3,4 @@ xdebug.client_host=host.docker.internal
 xdebug.client_port=9000
 xdebug.mode=debug,develop
 xdebug.start_with_request=yes
+xdebug.max_nesting_level=1000
diff --git a/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/mods-available/xdebug.ini
@@ -3,3 +3,4 @@ xdebug.client_host=host.docker.internal
 xdebug.client_port=9000
 xdebug.mode=debug,develop
 xdebug.start_with_request=yes
+xdebug.max_nesting_level=1000
diff --git a/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/mods-available/xdebug.ini
@@ -3,3 +3,4 @@ xdebug.client_host=host.docker.internal
 xdebug.client_port=9000
 xdebug.mode=debug,develop
 xdebug.start_with_request=yes
+xdebug.max_nesting_level=1000
diff --git a/containers/ddev-webserver/ddev-webserver-base-files/etc/php/8.0/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/8.0/mods-available/xdebug.ini
@@ -3,3 +3,4 @@ xdebug.client_host=host.docker.internal
 xdebug.client_port=9000
 xdebug.mode=debug,develop
 xdebug.start_with_request=yes
+xdebug.max_nesting_level=1000
diff --git a/containers/ddev-webserver/ddev-webserver-base-files/etc/php/8.1/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/8.1/mods-available/xdebug.ini
@@ -3,3 +3,4 @@ xdebug.client_host=host.docker.internal
 xdebug.client_port=9000
 xdebug.mode=debug,develop
 xdebug.start_with_request=yes
+xdebug.max_nesting_level=1000
diff --git a/pkg/ddevapp/composer_test.go b/pkg/ddevapp/composer_test.go
@@ -4,11 +4,9 @@ import (
 	"github.com/drud/ddev/pkg/ddevapp"
 	"github.com/drud/ddev/pkg/fileutil"
 	"github.com/drud/ddev/pkg/globalconfig"
-	"github.com/drud/ddev/pkg/nodeps"
 	"github.com/drud/ddev/pkg/testcommon"
 	"github.com/stretchr/testify/require"
 	"os"
-	"runtime"
 	"strings"
 	"testing"
 
@@ -75,11 +73,7 @@ func TestComposer(t *testing.T) {
 		Cmd: "ls -l vendor/bin/var-dump-server | awk '{print $1}'",
 	})
 	assert.NoError(err)
-	expect := "lrwx"
-	if runtime.GOOS == "windows" || nodeps.IsWSL2() {
-		expect = "-rwx"
-	}
-	assert.True(strings.HasPrefix(out, expect), "perms of var-dump-server should be '%s', got '%s' instead", runtime.GOOS, expect, out)
+	assert.True(strings.HasPrefix(out, "lrwx") || strings.HasPrefix(out, "-rwx"), "perms of var-dump-server should be 'lrwx' or '-rwx', got '%s' instead", out)
 
 	_, _, err = app.Exec(&ddevapp.ExecOpts{
 		Cmd: "vendor/bin/var-dump-server -h",

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -41,7 +41,7 @@ var DockerComposeFileFormatVersion = "3.6"
 var WebImg = "drud/ddev-webserver"
 
 // WebTag defines the default web image tag for drud dev
-var WebTag = "20210916_gilbertsoft_phpstatus" // Note that this can be overridden by make
+var WebTag = "20210923_xdebug_max_nesting" // Note that this can be overridden by make
 
 // DBImg defines the default db image used for applications.
 var DBImg = "drud/ddev-dbserver"