Merge branch 'develop' for v4.4.2

Author: mrrobot47

.github/workflows/test_and_build.yml

@@ -125,11 +125,8 @@ jobs:
 
     - name: Install docker-compose
       run: |
-        VERSION=$(curl --silent "https://api.github.com/repos/docker/compose/releases/latest" |
-          grep '"tag_name":' |
-          sed -E 's/.*"([^"]+)".*/\1/'
-        )
-        sudo curl -L "https://github.com/docker/compose/releases/download/$VERSION/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+        sudo curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
+        sudo chmod +x /usr/local/bin/docker-compose
 
     - name: Install dependencies
       run: |

VERSION

@@ -1 +1 @@
-4.4.1
+4.4.2

composer.json

@@ -33,11 +33,11 @@
         "easyengine/cron-command": "v1.2.0",
         "easyengine/log-command": "v1.1.0",
         "easyengine/mailhog-command": "v1.0.2",
-        "easyengine/service-command": "v1.3.0",
+        "easyengine/service-command": "v1.3.1",
         "easyengine/shell-command": "v1.1.0",
-        "easyengine/site-command": "v2.9.1",
-        "easyengine/site-type-php": "v1.6.0",
-        "easyengine/site-type-wp": "v1.6.0",
+        "easyengine/site-command": "v2.9.2",
+        "easyengine/site-type-php": "v1.6.1",
+        "easyengine/site-type-wp": "v1.6.1",
         "monolog/monolog": "1.24.0",
         "mustache/mustache": "2.13.0",
         "rmccue/requests": "1.8.0",

composer.lock

@@ -164,8 +164,10 @@ public static function disable_support_containers() {
 		}
 
 		$command = \EE_DOCKER::docker_compose_with_custom() . ' --project-name=ee down';
-		if ( ! EE::exec( $command ) ) {
-			throw new \Exception( 'Unable to remove support container.' );
-		}
+		/**
+		 * Return code can be 1 due to error in removing network. This is expected.
+		 * TODO: Get a fix for global network / make them external so that the return code is not 1. 
+		 */
+		EE::exec( $command );
 	}
 }

php/EE/Migration/GlobalContainers.php

@@ -68,14 +68,14 @@ function add_file( $phar, $path ) {
 					'\/nb\/oxymel\/',
 					'-command\/src\/',
 					'\/ee\/[^\n]+?-command\/',
-					'\/symfony\/(?!finder|polyfill-mbstring)[^\/]+\/',
+					'\/symfony\/(?!finder|polyfill-mbstring|polyfill-ctype|polyfill-php81|polyfill-php80|polyfill-php73)[^\/]+\/',
 					'\/(?:dealerdirect|squizlabs|wimg)\/',
 				);
 			} else {
 				$strips = array(
 					'\/(?:behat|gherkin)\/src\/',
 					'\/phpunit\/',
-					'\/symfony\/(?!console|filesystem|finder|polyfill-mbstring|process|serializer|service-contracts)',
+					'\/symfony\/(?!console|filesystem|finder|polyfill-mbstring|polyfill-ctype|polyfill-php81|polyfill-php80|polyfill-php73|process|serializer|service-contracts)',
 					'\/composer\/spdx-licenses\/',
 					'\/Composer\/(?:Command\/|Compiler\.php|Console\/|Downloader\/Pear|Installer\/Pear|Question\/|Repository\/Pear|SelfUpdate\/)',
 					'\/(?:dealerdirect|squizlabs|wimg)\/',
@@ -171,6 +171,9 @@ function get_composer_versions( $current_version ) {
 	->in(EE_VENDOR_DIR . '/symfony/finder')
 	->in(EE_VENDOR_DIR . '/symfony/polyfill-mbstring')
 	->in(EE_VENDOR_DIR . '/symfony/polyfill-ctype')
+	->in(EE_VENDOR_DIR . '/symfony/polyfill-php73')
+	->in(EE_VENDOR_DIR . '/symfony/polyfill-php80')
+	->in(EE_VENDOR_DIR . '/symfony/polyfill-php81')
 	->in(EE_VENDOR_DIR . '/monolog')
 	->in(EE_VENDOR_DIR . '/guzzlehttp')
 	->in(EE_VENDOR_DIR . '/ralouphie/getallheaders')