Merge pull request #58 from magento-commerce/MCLOUD-7984

shiftedreality · web-flow · commit e5f371892753 · 2021-07-29T11:08:49.000-10:00
MCLOUD-7984: Upgrade xDebug extension version
diff --git a/images/php/7.2-cli/Dockerfile b/images/php/7.2-cli/Dockerfile
@@ -127,7 +127,7 @@ RUN pecl install -o -f \
   raphf \
   redis \
   ssh2-1.1.2 \
-  xdebug-2.6.1 \
+  xdebug-3.0.4 \
   yaml
 
 RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
diff --git a/images/php/7.2-cli/etc/php-xdebug.ini b/images/php/7.2-cli/etc/php-xdebug.ini
@@ -1,8 +1,8 @@
 ; Xdebug settings will only kick in if the Xdebug module is loaded
-xdebug.remote_enable = 1
-xdebug.remote_port = 9001
-xdebug.remote_autostart = 0
-xdebug.remote_connect_back = 0
-xdebug.scream = 0
+xdebug.mode = debug
+xdebug.client_port = 9001
+xdebug.start_with_request = trigger
+xdebug.discover_client_host = false
+xdebug.scream = false
 xdebug.show_local_vars = 1
 xdebug.idekey = PHPSTORM
diff --git a/images/php/7.2-fpm/Dockerfile b/images/php/7.2-fpm/Dockerfile
@@ -105,7 +105,7 @@ RUN pecl install -o -f \
   raphf \
   redis \
   ssh2-1.1.2 \
-  xdebug-2.6.1 \
+  xdebug-3.0.4 \
   yaml
 
 RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
diff --git a/images/php/7.2-fpm/etc/php-xdebug.ini b/images/php/7.2-fpm/etc/php-xdebug.ini
@@ -1,8 +1,8 @@
 ; Xdebug settings will only kick in if the Xdebug module is loaded
-xdebug.remote_enable = 1
-xdebug.remote_port = 9001
-xdebug.remote_autostart = 0
-xdebug.remote_connect_back = 0
-xdebug.scream = 0
+xdebug.mode = debug
+xdebug.client_port = 9001
+xdebug.start_with_request = trigger
+xdebug.discover_client_host = false
+xdebug.scream = false
 xdebug.show_local_vars = 1
 xdebug.idekey = PHPSTORM
diff --git a/images/php/7.3-cli/Dockerfile b/images/php/7.3-cli/Dockerfile
@@ -124,7 +124,7 @@ RUN pecl install -o -f \
   propro \
   raphf \
   redis \
-  xdebug-2.7.1 \
+  xdebug-3.0.4 \
   yaml
 
 RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
diff --git a/images/php/7.3-cli/etc/php-xdebug.ini b/images/php/7.3-cli/etc/php-xdebug.ini
@@ -1,8 +1,8 @@
 ; Xdebug settings will only kick in if the Xdebug module is loaded
-xdebug.remote_enable = 1
-xdebug.remote_port = 9001
-xdebug.remote_autostart = 0
-xdebug.remote_connect_back = 0
-xdebug.scream = 0
+xdebug.mode = debug
+xdebug.client_port = 9001
+xdebug.start_with_request = trigger
+xdebug.discover_client_host = false
+xdebug.scream = false
 xdebug.show_local_vars = 1
 xdebug.idekey = PHPSTORM
diff --git a/images/php/7.3-fpm/Dockerfile b/images/php/7.3-fpm/Dockerfile
@@ -102,7 +102,7 @@ RUN pecl install -o -f \
   propro \
   raphf \
   redis \
-  xdebug-2.7.1 \
+  xdebug-3.0.4 \
   yaml
 
 RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
diff --git a/images/php/7.3-fpm/etc/php-xdebug.ini b/images/php/7.3-fpm/etc/php-xdebug.ini
@@ -1,8 +1,8 @@
 ; Xdebug settings will only kick in if the Xdebug module is loaded
-xdebug.remote_enable = 1
-xdebug.remote_port = 9001
-xdebug.remote_autostart = 0
-xdebug.remote_connect_back = 0
-xdebug.scream = 0
+xdebug.mode = debug
+xdebug.client_port = 9001
+xdebug.start_with_request = trigger
+xdebug.discover_client_host = false
+xdebug.scream = false
 xdebug.show_local_vars = 1
 xdebug.idekey = PHPSTORM
diff --git a/images/php/7.4-cli/Dockerfile b/images/php/7.4-cli/Dockerfile
@@ -114,7 +114,7 @@ RUN pecl install -o -f \
   propro \
   raphf \
   redis \
-  xdebug-2.9.8 \
+  xdebug-3.0.4 \
   yaml
 
 RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
diff --git a/images/php/7.4-cli/etc/php-xdebug.ini b/images/php/7.4-cli/etc/php-xdebug.ini
@@ -1,8 +1,8 @@
 ; Xdebug settings will only kick in if the Xdebug module is loaded
-xdebug.remote_enable = 1
-xdebug.remote_port = 9001
-xdebug.remote_autostart = 0
-xdebug.remote_connect_back = 0
-xdebug.scream = 0
+xdebug.mode = debug
+xdebug.client_port = 9001
+xdebug.start_with_request = trigger
+xdebug.discover_client_host = false
+xdebug.scream = false
 xdebug.show_local_vars = 1
 xdebug.idekey = PHPSTORM
diff --git a/images/php/7.4-fpm/Dockerfile b/images/php/7.4-fpm/Dockerfile
@@ -92,7 +92,7 @@ RUN pecl install -o -f \
   propro \
   raphf \
   redis \
-  xdebug-2.9.8 \
+  xdebug-3.0.4 \
   yaml
 
 RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
diff --git a/images/php/7.4-fpm/etc/php-xdebug.ini b/images/php/7.4-fpm/etc/php-xdebug.ini
@@ -1,8 +1,8 @@
 ; Xdebug settings will only kick in if the Xdebug module is loaded
-xdebug.remote_enable = 1
-xdebug.remote_port = 9001
-xdebug.remote_autostart = 0
-xdebug.remote_connect_back = 0
-xdebug.scream = 0
+xdebug.mode = debug
+xdebug.client_port = 9001
+xdebug.start_with_request = trigger
+xdebug.discover_client_host = false
+xdebug.scream = false
 xdebug.show_local_vars = 1
 xdebug.idekey = PHPSTORM
diff --git a/images/php/cli/etc/php-xdebug-3.ini b/images/php/cli/etc/php-xdebug-3.ini
diff --git a/images/php/cli/etc/php-xdebug-7.0.ini b/images/php/cli/etc/php-xdebug-7.0.ini
diff --git a/images/php/fpm/etc/php-xdebug-3.ini b/images/php/fpm/etc/php-xdebug-3.ini
diff --git a/images/php/fpm/etc/php-xdebug-7.0.ini b/images/php/fpm/etc/php-xdebug-7.0.ini
diff --git a/src/Compose/Php/ConfigFilesResolver.php b/src/Compose/Php/ConfigFilesResolver.php
@@ -35,12 +35,8 @@ class ConfigFilesResolver
                 ],
             ],
             'xdebug' => [
-                '>=7.0 <8.0' => [
-                    self::FROM_PATH => 'etc/php-xdebug-7.0.ini',
-                    self::TO_PATH => 'etc/php-xdebug.ini',
-                ],
-                '>=8.0' => [
-                    self::FROM_PATH => 'etc/php-xdebug-8.0.ini',
+                '>=7.2' => [
+                    self::FROM_PATH => 'etc/php-xdebug-3.ini',
                     self::TO_PATH => 'etc/php-xdebug.ini',
                 ],
             ],
@@ -71,12 +67,8 @@ class ConfigFilesResolver
                 ],
             ],
             'xdebug' => [
-                '>=7.0 <8.0' => [
-                    self::FROM_PATH => 'etc/php-xdebug-7.0.ini',
-                    self::TO_PATH => 'etc/php-xdebug.ini',
-                ],
-                '>=8.0' => [
-                    self::FROM_PATH => 'etc/php-xdebug-8.0.ini',
+                '>=7.2' => [
+                    self::FROM_PATH => 'etc/php-xdebug-3.ini',
                     self::TO_PATH => 'etc/php-xdebug.ini',
                 ],
             ],
diff --git a/src/Compose/Php/ExtensionResolver.php b/src/Compose/Php/ExtensionResolver.php
@@ -410,21 +410,7 @@ public static function getConfig(): array
                 ],
             ],
             'xdebug' => [
-                '>=7.0 <7.3' => [
-                    self::EXTENSION_TYPE => self::EXTENSION_TYPE_PECL,
-                    // https://intellij-support.jetbrains.com/hc/en-us/community/posts/360003310760-XDebug-not-working-anymore
-                    // https://intellij-support.jetbrains.com/hc/en-us/community/posts/360003410140-PHPStorm-with-PHP7-3-and-xdebug-2-7-0
-                    self::EXTENSION_PACKAGE_NAME => 'xdebug-2.6.1',
-                ],
-                '>=7.3 <7.4' => [
-                    self::EXTENSION_TYPE => self::EXTENSION_TYPE_PECL,
-                    self::EXTENSION_PACKAGE_NAME => 'xdebug-2.7.1',
-                ],
-                '>=7.4 <8.0' => [
-                    self::EXTENSION_TYPE => self::EXTENSION_TYPE_PECL,
-                    self::EXTENSION_PACKAGE_NAME => 'xdebug-2.9.8',
-                ],
-                '>=8.0' => [
+                '>=7.2' => [
                     self::EXTENSION_TYPE => self::EXTENSION_TYPE_PECL,
                     self::EXTENSION_PACKAGE_NAME => 'xdebug-3.0.4',
                 ],
