MCLOUD-11525: Fix xDebug version and constrains for python3-yaml

Author: BaDos

images/php/8.3-cli/Dockerfile

@@ -72,10 +72,11 @@ RUN apt-get update \
   libyaml-dev \
   libzip-dev \
   zip \
+  python3-yaml \
   && rm -rf /var/lib/apt/lists/*
 
 # Install Python packages
-RUN pip3 install --upgrade setuptools && pip3 install pyyaml
+
 
 # Install Grunt
 RUN npm install -g grunt-cli
@@ -123,8 +124,7 @@ RUN pecl install -o -f \
   pcov \
   raphf \
   redis \
-  xdebug-3.2.0 \
-  xdebug-3.2.0 \
+  xdebug-3.3.0 \
   xmlrpc-1.0.0RC3 \
   yaml
 

images/php/8.3-fpm/Dockerfile

@@ -53,6 +53,7 @@ RUN apt-get update \
   libyaml-dev \
   libzip-dev \
   zip \
+  python3-yaml \
   && rm -rf /var/lib/apt/lists/*
 
 # Install MailHog
@@ -98,8 +99,7 @@ RUN pecl install -o -f \
   pcov \
   raphf \
   redis \
-  xdebug-3.2.0 \
-  xdebug-3.2.0 \
+  xdebug-3.3.0 \
   xmlrpc-1.0.0RC3 \
   yaml
 

src/Command/Image/GeneratePhp.php

@@ -287,7 +287,7 @@ private function buildDockerfile(string $dockerfile, string $phpVersion, string
             }
         }
 
-        if ($this->semver::satisfies($phpVersion, '8.3.*')) {
+        if ($this->semver::satisfies($phpVersion, '>=8.2')) {
             $packages[] = 'python3-yaml';
             $pythonPackages = '';
         } else {

src/Compose/Php/ExtensionResolver.php

@@ -429,7 +429,7 @@ public static function getConfig(): array
                 ],
                 '>=8.2 <8.3' => [
                     self::EXTENSION_TYPE => self::EXTENSION_TYPE_PECL,
-                    self::EXTENSION_PACKAGE_NAME => 'xdebug-3.3.0',
+                    self::EXTENSION_PACKAGE_NAME => 'xdebug-3.2.0',
                 ],
                 '>=8.3' => [
                     self::EXTENSION_TYPE => self::EXTENSION_TYPE_PECL,