From 1d5935595744c6c83bd6300d7444e17caaa22622 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 15 Aug 2022 22:55:12 +0530 Subject: [PATCH 1/2] Add myclabs/deep-copy to phar creation Signed-off-by: Riddhesh Sanghvi --- utils/make-phar.php | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/make-phar.php b/utils/make-phar.php index 127fc5aa8..aa739d16c 100644 --- a/utils/make-phar.php +++ b/utils/make-phar.php @@ -179,6 +179,7 @@ function get_composer_versions( $current_version ) { ->in(EE_VENDOR_DIR . '/ralouphie/getallheaders') ->in(EE_VENDOR_DIR . '/acmephp') ->in(EE_VENDOR_DIR . '/league') + ->in(EE_VENDOR_DIR . '/myclabs/deep-copy') ->in(EE_VENDOR_DIR . '/webmozart') ->notName('behat-tags.php') ->notPath('#(?:[^/]+-command|php-cli-tools)/vendor/#') // For running locally, in case have composer installed or symlinked them. From aa98f82fe93d81c25350be0dabc70fd2a0c7a3e8 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 15 Aug 2022 22:56:35 +0530 Subject: [PATCH 2/2] Update composer packages Signed-off-by: Riddhesh Sanghvi --- composer.json | 2 +- composer.lock | 389 +++++++++++++------------------------------------- 2 files changed, 103 insertions(+), 288 deletions(-) diff --git a/composer.json b/composer.json index e0e561233..4f06d9321 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "easyengine/mailhog-command": "v1.0.3", "easyengine/service-command": "v1.4.0", "easyengine/shell-command": "v1.1.1", - "easyengine/site-command": "v3.2.0", + "easyengine/site-command": "v3.2.1", "easyengine/site-type-php": "v1.7.0", "easyengine/site-type-wp": "v1.7.0", "monolog/monolog": "1.24.0", diff --git a/composer.lock b/composer.lock index 680dd04ef..4cbf3bd1c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "69ead8da62c4635c24d51239662b56cb", + "content-hash": "fbb3dc3a01b29a66778d43e2696e59a9", "packages": [ { "name": "acmephp/core", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/acmephp/core.git", - "reference": "b038d61f06f3cb1e81a1a3cbe63eae42d9d3d3ca" + "reference": "cd4e69385052b05f24cc4aa938b3bad0a033d085" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/acmephp/core/zipball/b038d61f06f3cb1e81a1a3cbe63eae42d9d3d3ca", - "reference": "b038d61f06f3cb1e81a1a3cbe63eae42d9d3d3ca", + "url": "https://api.github.com/repos/acmephp/core/zipball/cd4e69385052b05f24cc4aa938b3bad0a033d085", + "reference": "cd4e69385052b05f24cc4aa938b3bad0a033d085", "shasum": "" }, "require": { @@ -25,7 +25,7 @@ "ext-hash": "*", "ext-json": "*", "ext-openssl": "*", - "guzzlehttp/guzzle": "^6.0", + "guzzlehttp/guzzle": "^6.0|^7.0", "guzzlehttp/psr7": "^1.0", "php": ">=5.5.0", "psr/http-message": "^1.0", @@ -76,9 +76,9 @@ "x509" ], "support": { - "source": "https://github.com/acmephp/core/tree/1.2.0" + "source": "https://github.com/acmephp/core/tree/1.3.0" }, - "time": "2019-12-17T11:28:20+00:00" + "time": "2020-12-13T21:29:40+00:00" }, { "name": "acmephp/ssl", @@ -151,27 +151,28 @@ }, { "name": "cloudflare/sdk", - "version": "1.1.1", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/cloudflare/cloudflare-php.git", - "reference": "a3a346ccb2f5cb49759db3d71ba0006a10cf20ef" + "reference": "fdfc656aa8b78016f4722acec30b54136c027d8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cloudflare/cloudflare-php/zipball/a3a346ccb2f5cb49759db3d71ba0006a10cf20ef", - "reference": "a3a346ccb2f5cb49759db3d71ba0006a10cf20ef", + "url": "https://api.github.com/repos/cloudflare/cloudflare-php/zipball/fdfc656aa8b78016f4722acec30b54136c027d8e", + "reference": "fdfc656aa8b78016f4722acec30b54136c027d8e", "shasum": "" }, "require": { - "guzzlehttp/guzzle": "^6.2.2", - "php": ">=7.0.0", + "ext-json": "*", + "guzzlehttp/guzzle": "^7.0.1", + "php": ">=7.2.5", "psr/http-message": "~1.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.6", "phpmd/phpmd": "@stable", - "phpunit/phpunit": "5.7.5" + "phpunit/phpunit": "^5.7" }, "type": "library", "autoload": { @@ -192,9 +193,9 @@ "description": "PHP binding for v4 of the Cloudflare Client API.", "support": { "issues": "https://github.com/cloudflare/cloudflare-php/issues", - "source": "https://github.com/cloudflare/cloudflare-php/tree/1.1.1" + "source": "https://github.com/cloudflare/cloudflare-php/tree/1.3.0" }, - "time": "2018-08-28T14:01:57+00:00" + "time": "2021-10-13T03:40:33+00:00" }, { "name": "composer/ca-bundle", @@ -1116,23 +1117,23 @@ }, { "name": "easyengine/site-command", - "version": "v3.2.0", + "version": "v3.2.1", "source": { "type": "git", "url": "https://github.com/EasyEngine/site-command.git", - "reference": "02193613f65eea1e17b6cd53946df2a89715b7e1" + "reference": "abe3d8df6c17c641992ca3124bc795dda320ebce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/site-command/zipball/02193613f65eea1e17b6cd53946df2a89715b7e1", - "reference": "02193613f65eea1e17b6cd53946df2a89715b7e1", + "url": "https://api.github.com/repos/EasyEngine/site-command/zipball/abe3d8df6c17c641992ca3124bc795dda320ebce", + "reference": "abe3d8df6c17c641992ca3124bc795dda320ebce", "shasum": "" }, "require": { - "acmephp/core": "1.2.0", - "cloudflare/sdk": "1.1.1", + "acmephp/core": "1.3.0", + "cloudflare/sdk": "^1.3", "ext-openssl": "*", - "guzzlehttp/guzzle": "6.5.8", + "guzzlehttp/guzzle": "^7.4", "league/flysystem": "1.1.4", "symfony/serializer": "3.4.20", "webmozart/assert": "1.10.0" @@ -1186,9 +1187,9 @@ "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.0" + "source": "https://github.com/EasyEngine/site-command/tree/v3.2.1" }, - "time": "2022-08-11T11:51:43+00:00" + "time": "2022-08-15T17:09:03+00:00" }, { "name": "easyengine/site-type-php", @@ -1310,37 +1311,45 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.5.8", + "version": "7.4.5", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981" + "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981", - "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", + "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.9", - "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.17" + "guzzlehttp/promises": "^1.5", + "guzzlehttp/psr7": "^1.9 || ^2.4", + "php": "^7.2.5 || ^8.0", + "psr/http-client": "^1.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", "ext-curl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", - "psr/log": "^1.1" + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^8.5.5 || ^9.3.5", + "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.5-dev" + "dev-master": "7.4-dev" } }, "autoload": { @@ -1393,19 +1402,20 @@ } ], "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", "keywords": [ "client", "curl", "framework", "http", "http client", + "psr-18", + "psr-7", "rest", "web service" ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/6.5.8" + "source": "https://github.com/guzzle/guzzle/tree/7.4.5" }, "funding": [ { @@ -1421,7 +1431,7 @@ "type": "tidelift" } ], - "time": "2022-06-20T22:16:07+00:00" + "time": "2022-06-20T22:16:13+00:00" }, { "name": "guzzlehttp/promises", @@ -2017,6 +2027,58 @@ }, "time": "2021-03-05T17:36:06+00:00" }, + { + "name": "psr/http-client", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-client.git", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], + "support": { + "source": "https://github.com/php-fig/http-client/tree/master" + }, + "time": "2020-06-29T06:28:15+00:00" + }, { "name": "psr/http-message", "version": "1.0.1", @@ -3172,177 +3234,6 @@ ], "time": "2022-05-24T11:49:31+00:00" }, - { - "name": "symfony/polyfill-intl-idn", - "version": "v1.26.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8", - "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8", - "shasum": "" - }, - "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Laurent Bassin", - "email": "laurent@bassin.info" - }, - { - "name": "Trevor Rowbotham", - "email": "trevor.rowbotham@pm.me" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "idn", - "intl", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-05-24T11:49:31+00:00" - }, - { - "name": "symfony/polyfill-intl-normalizer", - "version": "v1.26.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's Normalizer class and related functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "intl", - "normalizer", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-05-24T11:49:31+00:00" - }, { "name": "symfony/polyfill-mbstring", "version": "v1.26.0", @@ -3426,82 +3317,6 @@ ], "time": "2022-05-24T11:49:31+00:00" }, - { - "name": "symfony/polyfill-php72", - "version": "v1.26.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-05-24T11:49:31+00:00" - }, { "name": "symfony/polyfill-php73", "version": "v1.26.0",