From 59648c191b3be30adcdcfea7d8ce2e9a47b2a039 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 23 Aug 2023 18:09:20 +0530 Subject: [PATCH 01/28] Update Nginx and PHP Signed-off-by: Riddhesh Sanghvi --- img-versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/img-versions.json b/img-versions.json index 14b859f5f..d10eb5ac3 100644 --- a/img-versions.json +++ b/img-versions.json @@ -3,15 +3,15 @@ "easyengine/mailhog": "v4.6.5", "easyengine/mariadb": "v4.6.6", "easyengine/nginx-proxy": "v4.6.5", - "easyengine/nginx": "v4.6.5", + "easyengine/nginx": "v4.6.7", "easyengine/php": "v4.6.6", "easyengine/php5.6": "v4.6.6", "easyengine/php7.0": "v4.6.6", "easyengine/php7.2": "v4.6.6", "easyengine/php7.3": "v4.6.6", "easyengine/php7.4": "v4.6.6", - "easyengine/php8.0": "v4.6.6", - "easyengine/php8.1": "v4.6.6", + "easyengine/php8.0": "v4.6.7", + "easyengine/php8.1": "v4.6.7", "easyengine/postfix": "v4.6.5", "easyengine/redis": "v4.6.5", "easyengine/newrelic-daemon": "v4.6.5" From 4f578ff5bb7d39b705664f32bcd8d194805dfbe0 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 10 Nov 2023 16:18:06 +0530 Subject: [PATCH 02/28] Update composer packages Signed-off-by: Riddhesh Sanghvi --- composer.json | 4 +- composer.lock | 394 ++++++++++++++++++++++++-------------------------- 2 files changed, 194 insertions(+), 204 deletions(-) diff --git a/composer.json b/composer.json index 018aca373..91649d0d6 100644 --- a/composer.json +++ b/composer.json @@ -31,10 +31,10 @@ "easyengine/admin-tools-command": "v1.1.0", "easyengine/auth-command": "v1.2.0", "easyengine/config-command": "v1.0.2", - "easyengine/cron-command": "v2.0.0", + "easyengine/cron-command": "v2.0.1", "easyengine/log-command": "v1.1.0", "easyengine/mailhog-command": "v1.0.3", - "easyengine/service-command": "v1.5.0", + "easyengine/service-command": "v1.5.1", "easyengine/shell-command": "v1.1.1", "easyengine/site-command": "v3.2.4", "easyengine/site-type-php": "v1.7.0", diff --git a/composer.lock b/composer.lock index 835ef3dc4..7d451c65e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0e040add3a6d5ab7c6be0affc3d3e217", + "content-hash": "88dbfbd4138e9c6b612c8169f026713e", "packages": [ { "name": "acmephp/core", @@ -199,16 +199,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.3.5", + "version": "1.3.7", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "74780ccf8c19d6acb8d65c5f39cd72110e132bbd" + "reference": "76e46335014860eec1aa5a724799a00a2e47cc85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/74780ccf8c19d6acb8d65c5f39cd72110e132bbd", - "reference": "74780ccf8c19d6acb8d65c5f39cd72110e132bbd", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/76e46335014860eec1aa5a724799a00a2e47cc85", + "reference": "76e46335014860eec1aa5a724799a00a2e47cc85", "shasum": "" }, "require": { @@ -255,7 +255,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.3.5" + "source": "https://github.com/composer/ca-bundle/tree/1.3.7" }, "funding": [ { @@ -271,7 +271,7 @@ "type": "tidelift" } ], - "time": "2023-01-11T08:27:00+00:00" + "time": "2023-08-30T09:31:38+00:00" }, { "name": "composer/composer", @@ -927,16 +927,16 @@ }, { "name": "easyengine/cron-command", - "version": "v2.0.0", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/EasyEngine/cron-command.git", - "reference": "53c18a0b5bbc97e5c66f0f349f976d577bdcfe54" + "reference": "f8e138b7f348766fc41b79a66b0778f62db32f46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/cron-command/zipball/53c18a0b5bbc97e5c66f0f349f976d577bdcfe54", - "reference": "53c18a0b5bbc97e5c66f0f349f976d577bdcfe54", + "url": "https://api.github.com/repos/EasyEngine/cron-command/zipball/f8e138b7f348766fc41b79a66b0778f62db32f46", + "reference": "f8e138b7f348766fc41b79a66b0778f62db32f46", "shasum": "" }, "type": "ee-cli-package", @@ -972,9 +972,9 @@ "homepage": "https://github.com/easyengine/cron-command", "support": { "issues": "https://github.com/EasyEngine/cron-command/issues", - "source": "https://github.com/EasyEngine/cron-command/tree/v2.0.0" + "source": "https://github.com/EasyEngine/cron-command/tree/v2.0.1" }, - "time": "2023-01-13T09:27:39+00:00" + "time": "2023-11-10T10:42:24+00:00" }, { "name": "easyengine/log-command", @@ -1068,16 +1068,16 @@ }, { "name": "easyengine/service-command", - "version": "v1.5.0", + "version": "v1.5.1", "source": { "type": "git", "url": "https://github.com/EasyEngine/service-command.git", - "reference": "e47f1523dce3e90ea42cde9dd2150285b8c0f7ac" + "reference": "203edce7a099dd100eb8a73481a6a7704a712779" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/service-command/zipball/e47f1523dce3e90ea42cde9dd2150285b8c0f7ac", - "reference": "e47f1523dce3e90ea42cde9dd2150285b8c0f7ac", + "url": "https://api.github.com/repos/EasyEngine/service-command/zipball/203edce7a099dd100eb8a73481a6a7704a712779", + "reference": "203edce7a099dd100eb8a73481a6a7704a712779", "shasum": "" }, "type": "ee-cli-package", @@ -1111,9 +1111,9 @@ "homepage": "https://github.com/easyengine/service-command", "support": { "issues": "https://github.com/EasyEngine/service-command/issues", - "source": "https://github.com/EasyEngine/service-command/tree/v1.5.0" + "source": "https://github.com/EasyEngine/service-command/tree/v1.5.1" }, - "time": "2023-01-13T09:27:13+00:00" + "time": "2023-11-10T10:54:50+00:00" }, { "name": "easyengine/shell-command", @@ -1355,22 +1355,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.5.0", + "version": "7.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" + "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9", + "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.9 || ^2.4", + "guzzlehttp/promises": "^1.5.3 || ^2.0.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -1381,7 +1381,8 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.1", "ext-curl": "*", - "php-http/client-integration-tests": "^3.0", + "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "php-http/message-factory": "^1.1", "phpunit/phpunit": "^8.5.29 || ^9.5.23", "psr/log": "^1.1 || ^2.0 || ^3.0" }, @@ -1395,9 +1396,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "7.5-dev" } }, "autoload": { @@ -1463,7 +1461,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.5.0" + "source": "https://github.com/guzzle/guzzle/tree/7.8.0" }, "funding": [ { @@ -1479,38 +1477,37 @@ "type": "tidelift" } ], - "time": "2022-08-28T15:39:27+00:00" + "time": "2023-08-27T10:20:53+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.2", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "b94b2807d85443f9719887892882d0329d1e2598" + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", - "reference": "b94b2807d85443f9719887892882d0329d1e2598", + "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d", + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "bamarni/composer-bin-plugin": "^1.8.1", + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.5-dev" + "bamarni-bin": { + "bin-links": true, + "forward-command": false } }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -1547,7 +1544,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.2" + "source": "https://github.com/guzzle/promises/tree/2.0.1" }, "funding": [ { @@ -1563,20 +1560,20 @@ "type": "tidelift" } ], - "time": "2022-08-28T14:55:35+00:00" + "time": "2023-08-03T15:11:55+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318" + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b", + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b", "shasum": "" }, "require": { @@ -1595,11 +1592,6 @@ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -1657,7 +1649,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.9.0" + "source": "https://github.com/guzzle/psr7/tree/1.9.1" }, "funding": [ { @@ -1673,20 +1665,20 @@ "type": "tidelift" } ], - "time": "2022-06-20T21:43:03+00:00" + "time": "2023-04-17T16:00:37+00:00" }, { "name": "justinrainbow/json-schema", - "version": "5.2.12", + "version": "v5.2.13", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, "require": { @@ -1741,9 +1733,9 @@ ], "support": { "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" + "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" }, - "time": "2022-04-13T08:02:27+00:00" + "time": "2023-09-26T02:20:38+00:00" }, { "name": "league/flysystem", @@ -1841,16 +1833,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" + "reference": "c7f2872fb273bf493811473dafc88d60ae829f48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/c7f2872fb273bf493811473dafc88d60ae829f48", + "reference": "c7f2872fb273bf493811473dafc88d60ae829f48", "shasum": "" }, "require": { @@ -1881,7 +1873,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.12.0" }, "funding": [ { @@ -1893,7 +1885,7 @@ "type": "tidelift" } ], - "time": "2022-04-17T13:12:02+00:00" + "time": "2023-08-03T07:14:11+00:00" }, { "name": "monolog/monolog", @@ -2077,21 +2069,21 @@ }, { "name": "psr/http-client", - "version": "1.0.1", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -2111,7 +2103,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP clients", @@ -2123,31 +2115,31 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/master" + "source": "https://github.com/php-fig/http-client" }, - "time": "2020-06-29T06:28:15+00:00" + "time": "2023-09-23T14:17:50+00:00" }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -2176,9 +2168,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/1.1" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -2276,23 +2268,23 @@ }, { "name": "react/promise", - "version": "v2.9.0", + "version": "v2.10.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910" + "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/234f8fd1023c9158e2314fa9d7d0e6a83db42910", - "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910", + "url": "https://api.github.com/repos/reactphp/promise/zipball/f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38", + "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38", "shasum": "" }, "require": { "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36" + "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.36" }, "type": "library", "autoload": { @@ -2336,19 +2328,15 @@ ], "support": { "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v2.9.0" + "source": "https://github.com/reactphp/promise/tree/v2.10.0" }, "funding": [ { - "url": "https://github.com/WyriHaximus", - "type": "github" - }, - { - "url": "https://github.com/clue", - "type": "github" + "url": "https://opencollective.com/reactphp", + "type": "open_collective" } ], - "time": "2022-02-11T10:27:51+00:00" + "time": "2023-05-02T15:15:43+00:00" }, { "name": "rmccue/requests", @@ -2412,16 +2400,16 @@ }, { "name": "seld/jsonlint", - "version": "1.9.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "4211420d25eba80712bff236a98960ef68b866b7" + "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/4211420d25eba80712bff236a98960ef68b866b7", - "reference": "4211420d25eba80712bff236a98960ef68b866b7", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/594fd6462aad8ecee0b45ca5045acea4776667f1", + "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1", "shasum": "" }, "require": { @@ -2460,7 +2448,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.9.0" + "source": "https://github.com/Seldaek/jsonlint/tree/1.10.0" }, "funding": [ { @@ -2472,7 +2460,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T13:37:23+00:00" + "time": "2023-05-11T13:16:46+00:00" }, { "name": "seld/phar-utils", @@ -3202,16 +3190,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -3226,7 +3214,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3264,7 +3252,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -3280,20 +3268,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -3308,7 +3296,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3347,7 +3335,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -3363,20 +3351,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", "shasum": "" }, "require": { @@ -3385,7 +3373,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3426,7 +3414,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" }, "funding": [ { @@ -3442,20 +3430,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -3464,7 +3452,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3509,7 +3497,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -3525,20 +3513,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", "shasum": "" }, "require": { @@ -3547,7 +3535,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3588,7 +3576,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" }, "funding": [ { @@ -3604,7 +3592,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/process", @@ -4574,16 +4562,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.11.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { @@ -4621,7 +4609,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" }, "funding": [ { @@ -4629,20 +4617,20 @@ "type": "tidelift" } ], - "time": "2022-03-03T13:19:32+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { "name": "nikic/php-parser", - "version": "v4.15.2", + "version": "v4.17.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", "shasum": "" }, "require": { @@ -4683,9 +4671,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" }, - "time": "2022-11-12T15:38:23+00:00" + "time": "2023-08-13T19:53:39+00:00" }, { "name": "phar-io/manifest", @@ -4857,23 +4845,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.23", + "version": "9.2.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c" + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", - "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.14", + "nikic/php-parser": "^4.15", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -4888,8 +4876,8 @@ "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-pcov": "*", - "ext-xdebug": "*" + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { @@ -4922,7 +4910,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" }, "funding": [ { @@ -4930,7 +4919,7 @@ "type": "github" } ], - "time": "2022-12-28T12:41:10+00:00" + "time": "2023-09-19T04:57:46+00:00" }, { "name": "phpunit/php-file-iterator", @@ -5175,20 +5164,20 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.27", + "version": "9.5.28", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38" + "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e", + "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -5257,7 +5246,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28" }, "funding": [ { @@ -5273,7 +5262,7 @@ "type": "tidelift" } ], - "time": "2022-12-09T07:31:23+00:00" + "time": "2023-01-14T12:32:24+00:00" }, { "name": "sebastian/cli-parser", @@ -5575,16 +5564,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", "shasum": "" }, "require": { @@ -5629,7 +5618,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" }, "funding": [ { @@ -5637,20 +5626,20 @@ "type": "github" } ], - "time": "2020-10-26T13:10:38+00:00" + "time": "2023-05-07T05:35:17+00:00" }, { "name": "sebastian/environment", - "version": "5.1.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { @@ -5692,7 +5681,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" }, "funding": [ { @@ -5700,7 +5689,7 @@ "type": "github" } ], - "time": "2022-04-03T09:37:03+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", @@ -5781,16 +5770,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -5833,7 +5822,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" }, "funding": [ { @@ -5841,7 +5830,7 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", @@ -6014,16 +6003,16 @@ }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { @@ -6062,10 +6051,10 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" }, "funding": [ { @@ -6073,7 +6062,7 @@ "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", @@ -6132,16 +6121,16 @@ }, { "name": "sebastian/type", - "version": "3.2.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { @@ -6176,7 +6165,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" }, "funding": [ { @@ -6184,7 +6173,7 @@ "type": "github" } ], - "time": "2022-09-12T14:47:03+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", @@ -6241,16 +6230,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.1", + "version": "3.7.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619" + "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", + "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", "shasum": "" }, "require": { @@ -6286,14 +6275,15 @@ "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", "keywords": [ "phpcs", - "standards" + "standards", + "static analysis" ], "support": { "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "time": "2022-06-18T07:21:10+00:00" + "time": "2023-02-22T23:07:41+00:00" }, { "name": "theseer/tokenizer", From 43d00ee1de06ee6103279eca521b33947c45050c Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 10 Nov 2023 21:18:40 +0530 Subject: [PATCH 03/28] Add new global containers Signed-off-by: Riddhesh Sanghvi --- php/EE/Migration/GlobalContainers.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/php/EE/Migration/GlobalContainers.php b/php/EE/Migration/GlobalContainers.php index f6f33d054..7c73e550f 100644 --- a/php/EE/Migration/GlobalContainers.php +++ b/php/EE/Migration/GlobalContainers.php @@ -130,10 +130,11 @@ public static function global_service_down( $service_name ) { public static function get_all_global_images_with_service_name() { return [ - 'easyengine/nginx-proxy' => GLOBAL_PROXY_CONTAINER, - 'easyengine/mariadb' => GLOBAL_DB_CONTAINER, - 'easyengine/redis' => GLOBAL_REDIS_CONTAINER, - // 'easyengine/cron' => EE_CRON_SCHEDULER, //TODO: Add it to global docker-compose. + 'easyengine/nginx-proxy' => GLOBAL_PROXY_CONTAINER, + 'easyengine/mariadb' => GLOBAL_DB_CONTAINER, + 'easyengine/redis' => GLOBAL_REDIS_CONTAINER, + 'easyengine/cron' => GLOBAL_CRON_CONTAINER, + 'easyengine/newrelic-daemon' => GLOBAL_NEWRELIC_DAEMON_CONTAINER, ]; } From acaf0089246bf5e485ce5a80258816d1e7f120eb Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 10 Nov 2023 21:18:59 +0530 Subject: [PATCH 04/28] Update fetching existing img versions Signed-off-by: Riddhesh Sanghvi --- php/EE/Migration/Containers.php | 40 ++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php index bb3d54498..f7b4ba458 100644 --- a/php/EE/Migration/Containers.php +++ b/php/EE/Migration/Containers.php @@ -40,16 +40,17 @@ public static function start_container_migration() { foreach ( $img_versions as $img => $version ) { - if ( in_array( $img, $skip_download ) ) { - continue; - } if ( array_key_exists( $img, $current_versions ) ) { if ( $current_versions[ $img ] !== $version ) { $updated_images[] = $img; - self::pull_or_error( $img, $version ); + if ( ! in_array( $img, $skip_download ) ) { + self::pull_or_error( $img, $version ); + } } } else { - self::pull_or_error( $img, $version ); + if ( ! in_array( $img, $skip_download ) ) { + self::pull_or_error( $img, $version ); + } } } @@ -151,16 +152,29 @@ public static function pull_or_error( $image, $version ) { * @throws \Exception */ public static function get_current_docker_images_versions() { - $images = EE::db() - ->table( 'options' ) - ->where( 'key', 'like', 'easyengine/%' ) - ->all(); - $images = array_map( function ( $image ) { - return [ $image['key'] => $image['value'] ]; - }, $images ); + $dbImages = EE::db() + ->table( 'options' ) + ->where( 'key', 'like', 'easyengine/%' ) + ->all(); + + $dbImages = array_column( $dbImages, 'value', 'key' ); + + $dockerImages = EE::launch( 'docker ps --format "{{.Image}}" | grep "^easyengine/" | sort -u' )->stdout; + $dockerImages = explode( "\n", trim( $dockerImages ) ); + + $dockerImages = array_reduce( $dockerImages, function ( $result, $image ) { + + [ $imageName, $tag ] = explode( ':', $image, 2 ) + [ 1 => null ]; + $result[ $imageName ] = $tag; + + return $result; + }, [] ); + + $mergedImages = $dockerImages + $dbImages; + $mergedImages = array_filter( $mergedImages ); - return array_merge( ...$images ); + return $mergedImages; } /** From b187f85fe1c082cd4a7949cc605401628b0c49d9 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 10 Nov 2023 21:19:19 +0530 Subject: [PATCH 05/28] Update img-versions Signed-off-by: Riddhesh Sanghvi --- img-versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/img-versions.json b/img-versions.json index d10eb5ac3..c513ef6cc 100644 --- a/img-versions.json +++ b/img-versions.json @@ -9,10 +9,10 @@ "easyengine/php7.0": "v4.6.6", "easyengine/php7.2": "v4.6.6", "easyengine/php7.3": "v4.6.6", - "easyengine/php7.4": "v4.6.6", + "easyengine/php7.4": "v4.6.7", "easyengine/php8.0": "v4.6.7", "easyengine/php8.1": "v4.6.7", "easyengine/postfix": "v4.6.5", "easyengine/redis": "v4.6.5", - "easyengine/newrelic-daemon": "v4.6.5" + "easyengine/newrelic-daemon": "v4.6.7" } From e09f5fbce015fd33b0bac56f7f4f4a43c264f074 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 26 Apr 2024 20:36:47 +0530 Subject: [PATCH 06/28] Add PHP 8.2 & 8.3 image keys Signed-off-by: Riddhesh Sanghvi --- img-versions.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/img-versions.json b/img-versions.json index c513ef6cc..88759c896 100644 --- a/img-versions.json +++ b/img-versions.json @@ -12,6 +12,8 @@ "easyengine/php7.4": "v4.6.7", "easyengine/php8.0": "v4.6.7", "easyengine/php8.1": "v4.6.7", + "easyengine/php8.2": "v4.7.0", + "easyengine/php8.3": "v4.7.0", "easyengine/postfix": "v4.6.5", "easyengine/redis": "v4.6.5", "easyengine/newrelic-daemon": "v4.6.7" From 657064ed97106c8f1f9f2587c3bbbd9bd88e2a25 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 26 Apr 2024 20:37:15 +0530 Subject: [PATCH 07/28] Update stack img versions Signed-off-by: Riddhesh Sanghvi --- img-versions.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/img-versions.json b/img-versions.json index 88759c896..c5f241e99 100644 --- a/img-versions.json +++ b/img-versions.json @@ -1,20 +1,20 @@ { - "easyengine/cron": "v4.6.5", + "easyengine/cron": "v4.7.0", "easyengine/mailhog": "v4.6.5", "easyengine/mariadb": "v4.6.6", - "easyengine/nginx-proxy": "v4.6.5", - "easyengine/nginx": "v4.6.7", + "easyengine/nginx-proxy": "v4.7.0", + "easyengine/nginx": "v4.7.0", "easyengine/php": "v4.6.6", "easyengine/php5.6": "v4.6.6", "easyengine/php7.0": "v4.6.6", "easyengine/php7.2": "v4.6.6", "easyengine/php7.3": "v4.6.6", - "easyengine/php7.4": "v4.6.7", - "easyengine/php8.0": "v4.6.7", - "easyengine/php8.1": "v4.6.7", + "easyengine/php7.4": "v4.7.0", + "easyengine/php8.0": "v4.7.0", + "easyengine/php8.1": "v4.7.0", "easyengine/php8.2": "v4.7.0", "easyengine/php8.3": "v4.7.0", - "easyengine/postfix": "v4.6.5", - "easyengine/redis": "v4.6.5", - "easyengine/newrelic-daemon": "v4.6.7" + "easyengine/postfix": "v4.7.0", + "easyengine/redis": "v4.7.0", + "easyengine/newrelic-daemon": "v4.7.0" } From d87a7be6b6d08e85ee3a39a0e11da61d952d92e0 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 26 Apr 2024 21:34:55 +0530 Subject: [PATCH 08/28] Nginx proxy revert to 4.6.6 Signed-off-by: Riddhesh Sanghvi --- img-versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/img-versions.json b/img-versions.json index c5f241e99..6276b01f9 100644 --- a/img-versions.json +++ b/img-versions.json @@ -2,7 +2,7 @@ "easyengine/cron": "v4.7.0", "easyengine/mailhog": "v4.6.5", "easyengine/mariadb": "v4.6.6", - "easyengine/nginx-proxy": "v4.7.0", + "easyengine/nginx-proxy": "v4.6.6", "easyengine/nginx": "v4.7.0", "easyengine/php": "v4.6.6", "easyengine/php5.6": "v4.6.6", From 1dd287464824428a9d868eea8ceadc99948e9987 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 1 May 2024 12:48:23 +0530 Subject: [PATCH 09/28] Remove support containers from global migration Signed-off-by: Riddhesh Sanghvi --- php/EE/Migration/Containers.php | 22 -------------------- php/EE/Migration/GlobalContainers.php | 30 --------------------------- 2 files changed, 52 deletions(-) diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php index f7b4ba458..5ca611da5 100644 --- a/php/EE/Migration/Containers.php +++ b/php/EE/Migration/Containers.php @@ -200,17 +200,6 @@ private static function migrate_global_containers( $updated_images ) { [ $global_compose_file_backup_path, $global_compose_file_path, $updated_global_images ] ); - /** - * Create support containers. - */ - self::$rsp->add_step( - 'create-support-global-containers', - 'EE\Migration\GlobalContainers::enable_support_containers', - 'EE\Migration\GlobalContainers::disable_support_containers', - null, - null - ); - self::$rsp->add_step( 'stop-global-containers', 'EE\Migration\GlobalContainers::down_global_containers', @@ -240,17 +229,6 @@ private static function migrate_global_containers( $updated_images ) { [ $global_service_name ] ); } - - /** - * Remove support containers. - */ - self::$rsp->add_step( - 'remove-support-global-containers', - 'EE\Migration\GlobalContainers::disable_support_containers', - 'EE\Migration\GlobalContainers::enable_support_containers', - null, - null - ); } /** diff --git a/php/EE/Migration/GlobalContainers.php b/php/EE/Migration/GlobalContainers.php index 7c73e550f..ca762bf54 100644 --- a/php/EE/Migration/GlobalContainers.php +++ b/php/EE/Migration/GlobalContainers.php @@ -137,34 +137,4 @@ public static function get_all_global_images_with_service_name() { 'easyengine/newrelic-daemon' => GLOBAL_NEWRELIC_DAEMON_CONTAINER, ]; } - - /** - * Create support containers for global-db and global-redis service. - */ - public static function enable_support_containers() { - if ( ! chdir( EE_SERVICE_DIR ) ) { - throw new \Exception( sprintf( '%s path does not exist', EE_SERVICE_DIR ) ); - } - - $command = \EE_DOCKER::docker_compose_with_custom() . ' --project-name=ee up -d global-db global-redis'; - if ( ! EE::exec( $command ) ) { - throw new \Exception( 'Unable to create support container.' ); - } - } - - /** - * Remove support containers for global-db and global-redis service. - */ - public static function disable_support_containers() { - if ( ! chdir( EE_SERVICE_DIR ) ) { - throw new \Exception( sprintf( '%s path does not exist', EE_SERVICE_DIR ) ); - } - - $command = \EE_DOCKER::docker_compose_with_custom() . ' --project-name=ee down'; - /** - * 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 ); - } } From 9f75712c4f1fc7c1823bd583ef24cb5cb58e81cf Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 6 May 2024 22:49:42 +0530 Subject: [PATCH 10/28] Add migration to update docker if older Signed-off-by: Riddhesh Sanghvi --- ...easyengine_check_and_update_docker_one.php | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 migrations/db/20240502102550_easyengine_check_and_update_docker_one.php diff --git a/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php b/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php new file mode 100644 index 000000000..e1f2efb89 --- /dev/null +++ b/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php @@ -0,0 +1,51 @@ +stdout; + + if ( version_compare( $docker_version, '20.10.10', '<' ) ) { + EE::warning( 'Docker version should be 20.10.10 or above.' ); + + // If it is MacOS, prompt user to update docker. + if ( 'Darwin' === PHP_OS ) { + EE::confirm( 'Do you want to update Docker?' ); + EE::launch( 'open "docker://"' ); + } + + // If it is Linux, proceed with update. + if ( 'Linux' === PHP_OS ) { + EE::log( 'Updating Docker...' ); + EE::launch( 'curl -fsSL https://get.docker.com | sh' ); + } + } + + // Check the version again post update. + $docker_version = EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout; + if ( version_compare( $docker_version, '20.10.10', '<' ) ) { + EE::error( 'Docker version should be 20.10.10 or above. Please update Docker and try again.' ); + } + } + + /** + * Execute drop table query for site and sitemeta table. + * + * @throws EE\ExitException + */ + public function down() { + + } +} From 8f708b743c7c88b73924a026f13d955f4d7a2d18 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 6 May 2024 22:50:24 +0530 Subject: [PATCH 11/28] Update docker-compose version at end of migration Signed-off-by: Riddhesh Sanghvi --- php/EE/Migration/Containers.php | 51 +++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php index 5ca611da5..b086d89da 100644 --- a/php/EE/Migration/Containers.php +++ b/php/EE/Migration/Containers.php @@ -4,6 +4,7 @@ use EE\RevertableStepProcessor; use EE; +use Symfony\Component\Filesystem\Filesystem; /** * Upgrade existing containers to new docker-image @@ -35,6 +36,8 @@ public static function start_container_migration() { 'easyengine/php7.4', 'easyengine/php8.0', 'easyengine/php8.1', + 'easyengine/php8.2', + 'easyengine/php8.3', 'easyengine/newrelic-daemon', ]; @@ -60,6 +63,7 @@ public static function start_container_migration() { self::migrate_global_containers( $updated_images ); self::migrate_site_containers( $updated_images ); + self::maybe_update_docker_compose(); self::save_upgraded_image_versions( $current_versions, $img_versions, $updated_images ); if ( ! self::$rsp->execute() ) { @@ -69,6 +73,21 @@ public static function start_container_migration() { EE\Utils\delem_log( 'Container migration completed' ); } + /** + * Maybe update docker-compose at the end of migration. + * Need to update to latest docker-compose version for new template changes. + */ + public static function maybe_update_docker_compose() { + + self::$rsp->add_step( + 'update-compose', + 'EE\Migration\Containers::update_docker_compose', + 'EE\Migration\Containers::revert_docker_compose', + null, + null + ); + } + /** * Save updated image version in database. * @@ -103,6 +122,38 @@ public static function image_cleanup() { EE::exec( 'docker image prune -af --filter=label=org.label-schema.vendor="EasyEngine"' ); } + /** + * Update docker-compose to v2.26.1 if lower version is installed. + */ + public static function update_docker_compose() { + + $docker_compose_version = EE::launch( 'docker-compose version --short' )->stdout; + $docker_compose_path = EE::launch( 'command -v docker-compose' )->stdout; + $docker_compose_path = trim( $docker_compose_path ); + $docker_compose_backup_path = EE_BACKUP_DIR . '/docker-compose.backup'; + $fs = new Filesystem(); + if ( ! $fs->exists( EE_BACKUP_DIR ) ) { + $fs->mkdir( EE_BACKUP_DIR ); + } + $fs->copy( $docker_compose_path, $docker_compose_backup_path ); + + if ( version_compare( '2.26.1', $docker_compose_version, '>' ) ) { + EE::exec( "curl -L https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" ); + } + } + + /** + * Revert docker-compose to previous version. + */ + public static function revert_docker_compose() { + + $docker_compose_path = EE::launch( 'command -v docker-compose' )->stdout; + $docker_compose_path = trim( $docker_compose_path ); + $docker_compose_backup_path = EE_BACKUP_DIR . '/docker-compose.backup'; + $fs = new Filesystem(); + $fs->copy( $docker_compose_backup_path, $docker_compose_path ); + } + /** * Update database entry of images * From 2e7b4cb637bf33be74387856915d7402c3e6ce1c Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 6 May 2024 22:50:52 +0530 Subject: [PATCH 12/28] Update requirements check for compose version warning Signed-off-by: Riddhesh Sanghvi --- php/EE/Runner.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/php/EE/Runner.php b/php/EE/Runner.php index b078a6333..634dc999e 100644 --- a/php/EE/Runner.php +++ b/php/EE/Runner.php @@ -105,6 +105,14 @@ public function check_requirements( $show_error = true ) { $error[] = 'EasyEngine requires docker-compose.'; } + $docker_compose_version = EE::launch( 'docker-compose version --short' )->stdout; + if ( version_compare( $docker_compose_version, '2.26.0', '<' ) ) { + if ( $show_error ) { + EE::warning( 'EasyEngine requires docker-compose version 2.26.0 or greater.' ); + EE::warning( 'You can get the updated version of docker-compose from assets in https://github.com/docker/compose/releases/tag/v2.26.1' ); + } + } + if ( version_compare( PHP_VERSION, '7.2.0' ) < 0 ) { $status = false; $error[] = 'EasyEngine requires minimum PHP 7.2.0 to run.'; From c945ee716dfa21334f70c9fd51f950a4b9d69518 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 6 May 2024 23:12:24 +0530 Subject: [PATCH 13/28] Update docker-compose version in test Signed-off-by: Riddhesh Sanghvi --- .github/workflows/test_and_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index ea53fb815..afbb1b420 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -127,7 +127,7 @@ jobs: - name: Install docker-compose run: | - 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 curl -L https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose - name: Install dependencies From 2350e62a0d876f7567f3ed35807304dcb1d941b0 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 6 May 2024 23:13:24 +0530 Subject: [PATCH 14/28] Update PHP test versions matrix Signed-off-by: Riddhesh Sanghvi --- .github/workflows/test_and_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index afbb1b420..6abdec8a9 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -92,7 +92,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.2', '7.3', '7.4', '8.0', '8.1'] + php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3'] steps: - name: Check out source code uses: actions/checkout@v3 From 8f9eda041f4bacbc5ebeef20ad446cc7617958f2 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 13 May 2024 16:03:55 +0530 Subject: [PATCH 15/28] Add migration for docker update Signed-off-by: Riddhesh Sanghvi --- ...easyengine_check_and_update_docker_one.php | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php b/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php index e1f2efb89..f2bd415c0 100644 --- a/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php +++ b/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php @@ -4,6 +4,7 @@ use EE; use EE\Migration\Base; +use Symfony\Component\Filesystem\Filesystem; class CheckAndUpdateDockerOne extends Base { @@ -15,7 +16,7 @@ class CheckAndUpdateDockerOne extends Base { public function up() { EE::log( 'Checking Docker version.' ); - $docker_version = EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout; + $docker_version = trim( EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout ); if ( version_compare( $docker_version, '20.10.10', '<' ) ) { EE::warning( 'Docker version should be 20.10.10 or above.' ); @@ -33,11 +34,31 @@ public function up() { } } + EE::log( 'Checking docker-compose version' ); + $docker_compose_version = trim( EE::launch( 'docker-compose version --short' )->stdout ); + $docker_compose_path = EE::launch( 'command -v docker-compose' )->stdout; + $docker_compose_path = trim( $docker_compose_path ); + $docker_compose_backup_path = EE_BACKUP_DIR . '/docker-compose.backup'; + $fs = new Filesystem(); + if ( ! $fs->exists( EE_BACKUP_DIR ) ) { + $fs->mkdir( EE_BACKUP_DIR ); + } + $fs->copy( $docker_compose_path, $docker_compose_backup_path ); + + if ( version_compare( '1.29.2', $docker_compose_version, '>' ) ) { + EE::exec( "curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" ); + } + // Check the version again post update. - $docker_version = EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout; + $docker_version = trim( EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout ); if ( version_compare( $docker_version, '20.10.10', '<' ) ) { EE::error( 'Docker version should be 20.10.10 or above. Please update Docker and try again.' ); } + + $docker_compose_version = trim( EE::launch( 'docker-compose version --short' )->stdout ); + if ( version_compare( '1.29.2', $docker_compose_version, '!=' ) ) { + EE::error( 'Docker-compose version should be 1.29.2. Please update Docker-compose and try again.' ); + } } /** From b7b94072d0ff24b65dcca0adb030958741485bbf Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 13 May 2024 16:04:22 +0530 Subject: [PATCH 16/28] Update docker-compose version check Signed-off-by: Riddhesh Sanghvi --- php/EE/Migration/Containers.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php index b086d89da..a65a3851e 100644 --- a/php/EE/Migration/Containers.php +++ b/php/EE/Migration/Containers.php @@ -123,7 +123,7 @@ public static function image_cleanup() { } /** - * Update docker-compose to v2.26.1 if lower version is installed. + * Update docker-compose to v2.27.0 if lower version is installed. */ public static function update_docker_compose() { @@ -137,8 +137,8 @@ public static function update_docker_compose() { } $fs->copy( $docker_compose_path, $docker_compose_backup_path ); - if ( version_compare( '2.26.1', $docker_compose_version, '>' ) ) { - EE::exec( "curl -L https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" ); + if ( version_compare( '2.27.0', $docker_compose_version, '>' ) ) { + EE::exec( "curl -L https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" ); } } From 36f61eb0c41a59059e25ea0be915b60ae6da9f55 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 13 May 2024 16:04:46 +0530 Subject: [PATCH 17/28] Update docker-compose version check Signed-off-by: Riddhesh Sanghvi --- php/EE/Runner.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/php/EE/Runner.php b/php/EE/Runner.php index 634dc999e..33645e5a3 100644 --- a/php/EE/Runner.php +++ b/php/EE/Runner.php @@ -105,10 +105,10 @@ public function check_requirements( $show_error = true ) { $error[] = 'EasyEngine requires docker-compose.'; } - $docker_compose_version = EE::launch( 'docker-compose version --short' )->stdout; - if ( version_compare( $docker_compose_version, '2.26.0', '<' ) ) { + $docker_compose_version = trim( EE::launch( 'docker-compose version --short' )->stdout ); + if ( version_compare( $docker_compose_version, '2.26.1', '<' ) ) { if ( $show_error ) { - EE::warning( 'EasyEngine requires docker-compose version 2.26.0 or greater.' ); + EE::warning( 'EasyEngine requires docker-compose version 2.26.1 or greater.' ); EE::warning( 'You can get the updated version of docker-compose from assets in https://github.com/docker/compose/releases/tag/v2.26.1' ); } } From d06ada161405584fdcf8273d4baabdac2f29b63f Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 13 May 2024 16:09:41 +0530 Subject: [PATCH 18/28] Update nginx-proxy image Signed-off-by: Riddhesh Sanghvi --- img-versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/img-versions.json b/img-versions.json index 6276b01f9..c5f241e99 100644 --- a/img-versions.json +++ b/img-versions.json @@ -2,7 +2,7 @@ "easyengine/cron": "v4.7.0", "easyengine/mailhog": "v4.6.5", "easyengine/mariadb": "v4.6.6", - "easyengine/nginx-proxy": "v4.6.6", + "easyengine/nginx-proxy": "v4.7.0", "easyengine/nginx": "v4.7.0", "easyengine/php": "v4.6.6", "easyengine/php5.6": "v4.6.6", From 2a51dd79298ce6a83b7f483d10404aedd2d5551b Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 13 May 2024 16:29:41 +0530 Subject: [PATCH 19/28] Skip migration if first execution Signed-off-by: Riddhesh Sanghvi --- ...02550_easyengine_check_and_update_docker_one.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php b/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php index f2bd415c0..3d05ec9d2 100644 --- a/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php +++ b/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php @@ -8,6 +8,13 @@ class CheckAndUpdateDockerOne extends Base { + public function __construct() { + + if ( $this->is_first_execution ) { + $this->skip_this_migration = true; + } + } + /** * Execute create table query for site and sitemeta table. * @@ -15,6 +22,12 @@ class CheckAndUpdateDockerOne extends Base { */ public function up() { + if ( $this->skip_this_migration ) { + EE::debug( 'Skipping migration as it is not needed.' ); + + return; + } + EE::log( 'Checking Docker version.' ); $docker_version = trim( EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout ); From 7facc38cb2dcb02becbfb65bccf484e6285ea581 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 13 May 2024 17:07:03 +0530 Subject: [PATCH 20/28] Fix docker-compose version pre migration check Signed-off-by: Riddhesh Sanghvi --- .../20240502102550_easyengine_check_and_update_docker_one.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php b/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php index 3d05ec9d2..adc66386c 100644 --- a/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php +++ b/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php @@ -58,7 +58,7 @@ public function up() { } $fs->copy( $docker_compose_path, $docker_compose_backup_path ); - if ( version_compare( '1.29.2', $docker_compose_version, '>' ) ) { + if ( version_compare( '1.29.2', $docker_compose_version, '!=' ) ) { EE::exec( "curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" ); } From 0828a10d02fc78187d9ab0e1e04fbcd18b5858a4 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 13 May 2024 18:18:59 +0530 Subject: [PATCH 21/28] Maybe update docker-compose even when no image mirations needed Signed-off-by: Riddhesh Sanghvi --- php/EE/Migration/Containers.php | 1 + 1 file changed, 1 insertion(+) diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php index a65a3851e..92273a94b 100644 --- a/php/EE/Migration/Containers.php +++ b/php/EE/Migration/Containers.php @@ -58,6 +58,7 @@ public static function start_container_migration() { } if ( empty( $updated_images ) ) { + self::maybe_update_docker_compose(); return; } From 02b3fcf0f924cfb76468dda4e7e51c71240ee0e1 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 13 May 2024 18:19:27 +0530 Subject: [PATCH 22/28] Update docker-compose to v2.27 in GH workflow Signed-off-by: Riddhesh Sanghvi --- .github/workflows/test_and_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index 6abdec8a9..c386fb6d6 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -127,7 +127,7 @@ jobs: - name: Install docker-compose run: | - sudo curl -L https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose + sudo curl -L https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose - name: Install dependencies From 74a4d789d91866b9bd17cdd09521e14c1b9c6279 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 14 May 2024 11:19:03 +0530 Subject: [PATCH 23/28] Add compose update in runner migration fn Signed-off-by: Riddhesh Sanghvi --- php/EE/Migration/Containers.php | 2 +- php/EE/Runner.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php index 92273a94b..edfa98f4e 100644 --- a/php/EE/Migration/Containers.php +++ b/php/EE/Migration/Containers.php @@ -58,7 +58,7 @@ public static function start_container_migration() { } if ( empty( $updated_images ) ) { - self::maybe_update_docker_compose(); + return; } diff --git a/php/EE/Runner.php b/php/EE/Runner.php index 33645e5a3..ff7dca9db 100644 --- a/php/EE/Runner.php +++ b/php/EE/Runner.php @@ -138,6 +138,7 @@ private function migrate() { $rsp->add_step( 'ee-db-migrations', 'EE\Migration\Executor::execute_migrations' ); $rsp->add_step( 'ee-custom-container-migrations', 'EE\Migration\CustomContainerMigrations::execute_migrations' ); $rsp->add_step( 'ee-docker-image-migrations', 'EE\Migration\Containers::start_container_migration' ); + $rsp->add_step( 'ee-update-docker-compose', 'EE\Migration\Containers::update_docker_compose' ); return $rsp->execute(); } From 2850be37de33df5e172c3def95896262c4e29dcb Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 14 May 2024 11:29:15 +0530 Subject: [PATCH 24/28] Optimize update_docker_compose fn Signed-off-by: Riddhesh Sanghvi --- php/EE/Migration/Containers.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php index edfa98f4e..4597c5413 100644 --- a/php/EE/Migration/Containers.php +++ b/php/EE/Migration/Containers.php @@ -132,13 +132,15 @@ public static function update_docker_compose() { $docker_compose_path = EE::launch( 'command -v docker-compose' )->stdout; $docker_compose_path = trim( $docker_compose_path ); $docker_compose_backup_path = EE_BACKUP_DIR . '/docker-compose.backup'; - $fs = new Filesystem(); - if ( ! $fs->exists( EE_BACKUP_DIR ) ) { - $fs->mkdir( EE_BACKUP_DIR ); - } - $fs->copy( $docker_compose_path, $docker_compose_backup_path ); if ( version_compare( '2.27.0', $docker_compose_version, '>' ) ) { + + $fs = new Filesystem(); + if ( ! $fs->exists( EE_BACKUP_DIR ) ) { + $fs->mkdir( EE_BACKUP_DIR ); + } + $fs->copy( $docker_compose_path, $docker_compose_backup_path ); + EE::exec( "curl -L https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" ); } } From cbb934481cfa4b637e3ce532cb1353d72f715257 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 14 May 2024 15:11:55 +0530 Subject: [PATCH 25/28] Swtich to debug statements Signed-off-by: Riddhesh Sanghvi --- ...230312102550_easyengine_check_and_update_docker.php | 4 ++-- ...02102550_easyengine_check_and_update_docker_one.php | 10 ++++++---- php/EE/Migration/Containers.php | 4 +++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/migrations/db/20230312102550_easyengine_check_and_update_docker.php b/migrations/db/20230312102550_easyengine_check_and_update_docker.php index 0f2da39b3..0aff4ae36 100644 --- a/migrations/db/20230312102550_easyengine_check_and_update_docker.php +++ b/migrations/db/20230312102550_easyengine_check_and_update_docker.php @@ -14,7 +14,7 @@ class CheckAndUpdateDocker extends Base { */ public function up() { - EE::log( 'Checking Docker version.' ); + EE::debug( 'Checking Docker version.' ); $docker_version = EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout; if ( version_compare( $docker_version, '20.10.10', '<' ) ) { @@ -28,7 +28,7 @@ public function up() { // If it is Linux, proceed with update. if ( 'Linux' === PHP_OS ) { - EE::log( 'Updating Docker...' ); + EE::debug( 'Updating Docker...' ); EE::launch( 'curl -fsSL https://get.docker.com | sh' ); } } diff --git a/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php b/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php index adc66386c..9a25e20e4 100644 --- a/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php +++ b/migrations/db/20240502102550_easyengine_check_and_update_docker_one.php @@ -28,7 +28,7 @@ public function up() { return; } - EE::log( 'Checking Docker version.' ); + EE::debug( 'Checking Docker version.' ); $docker_version = trim( EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout ); if ( version_compare( $docker_version, '20.10.10', '<' ) ) { @@ -42,16 +42,17 @@ public function up() { // If it is Linux, proceed with update. if ( 'Linux' === PHP_OS ) { - EE::log( 'Updating Docker...' ); + EE::debug( 'Updating Docker...' ); EE::launch( 'curl -fsSL https://get.docker.com | sh' ); } } - EE::log( 'Checking docker-compose version' ); + EE::debug( 'Checking docker-compose version' ); $docker_compose_version = trim( EE::launch( 'docker-compose version --short' )->stdout ); $docker_compose_path = EE::launch( 'command -v docker-compose' )->stdout; $docker_compose_path = trim( $docker_compose_path ); $docker_compose_backup_path = EE_BACKUP_DIR . '/docker-compose.backup'; + $docker_compose_new_path = EE_BACKUP_DIR . '/docker-compose'; $fs = new Filesystem(); if ( ! $fs->exists( EE_BACKUP_DIR ) ) { $fs->mkdir( EE_BACKUP_DIR ); @@ -59,7 +60,8 @@ public function up() { $fs->copy( $docker_compose_path, $docker_compose_backup_path ); if ( version_compare( '1.29.2', $docker_compose_version, '!=' ) ) { - EE::exec( "curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" ); + EE::exec( "curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_new_path && chmod +x $docker_compose_new_path" ); + EE::exec( "mv $docker_compose_new_path $docker_compose_path" ); } // Check the version again post update. diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php index 4597c5413..da688c570 100644 --- a/php/EE/Migration/Containers.php +++ b/php/EE/Migration/Containers.php @@ -132,6 +132,7 @@ public static function update_docker_compose() { $docker_compose_path = EE::launch( 'command -v docker-compose' )->stdout; $docker_compose_path = trim( $docker_compose_path ); $docker_compose_backup_path = EE_BACKUP_DIR . '/docker-compose.backup'; + $docker_compose_new_path = EE_BACKUP_DIR . '/docker-compose'; if ( version_compare( '2.27.0', $docker_compose_version, '>' ) ) { @@ -141,7 +142,8 @@ public static function update_docker_compose() { } $fs->copy( $docker_compose_path, $docker_compose_backup_path ); - EE::exec( "curl -L https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" ); + EE::exec( "curl -L https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_new_path && chmod +x $docker_compose_new_path" ); + EE::exec( "mv $docker_compose_new_path $docker_compose_path" ); } } From c8e082ada63dc62f543a677711660f706d14b24a Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 14 May 2024 16:00:13 +0530 Subject: [PATCH 26/28] Update composer packages Signed-off-by: Riddhesh Sanghvi --- composer.json | 10 +- composer.lock | 492 ++++++++++++++++++++++++++------------------------ 2 files changed, 258 insertions(+), 244 deletions(-) diff --git a/composer.json b/composer.json index 91649d0d6..1b6533e2b 100644 --- a/composer.json +++ b/composer.json @@ -31,14 +31,14 @@ "easyengine/admin-tools-command": "v1.1.0", "easyengine/auth-command": "v1.2.0", "easyengine/config-command": "v1.0.2", - "easyengine/cron-command": "v2.0.1", + "easyengine/cron-command": "v2.0.2", "easyengine/log-command": "v1.1.0", "easyengine/mailhog-command": "v1.0.3", - "easyengine/service-command": "v1.5.1", + "easyengine/service-command": "v1.6.0", "easyengine/shell-command": "v1.1.1", - "easyengine/site-command": "v3.2.4", - "easyengine/site-type-php": "v1.7.0", - "easyengine/site-type-wp": "v1.7.1", + "easyengine/site-command": "v3.3.0", + "easyengine/site-type-php": "v1.8.0", + "easyengine/site-type-wp": "v1.8.0", "monolog/monolog": "1.24.0", "mustache/mustache": "2.14.1", "rmccue/requests": "1.8.0", diff --git a/composer.lock b/composer.lock index 7d451c65e..83a745d06 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "88dbfbd4138e9c6b612c8169f026713e", + "content-hash": "a8c403e18981ae6d922754c99a0d20e6", "packages": [ { "name": "acmephp/core", @@ -199,28 +199,28 @@ }, { "name": "composer/ca-bundle", - "version": "1.3.7", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "76e46335014860eec1aa5a724799a00a2e47cc85" + "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/76e46335014860eec1aa5a724799a00a2e47cc85", - "reference": "76e46335014860eec1aa5a724799a00a2e47cc85", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", + "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", "shasum": "" }, "require": { "ext-openssl": "*", "ext-pcre": "*", - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", + "phpstan/phpstan": "^1.10", "psr/log": "^1.0", "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0" + "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { @@ -255,7 +255,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.3.7" + "source": "https://github.com/composer/ca-bundle/tree/1.5.0" }, "funding": [ { @@ -271,7 +271,7 @@ "type": "tidelift" } ], - "time": "2023-08-30T09:31:38+00:00" + "time": "2024-03-15T14:00:32+00:00" }, { "name": "composer/composer", @@ -595,16 +595,16 @@ }, { "name": "composer/spdx-licenses", - "version": "1.5.7", + "version": "1.5.8", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "c848241796da2abf65837d51dce1fae55a960149" + "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/c848241796da2abf65837d51dce1fae55a960149", - "reference": "c848241796da2abf65837d51dce1fae55a960149", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a", + "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a", "shasum": "" }, "require": { @@ -653,9 +653,9 @@ "validator" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/spdx-licenses/issues", - "source": "https://github.com/composer/spdx-licenses/tree/1.5.7" + "source": "https://github.com/composer/spdx-licenses/tree/1.5.8" }, "funding": [ { @@ -671,20 +671,20 @@ "type": "tidelift" } ], - "time": "2022-05-23T07:37:50+00:00" + "time": "2023-11-20T07:44:33+00:00" }, { "name": "composer/xdebug-handler", - "version": "3.0.3", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ced299686f41dce890debac69273b47ffe98a40c" + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", - "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef", "shasum": "" }, "require": { @@ -695,7 +695,7 @@ "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^6.0" + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" }, "type": "library", "autoload": { @@ -719,9 +719,9 @@ "performance" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.5" }, "funding": [ { @@ -737,25 +737,25 @@ "type": "tidelift" } ], - "time": "2022-02-25T21:32:43+00:00" + "time": "2024-05-06T16:37:16+00:00" }, { "name": "daverandom/libdns", - "version": "v2.0.3", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/DaveRandom/LibDNS.git", - "reference": "42c2d700d1178c9f9e78664793463f7f1aea248c" + "reference": "b84c94e8fe6b7ee4aecfe121bfe3b6177d303c8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/DaveRandom/LibDNS/zipball/42c2d700d1178c9f9e78664793463f7f1aea248c", - "reference": "42c2d700d1178c9f9e78664793463f7f1aea248c", + "url": "https://api.github.com/repos/DaveRandom/LibDNS/zipball/b84c94e8fe6b7ee4aecfe121bfe3b6177d303c8a", + "reference": "b84c94e8fe6b7ee4aecfe121bfe3b6177d303c8a", "shasum": "" }, "require": { "ext-ctype": "*", - "php": ">=7.0" + "php": ">=7.1" }, "suggest": { "ext-intl": "Required for IDN support" @@ -779,9 +779,9 @@ ], "support": { "issues": "https://github.com/DaveRandom/LibDNS/issues", - "source": "https://github.com/DaveRandom/LibDNS/tree/v2.0.3" + "source": "https://github.com/DaveRandom/LibDNS/tree/v2.1.0" }, - "time": "2022-09-20T18:15:38+00:00" + "time": "2024-04-12T12:12:48+00:00" }, { "name": "easyengine/admin-tools-command", @@ -927,7 +927,7 @@ }, { "name": "easyengine/cron-command", - "version": "v2.0.1", + "version": "v2.0.2", "source": { "type": "git", "url": "https://github.com/EasyEngine/cron-command.git", @@ -972,7 +972,7 @@ "homepage": "https://github.com/easyengine/cron-command", "support": { "issues": "https://github.com/EasyEngine/cron-command/issues", - "source": "https://github.com/EasyEngine/cron-command/tree/v2.0.1" + "source": "https://github.com/EasyEngine/cron-command/tree/v2.0.2" }, "time": "2023-11-10T10:42:24+00:00" }, @@ -1068,16 +1068,16 @@ }, { "name": "easyengine/service-command", - "version": "v1.5.1", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/EasyEngine/service-command.git", - "reference": "203edce7a099dd100eb8a73481a6a7704a712779" + "reference": "d07a4f940e68238dd78dcc6e26abeee687588b21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/service-command/zipball/203edce7a099dd100eb8a73481a6a7704a712779", - "reference": "203edce7a099dd100eb8a73481a6a7704a712779", + "url": "https://api.github.com/repos/EasyEngine/service-command/zipball/d07a4f940e68238dd78dcc6e26abeee687588b21", + "reference": "d07a4f940e68238dd78dcc6e26abeee687588b21", "shasum": "" }, "type": "ee-cli-package", @@ -1111,9 +1111,9 @@ "homepage": "https://github.com/easyengine/service-command", "support": { "issues": "https://github.com/EasyEngine/service-command/issues", - "source": "https://github.com/EasyEngine/service-command/tree/v1.5.1" + "source": "https://github.com/EasyEngine/service-command/tree/v1.6.0" }, - "time": "2023-11-10T10:54:50+00:00" + "time": "2024-05-14T10:20:08+00:00" }, { "name": "easyengine/shell-command", @@ -1161,16 +1161,16 @@ }, { "name": "easyengine/site-command", - "version": "v3.2.4", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/EasyEngine/site-command.git", - "reference": "13be7f01b24eb332935d0dad51ad504c8a5fefd7" + "reference": "d47e48074981fd4ff3c91366d98d03007bba9158" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/site-command/zipball/13be7f01b24eb332935d0dad51ad504c8a5fefd7", - "reference": "13be7f01b24eb332935d0dad51ad504c8a5fefd7", + "url": "https://api.github.com/repos/EasyEngine/site-command/zipball/d47e48074981fd4ff3c91366d98d03007bba9158", + "reference": "d47e48074981fd4ff3c91366d98d03007bba9158", "shasum": "" }, "require": { @@ -1231,13 +1231,13 @@ "homepage": "https://github.com/easyengine/site-command", "support": { "issues": "https://github.com/EasyEngine/site-command/issues", - "source": "https://github.com/EasyEngine/site-command/tree/v3.2.4" + "source": "https://github.com/EasyEngine/site-command/tree/v3.3.0" }, - "time": "2023-01-13T11:49:15+00:00" + "time": "2024-05-14T10:17:30+00:00" }, { "name": "easyengine/site-type-php", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/EasyEngine/site-type-php.git", @@ -1290,22 +1290,22 @@ "homepage": "https://github.com/easyengine/site-type-php", "support": { "issues": "https://github.com/EasyEngine/site-type-php/issues", - "source": "https://github.com/EasyEngine/site-type-php/tree/v1.7.0" + "source": "https://github.com/EasyEngine/site-type-php/tree/v1.8.0" }, "time": "2022-06-22T10:02:51+00:00" }, { "name": "easyengine/site-type-wp", - "version": "v1.7.1", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/EasyEngine/site-type-wp.git", - "reference": "cd3b6a85fd88809fa3664a842a82cee9493880aa" + "reference": "53e5abfe962b619f42a61398e503a5f7e3266c07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/site-type-wp/zipball/cd3b6a85fd88809fa3664a842a82cee9493880aa", - "reference": "cd3b6a85fd88809fa3664a842a82cee9493880aa", + "url": "https://api.github.com/repos/EasyEngine/site-type-wp/zipball/53e5abfe962b619f42a61398e503a5f7e3266c07", + "reference": "53e5abfe962b619f42a61398e503a5f7e3266c07", "shasum": "" }, "require-dev": { @@ -1349,22 +1349,22 @@ "homepage": "https://github.com/easyengine/site-type-wp", "support": { "issues": "https://github.com/EasyEngine/site-type-wp/issues", - "source": "https://github.com/EasyEngine/site-type-wp/tree/v1.7.1" + "source": "https://github.com/EasyEngine/site-type-wp/tree/v1.8.0" }, - "time": "2022-12-19T09:23:04+00:00" + "time": "2022-06-22T10:02:41+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.8.0", + "version": "7.8.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9" + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9", - "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", "shasum": "" }, "require": { @@ -1379,11 +1379,11 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", + "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23", + "phpunit/phpunit": "^8.5.36 || ^9.6.15", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -1461,7 +1461,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.8.0" + "source": "https://github.com/guzzle/guzzle/tree/7.8.1" }, "funding": [ { @@ -1477,28 +1477,28 @@ "type": "tidelift" } ], - "time": "2023-08-27T10:20:53+00:00" + "time": "2023-12-03T20:35:24+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "111166291a0f8130081195ac4556a5587d7f1b5d" + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d", - "reference": "111166291a0f8130081195ac4556a5587d7f1b5d", + "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23" + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.36 || ^9.6.15" }, "type": "library", "extra": { @@ -1544,7 +1544,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.1" + "source": "https://github.com/guzzle/promises/tree/2.0.2" }, "funding": [ { @@ -1560,7 +1560,7 @@ "type": "tidelift" } ], - "time": "2023-08-03T15:11:55+00:00" + "time": "2023-12-03T20:19:20+00:00" }, { "name": "guzzlehttp/psr7", @@ -2268,23 +2268,23 @@ }, { "name": "react/promise", - "version": "v2.10.0", + "version": "v2.11.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38" + "reference": "1a8460931ea36dc5c76838fec5734d55c88c6831" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38", - "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38", + "url": "https://api.github.com/repos/reactphp/promise/zipball/1a8460931ea36dc5c76838fec5734d55c88c6831", + "reference": "1a8460931ea36dc5c76838fec5734d55c88c6831", "shasum": "" }, "require": { "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.36" + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" }, "type": "library", "autoload": { @@ -2328,7 +2328,7 @@ ], "support": { "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v2.10.0" + "source": "https://github.com/reactphp/promise/tree/v2.11.0" }, "funding": [ { @@ -2336,7 +2336,7 @@ "type": "open_collective" } ], - "time": "2023-05-02T15:15:43+00:00" + "time": "2023-11-16T16:16:50+00:00" }, { "name": "rmccue/requests", @@ -2400,16 +2400,16 @@ }, { "name": "seld/jsonlint", - "version": "1.10.0", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1" + "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/594fd6462aad8ecee0b45ca5045acea4776667f1", - "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9bb7db07b5d66d90f6ebf542f09fc67d800e5259", + "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259", "shasum": "" }, "require": { @@ -2436,7 +2436,7 @@ { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "description": "JSON Linter", @@ -2448,7 +2448,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.10.0" + "source": "https://github.com/Seldaek/jsonlint/tree/1.10.2" }, "funding": [ { @@ -2460,7 +2460,7 @@ "type": "tidelift" } ], - "time": "2023-05-11T13:16:46+00:00" + "time": "2024-02-07T12:57:50+00:00" }, { "name": "seld/phar-utils", @@ -2835,16 +2835,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "80d075412b557d41002320b96a096ca65aa2c98d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/80d075412b557d41002320b96a096ca65aa2c98d", + "reference": "80d075412b557d41002320b96a096ca65aa2c98d", "shasum": "" }, "require": { @@ -2882,7 +2882,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.3" }, "funding": [ { @@ -2898,7 +2898,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-01-24T14:02:46+00:00" }, { "name": "symfony/event-dispatcher", @@ -2986,16 +2986,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.13", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e" + "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e", - "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/761c8b8387cfe5f8026594a75fdf0a4e83ba6974", + "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974", "shasum": "" }, "require": { @@ -3045,7 +3045,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.13" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.10.0" }, "funding": [ { @@ -3061,7 +3061,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/filesystem", @@ -3190,16 +3190,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -3213,9 +3213,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3252,7 +3249,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -3268,20 +3265,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -3295,9 +3292,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3335,7 +3329,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -3351,20 +3345,20 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" + "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", - "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", + "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", "shasum": "" }, "require": { @@ -3372,9 +3366,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3414,7 +3405,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" }, "funding": [ { @@ -3430,20 +3421,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", "shasum": "" }, "require": { @@ -3451,9 +3442,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3497,7 +3485,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" }, "funding": [ { @@ -3513,20 +3501,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", - "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", "shasum": "" }, "require": { @@ -3534,9 +3522,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3576,7 +3561,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" }, "funding": [ { @@ -3592,7 +3577,7 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/process", @@ -3740,16 +3725,16 @@ }, { "name": "symfony/service-contracts", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/a2329596ddc8fd568900e3fc76cba42489ecc7f3", + "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3", "shasum": "" }, "require": { @@ -3803,7 +3788,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.3" }, "funding": [ { @@ -3819,7 +3804,7 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:17:29+00:00" + "time": "2023-04-21T15:04:16+00:00" }, { "name": "symfony/translation", @@ -3912,16 +3897,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe" + "reference": "b0073a77ac0b7ea55131020e87b1e3af540f4664" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe", - "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b0073a77ac0b7ea55131020e87b1e3af540f4664", + "reference": "b0073a77ac0b7ea55131020e87b1e3af540f4664", "shasum": "" }, "require": { @@ -3970,7 +3955,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/translation-contracts/tree/v2.5.3" }, "funding": [ { @@ -3986,7 +3971,7 @@ "type": "tidelift" } ], - "time": "2022-06-27T16:58:25+00:00" + "time": "2024-01-23T13:51:25+00:00" }, { "name": "symfony/yaml", @@ -4621,21 +4606,21 @@ }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v4.19.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.1" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", @@ -4671,26 +4656,27 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2024-03-17T08:10:35+00:00" }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -4731,9 +4717,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -4845,23 +4837,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.29", + "version": "9.2.31", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965", + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -4911,7 +4903,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31" }, "funding": [ { @@ -4919,7 +4911,7 @@ "type": "github" } ], - "time": "2023-09-19T04:57:46+00:00" + "time": "2024-03-02T06:37:42+00:00" }, { "name": "phpunit/php-file-iterator", @@ -5266,16 +5258,16 @@ }, { "name": "sebastian/cli-parser", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b", "shasum": "" }, "require": { @@ -5310,7 +5302,7 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2" }, "funding": [ { @@ -5318,7 +5310,7 @@ "type": "github" } ], - "time": "2020-09-28T06:08:49+00:00" + "time": "2024-03-02T06:27:43+00:00" }, { "name": "sebastian/code-unit", @@ -5507,20 +5499,20 @@ }, { "name": "sebastian/complexity", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.7", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -5552,7 +5544,7 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" }, "funding": [ { @@ -5560,20 +5552,20 @@ "type": "github" } ], - "time": "2020-10-26T15:52:27+00:00" + "time": "2023-12-22T06:19:30+00:00" }, { "name": "sebastian/diff", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", "shasum": "" }, "require": { @@ -5618,7 +5610,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" }, "funding": [ { @@ -5626,7 +5618,7 @@ "type": "github" } ], - "time": "2023-05-07T05:35:17+00:00" + "time": "2024-03-02T06:30:58+00:00" }, { "name": "sebastian/environment", @@ -5693,16 +5685,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", "shasum": "" }, "require": { @@ -5758,7 +5750,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" }, "funding": [ { @@ -5766,20 +5758,20 @@ "type": "github" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2024-03-02T06:33:00+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.6", + "version": "5.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bde739e7565280bda77be70044ac1047bc007e34" + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", - "reference": "bde739e7565280bda77be70044ac1047bc007e34", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", "shasum": "" }, "require": { @@ -5822,7 +5814,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" }, "funding": [ { @@ -5830,24 +5822,24 @@ "type": "github" } ], - "time": "2023-08-02T09:26:13+00:00" + "time": "2024-03-02T06:35:11+00:00" }, { "name": "sebastian/lines-of-code", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", "shasum": "" }, "require": { - "nikic/php-parser": "^4.6", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -5879,7 +5871,7 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" }, "funding": [ { @@ -5887,7 +5879,7 @@ "type": "github" } ], - "time": "2020-11-28T06:42:11+00:00" + "time": "2023-12-22T06:20:34+00:00" }, { "name": "sebastian/object-enumerator", @@ -6066,16 +6058,16 @@ }, { "name": "sebastian/resource-operations", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", "shasum": "" }, "require": { @@ -6087,7 +6079,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -6108,8 +6100,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" }, "funding": [ { @@ -6117,7 +6108,7 @@ "type": "github" } ], - "time": "2020-09-28T06:45:17+00:00" + "time": "2024-03-14T16:00:52+00:00" }, { "name": "sebastian/type", @@ -6230,16 +6221,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.2", + "version": "3.9.2", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480", + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480", "shasum": "" }, "require": { @@ -6249,11 +6240,11 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "bin/phpcbf", + "bin/phpcs" ], "type": "library", "extra": { @@ -6268,35 +6259,58 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", "standards", "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2023-02-22T23:07:41+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-04-23T20:25:34+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -6325,7 +6339,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -6333,7 +6347,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2024-03-03T12:36:25+00:00" }, { "name": "wp-coding-standards/wpcs", From 1dae77d99f2b71002ca2d46f2a2d67a51b3d73db Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 14 May 2024 16:19:48 +0530 Subject: [PATCH 27/28] Update site-type-wp and php version lock Signed-off-by: Riddhesh Sanghvi --- composer.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 83a745d06..70cb192a1 100644 --- a/composer.lock +++ b/composer.lock @@ -1241,12 +1241,12 @@ "source": { "type": "git", "url": "https://github.com/EasyEngine/site-type-php.git", - "reference": "70c69bbdd2fa742c169f5c294a027e648d10665f" + "reference": "11c1eb443aec0f8292ea62a4fe8e02e6558f0888" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/site-type-php/zipball/70c69bbdd2fa742c169f5c294a027e648d10665f", - "reference": "70c69bbdd2fa742c169f5c294a027e648d10665f", + "url": "https://api.github.com/repos/EasyEngine/site-type-php/zipball/11c1eb443aec0f8292ea62a4fe8e02e6558f0888", + "reference": "11c1eb443aec0f8292ea62a4fe8e02e6558f0888", "shasum": "" }, "require-dev": { @@ -1292,7 +1292,7 @@ "issues": "https://github.com/EasyEngine/site-type-php/issues", "source": "https://github.com/EasyEngine/site-type-php/tree/v1.8.0" }, - "time": "2022-06-22T10:02:51+00:00" + "time": "2024-05-14T10:21:08+00:00" }, { "name": "easyengine/site-type-wp", @@ -1300,12 +1300,12 @@ "source": { "type": "git", "url": "https://github.com/EasyEngine/site-type-wp.git", - "reference": "53e5abfe962b619f42a61398e503a5f7e3266c07" + "reference": "a66f460788c760282b26aac91cd254b9a8dbdf45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/site-type-wp/zipball/53e5abfe962b619f42a61398e503a5f7e3266c07", - "reference": "53e5abfe962b619f42a61398e503a5f7e3266c07", + "url": "https://api.github.com/repos/EasyEngine/site-type-wp/zipball/a66f460788c760282b26aac91cd254b9a8dbdf45", + "reference": "a66f460788c760282b26aac91cd254b9a8dbdf45", "shasum": "" }, "require-dev": { @@ -1351,7 +1351,7 @@ "issues": "https://github.com/EasyEngine/site-type-wp/issues", "source": "https://github.com/EasyEngine/site-type-wp/tree/v1.8.0" }, - "time": "2022-06-22T10:02:41+00:00" + "time": "2024-05-14T10:21:23+00:00" }, { "name": "guzzlehttp/guzzle", From 873d6c3a22afc2b731bf0b360a5c3dc8814e6746 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 14 May 2024 16:25:30 +0530 Subject: [PATCH 28/28] Bump to version v4.7.0 Signed-off-by: Riddhesh Sanghvi --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ec3f25fb5..f6cdf4098 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.6.6 +4.7.0