Merge branch 'develop' for v4.7.6

Author: mrrobot47

.github/workflows/test_and_build.yml

@@ -172,8 +172,10 @@ jobs:
   deploy: #-----------------------------------------------------------------------
     name: Deploy Phar
     if: |
-      github.repository_owner == 'EasyEngine' &&
-      (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master')
+      github.repository_owner == 'EasyEngine' && (
+        startsWith(github.ref, 'refs/tags/') ||
+        github.ref == 'refs/heads/develop'
+      )
     runs-on: ubuntu-latest
     needs: [build, test]
 
@@ -193,8 +195,8 @@ jobs:
         if: ${{ contains(github.ref, 'develop') }}
         run: |
           echo 'FILENAME=easyengine-nightly.phar' > $GITHUB_ENV
-      - name: Set file name for master branch
-        if: ${{ contains(github.ref, 'master') }}
+      - name: Set file name for tag
+        if: ${{ contains(github.ref, 'refs/tags') }}
         run: |
           echo 'FILENAME=easyengine.phar' > $GITHUB_ENV
 

composer.json

@@ -28,7 +28,7 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.0",
-        "composer/composer": "2.2.23",
+        "composer/composer": "2.2.24",
         "composer/semver": "3.2.4",
         "daverandom/libdns": "^2.0",
         "easyengine/admin-tools-command": "v1.1.0",
@@ -38,10 +38,10 @@
         "easyengine/log-command": "v1.1.0",
         "easyengine/mailhog-command": "v1.0.3",
         "easyengine/service-command": "v1.6.1",
-        "easyengine/shell-command": "v1.1.2",
+        "easyengine/shell-command": "v1.1.3",
         "easyengine/site-command": "v3.3.2",
         "easyengine/site-type-php": "v1.8.1",
-        "easyengine/site-type-wp": "v1.8.1",
+        "easyengine/site-type-wp": "v1.8.2",
         "monolog/monolog": "1.24.0",
         "mustache/mustache": "2.14.1",
         "rmccue/requests": "1.8.0",

composer.lock

@@ -2,8 +2,8 @@
     "easyengine/cron": "v4.7.3",
     "easyengine/mailhog": "v4.6.5",
     "easyengine/mariadb": "v4.6.6",
-    "easyengine/nginx-proxy": "v4.7.5",
-    "easyengine/nginx": "v4.7.5",
+    "easyengine/nginx-proxy": "v4.7.6",
+    "easyengine/nginx": "v4.7.6",
     "easyengine/php": "v4.6.6",
     "easyengine/php5.6": "v4.7.4",
     "easyengine/php7.0": "v4.7.4",
@@ -12,9 +12,9 @@
     "easyengine/php7.4": "v4.7.4",
     "easyengine/php8.0": "v4.7.4",
     "easyengine/php8.1": "v4.7.5",
-    "easyengine/php8.2": "v4.7.5",
-    "easyengine/php8.3": "v4.7.5",
+    "easyengine/php8.2": "v4.7.6",
+    "easyengine/php8.3": "v4.7.6",
     "easyengine/postfix": "v4.7.4",
-    "easyengine/redis": "v4.7.3",
+    "easyengine/redis": "v4.7.6",
     "easyengine/newrelic-daemon": "v4.7.4"
 }

img-versions.json

@@ -101,9 +101,9 @@ public static function is_site_service_image_changed( $updated_images, $site_inf
 	 */
 	public static function generate_site_docker_compose_file( $site_info, $site_object ) {
 		$site_object->populate_site_info( $site_info['site_url'] );
-		EE::debug( "Start generating news docker-compose.yml for ${site_info['site_url']}" );
+		EE::debug( "Start generating new docker-compose.yml for ${site_info['site_url']}" );
 		$site_object->dump_docker_compose_yml( [ 'nohttps' => ! $site_info['site_ssl'] ] );
-		EE::debug( "Complete generating news docker-compose.yml for ${site_info['site_url']}" );
+		EE::debug( "Complete generating new docker-compose.yml for ${site_info['site_url']}" );
 	}
 
 	/**