From a6cef92b2d945dd9a6279abc584f1d83451571a2 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 15 Dec 2021 14:18:50 +0100 Subject: [PATCH 1/2] chore: update composer deps --- composer.json | 14 +-- composer.lock | 244 ++++++++++++++++---------------------------------- 2 files changed, 83 insertions(+), 175 deletions(-) diff --git a/composer.json b/composer.json index d2953bf5b4..efdd966bcc 100644 --- a/composer.json +++ b/composer.json @@ -57,21 +57,21 @@ "utopia-php/image": "0.5.*", "resque/php-resque": "1.3.6", - "matomo/device-detector": "4.3.1", + "matomo/device-detector": "5.0.1", "dragonmantank/cron-expression": "3.1.0", "influxdb/influxdb-php": "1.15.2", - "phpmailer/phpmailer": "6.5.1", - "chillerlan/php-qrcode": "4.3.1", + "phpmailer/phpmailer": "6.5.3", + "chillerlan/php-qrcode": "4.3.2", "adhocore/jwt": "1.1.2", "slickdeals/statsd": "3.1.0" }, "repositories": [], "require-dev": { "appwrite/sdk-generator": "0.16.2", - "phpunit/phpunit": "9.5.6", - "swoole/ide-helper": "4.6.7", - "textalk/websocket": "1.5.2", - "vimeo/psalm": "4.7.2" + "phpunit/phpunit": "9.5.10", + "swoole/ide-helper": "4.8.3", + "textalk/websocket": "1.5.5", + "vimeo/psalm": "4.13.1" }, "provide": { "ext-phpiredis": "*" diff --git a/composer.lock b/composer.lock index 33a29d90b7..ff207f2e22 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": "9dcf48d4173daea87c60b464b104cd22", + "content-hash": "d4017e5555cb2462f367b6881d5b6a5c", "packages": [ { "name": "adhocore/jwt", @@ -170,16 +170,16 @@ }, { "name": "chillerlan/php-qrcode", - "version": "4.3.1", + "version": "4.3.2", "source": { "type": "git", "url": "https://github.com/chillerlan/php-qrcode.git", - "reference": "be3beb936c21fe53a4e7e8f7f3582e9f02443666" + "reference": "b625396e0752d79747a55205ae7e191eeb459dcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/be3beb936c21fe53a4e7e8f7f3582e9f02443666", - "reference": "be3beb936c21fe53a4e7e8f7f3582e9f02443666", + "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/b625396e0752d79747a55205ae7e191eeb459dcd", + "reference": "b625396e0752d79747a55205ae7e191eeb459dcd", "shasum": "" }, "require": { @@ -188,7 +188,7 @@ "php": "^7.4 || ^8.0" }, "require-dev": { - "phan/phan": "^3.2.2", + "phan/phan": "^5.3", "phpunit/phpunit": "^9.5", "setasign/fpdf": "^1.8.2" }, @@ -232,7 +232,7 @@ ], "support": { "issues": "https://github.com/chillerlan/php-qrcode/issues", - "source": "https://github.com/chillerlan/php-qrcode/tree/4.3.1" + "source": "https://github.com/chillerlan/php-qrcode/tree/4.3.2" }, "funding": [ { @@ -244,7 +244,7 @@ "type": "ko_fi" } ], - "time": "2021-01-05T21:21:28+00:00" + "time": "2021-11-18T08:46:03+00:00" }, { "name": "chillerlan/php-settings-container", @@ -933,21 +933,21 @@ }, { "name": "matomo/device-detector", - "version": "4.3.1", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/matomo-org/device-detector.git", - "reference": "88e5419ee1448ccb9537e287dd09836ff9d2de3b" + "reference": "ebd8a07e4b69088c0e34f29ec72dc162c34c9264" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/88e5419ee1448ccb9537e287dd09836ff9d2de3b", - "reference": "88e5419ee1448ccb9537e287dd09836ff9d2de3b", + "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/ebd8a07e4b69088c0e34f29ec72dc162c34c9264", + "reference": "ebd8a07e4b69088c0e34f29ec72dc162c34c9264", "shasum": "" }, "require": { "mustangostang/spyc": "*", - "php": ">=7.2" + "php": "^7.2|^8.0" }, "replace": { "piwik/device-detector": "self.version" @@ -998,7 +998,7 @@ "source": "https://github.com/matomo-org/matomo", "wiki": "https://dev.matomo.org/" }, - "time": "2021-09-20T12:34:12+00:00" + "time": "2021-12-07T11:40:16+00:00" }, { "name": "mongodb/mongodb", @@ -1120,16 +1120,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.5.1", + "version": "v6.5.3", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "dd803df5ad7492e1b40637f7ebd258fee5ca7355" + "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/dd803df5ad7492e1b40637f7ebd258fee5ca7355", - "reference": "dd803df5ad7492e1b40637f7ebd258fee5ca7355", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/baeb7cde6b60b1286912690ab0693c7789a31e71", + "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71", "shasum": "" }, "require": { @@ -1186,7 +1186,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.1" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.3" }, "funding": [ { @@ -1194,7 +1194,7 @@ "type": "github" } ], - "time": "2021-08-18T09:14:16+00:00" + "time": "2021-11-25T16:34:11+00:00" }, { "name": "psr/http-client", @@ -4493,16 +4493,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.6", + "version": "9.5.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb" + "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb", - "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c814a05837f2edb0d1471d6e3f4ab3501ca3899a", + "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a", "shasum": "" }, "require": { @@ -4514,11 +4514,11 @@ "ext-xml": "*", "ext-xmlwriter": "*", "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.1", + "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", "phpspec/prophecy": "^1.12.1", - "phpunit/php-code-coverage": "^9.2.3", + "phpunit/php-code-coverage": "^9.2.7", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -4580,7 +4580,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.6" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.10" }, "funding": [ { @@ -4592,7 +4592,7 @@ "type": "github" } ], - "time": "2021-06-23T05:14:38+00:00" + "time": "2021-09-25T07:38:51+00:00" }, { "name": "psr/container", @@ -5613,24 +5613,18 @@ }, { "name": "swoole/ide-helper", - "version": "4.6.7", + "version": "4.8.3", "source": { "type": "git", "url": "https://github.com/swoole/ide-helper.git", - "reference": "0d1409b8274117addfe64d3ea412812a69807411" + "reference": "3ac4971814273889933b871e03b2a6b340e58f79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swoole/ide-helper/zipball/0d1409b8274117addfe64d3ea412812a69807411", - "reference": "0d1409b8274117addfe64d3ea412812a69807411", + "url": "https://api.github.com/repos/swoole/ide-helper/zipball/3ac4971814273889933b871e03b2a6b340e58f79", + "reference": "3ac4971814273889933b871e03b2a6b340e58f79", "shasum": "" }, - "require-dev": { - "guzzlehttp/guzzle": "~6.5.0", - "laminas/laminas-code": "~3.4.0", - "squizlabs/php_codesniffer": "~3.5.0", - "symfony/filesystem": "~4.0" - }, "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5645,7 +5639,7 @@ "description": "IDE help files for Swoole.", "support": { "issues": "https://github.com/swoole/ide-helper/issues", - "source": "https://github.com/swoole/ide-helper/tree/4.6.7" + "source": "https://github.com/swoole/ide-helper/tree/4.8.3" }, "funding": [ { @@ -5655,56 +5649,48 @@ { "url": "https://github.com/swoole", "type": "github" - }, - { - "url": "https://opencollective.com/swoole-src", - "type": "open_collective" } ], - "time": "2021-05-14T16:05:16+00:00" + "time": "2021-12-01T08:11:40+00:00" }, { "name": "symfony/console", - "version": "v5.4.1", + "version": "v6.0.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4" + "reference": "fafd9802d386bf1c267e0249ddb7ceb14dcfdad4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4", - "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4", + "url": "https://api.github.com/repos/symfony/console/zipball/fafd9802d386bf1c267e0249ddb7ceb14dcfdad4", + "reference": "fafd9802d386bf1c267e0249ddb7ceb14dcfdad4", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.0.2", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.9", - "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1|^2|^3", - "symfony/string": "^5.1|^6.0" + "symfony/string": "^5.4|^6.0" }, "conflict": { - "psr/log": ">=3", - "symfony/dependency-injection": "<4.4", - "symfony/dotenv": "<5.1", - "symfony/event-dispatcher": "<4.4", - "symfony/lock": "<4.4", - "symfony/process": "<4.4" + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" }, "provide": { - "psr/log-implementation": "1.0|2.0" + "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { - "psr/log": "^1|^2", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/event-dispatcher": "^4.4|^5.0|^6.0", - "symfony/lock": "^4.4|^5.0|^6.0", - "symfony/process": "^4.4|^5.0|^6.0", - "symfony/var-dumper": "^4.4|^5.0|^6.0" + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/event-dispatcher": "^5.4|^6.0", + "symfony/lock": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/var-dumper": "^5.4|^6.0" }, "suggest": { "psr/log": "For using the console logger", @@ -5744,7 +5730,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.1" + "source": "https://github.com/symfony/console/tree/v6.0.1" }, "funding": [ { @@ -5760,7 +5746,7 @@ "type": "tidelift" } ], - "time": "2021-12-09T11:22:43+00:00" + "time": "2021-12-09T12:47:37+00:00" }, { "name": "symfony/polyfill-intl-grapheme", @@ -6007,85 +5993,6 @@ ], "time": "2021-05-27T12:26:48+00:00" }, - { - "name": "symfony/polyfill-php73", - "version": "v1.23.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, - "files": [ - "bootstrap.php" - ], - "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 backporting some PHP 7.3+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.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": "2021-02-19T12:13:01+00:00" - }, { "name": "symfony/service-contracts", "version": "v3.0.0", @@ -6255,21 +6162,21 @@ }, { "name": "textalk/websocket", - "version": "1.5.2", + "version": "1.5.5", "source": { "type": "git", "url": "https://github.com/Textalk/websocket-php.git", - "reference": "b93249453806a2dd46495de46d76fcbcb0d8dee8" + "reference": "846542f82658132cd36acb7a7e8ce0f03960c295" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Textalk/websocket-php/zipball/b93249453806a2dd46495de46d76fcbcb0d8dee8", - "reference": "b93249453806a2dd46495de46d76fcbcb0d8dee8", + "url": "https://api.github.com/repos/Textalk/websocket-php/zipball/846542f82658132cd36acb7a7e8ce0f03960c295", + "reference": "846542f82658132cd36acb7a7e8ce0f03960c295", "shasum": "" }, "require": { "php": "^7.2 | ^8.0", - "psr/log": "^1.0" + "psr/log": "^1 | ^2 | ^3" }, "require-dev": { "php-coveralls/php-coveralls": "^2.0", @@ -6298,9 +6205,9 @@ "description": "WebSocket client and server", "support": { "issues": "https://github.com/Textalk/websocket-php/issues", - "source": "https://github.com/Textalk/websocket-php/tree/1.5.2" + "source": "https://github.com/Textalk/websocket-php/tree/1.5.5" }, - "time": "2021-02-12T15:39:23+00:00" + "time": "2021-08-07T10:21:40+00:00" }, { "name": "theseer/tokenizer", @@ -6433,16 +6340,16 @@ }, { "name": "vimeo/psalm", - "version": "4.7.2", + "version": "4.13.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "83a0325c0a95c0ab531d6b90c877068b464377b5" + "reference": "5cf660f63b548ccd4a56f62d916ee4d6028e01a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/83a0325c0a95c0ab531d6b90c877068b464377b5", - "reference": "83a0325c0a95c0ab531d6b90c877068b464377b5", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/5cf660f63b548ccd4a56f62d916ee4d6028e01a3", + "reference": "5cf660f63b548ccd4a56f62d916ee4d6028e01a3", "shasum": "" }, "require": { @@ -6452,6 +6359,7 @@ "composer/semver": "^1.4 || ^2.0 || ^3.0", "composer/xdebug-handler": "^1.1 || ^2.0", "dnoegel/php-xdg-base-dir": "^0.1.1", + "ext-ctype": "*", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -6461,11 +6369,11 @@ "felixfbecker/advanced-json-rpc": "^3.0.3", "felixfbecker/language-server-protocol": "^1.5", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", - "nikic/php-parser": "^4.10.1", + "nikic/php-parser": "^4.13", "openlss/lib-array2xml": "^1.0", "php": "^7.1|^8", "sebastian/diff": "^3.0 || ^4.0", - "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0", + "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0 || ^6.0", "webmozart/path-util": "^2.3" }, "provide": { @@ -6480,15 +6388,15 @@ "phpmyadmin/sql-parser": "5.1.0||dev-master", "phpspec/prophecy": ">=1.9.0", "phpunit/phpunit": "^9.0", - "psalm/plugin-phpunit": "^0.13", - "slevomat/coding-standard": "^6.3.11", + "psalm/plugin-phpunit": "^0.16", + "slevomat/coding-standard": "^7.0", "squizlabs/php_codesniffer": "^3.5", - "symfony/process": "^4.3", - "weirdan/phpunit-appveyor-reporter": "^1.0.0", + "symfony/process": "^4.3 || ^5.0 || ^6.0", "weirdan/prophecy-shim": "^1.0 || ^2.0" }, "suggest": { - "ext-igbinary": "^2.0.5" + "ext-curl": "In order to send data to shepherd", + "ext-igbinary": "^2.0.5 is required, used to serialize caching data" }, "bin": [ "psalm", @@ -6532,9 +6440,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.7.2" + "source": "https://github.com/vimeo/psalm/tree/4.13.1" }, - "time": "2021-05-01T20:56:25+00:00" + "time": "2021-11-23T23:52:49+00:00" }, { "name": "webmozart/path-util", From b95a8efe3d646135f06ea04d1d8a7e11e027f142 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 15 Dec 2021 14:18:55 +0100 Subject: [PATCH 2/2] chore: update php extensions --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3ff287ba66..155d8bc637 100755 --- a/Dockerfile +++ b/Dockerfile @@ -31,10 +31,10 @@ ENV DEBUG=$DEBUG ENV PHP_REDIS_VERSION=5.3.4 \ PHP_MONGODB_VERSION=1.9.1 \ - PHP_SWOOLE_VERSION=v4.8.0 \ + PHP_SWOOLE_VERSION=v4.8.3 \ PHP_IMAGICK_VERSION=3.5.1 \ - PHP_YAML_VERSION=2.2.1 \ - PHP_MAXMINDDB_VERSION=v1.10.1 + PHP_YAML_VERSION=2.2.2 \ + PHP_MAXMINDDB_VERSION=v1.11.0 RUN \ apk add --no-cache --virtual .deps \