From da6cf5faaf1498633e6a5361b8095991b6495663 Mon Sep 17 00:00:00 2001 From: Michiel Dethmers Date: Sun, 7 May 2023 21:07:24 +0100 Subject: [PATCH] update to use the updater plugin --- composer.json | 4 +- composer.lock | 223 +++++++++++++------------- docker/docker-phplist-config-dev.php | 3 + docker/docker-phplist-config-live.php | 3 + 4 files changed, 117 insertions(+), 116 deletions(-) diff --git a/composer.json b/composer.json index 9eb65ef63..d8aa466d7 100644 --- a/composer.json +++ b/composer.json @@ -88,7 +88,7 @@ }, { "type": "vcs", - "url": "https://github.com/michield/phplist-plugin-addons.git" + "url": "https://github.com/bramley/phplist-plugin-updater.git" } ], "extra": { @@ -128,7 +128,7 @@ "bramley/phplist-plugin-ckeditor": "dev-master", "bramley/phplist-plugin-segment": "dev-master", "phplist/phplist-plugin-subjectlineplaceholders": "dev-master", - "michield/phplist-plugin-addons": "dev-master" + "bramley/phplist-plugin-updater": "dev-main" }, "require-dev": { "behat/behat": "@stable", diff --git a/composer.lock b/composer.lock index adbb29cf3..8d2528dce 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": "649d2601a8490d6d847ec5d161288430", + "content-hash": "92c8e0a88ebd1df627cbe3401caeb515", "packages": [ { "name": "bramley/phplist-plugin-captcha", @@ -175,6 +175,43 @@ }, "time": "2023-04-03T14:57:27+00:00" }, + { + "name": "bramley/phplist-plugin-updater", + "version": "dev-main", + "source": { + "type": "git", + "url": "https://github.com/bramley/phplist-plugin-updater.git", + "reference": "c8d93dde1f631b1137c7445861ed72c1aeccb231" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bramley/phplist-plugin-updater/zipball/c8d93dde1f631b1137c7445861ed72c1aeccb231", + "reference": "c8d93dde1f631b1137c7445861ed72c1aeccb231", + "shasum": "" + }, + "require": { + "symfony/filesystem": "3.4" + }, + "default-branch": true, + "type": "phplist-plugin", + "license": [ + "GNU Affero General Public License version 3.0 or later (AGPLv3+)" + ], + "description": "Updater plugin for phpList", + "homepage": "https://www.phpList.org/", + "keywords": [ + "email", + "manager", + "newsletter", + "permission marketing", + "phplist" + ], + "support": { + "source": "https://github.com/bramley/phplist-plugin-updater/tree/1.0.0", + "issues": "https://github.com/bramley/phplist-plugin-updater/issues" + }, + "time": "2023-04-28T07:31:40+00:00" + }, { "name": "chdemko/bitarray", "version": "1.2.0", @@ -376,7 +413,7 @@ ], "support": { "issues": "https://github.com/jdorn/sql-formatter/issues", - "source": "https://github.com/jdorn/sql-formatter/tree/master" + "source": "https://github.com/jdorn/sql-formatter/tree/v1.2.17" }, "time": "2014-01-12T16:20:24+00:00" }, @@ -481,45 +518,6 @@ }, "time": "2022-07-29T20:41:14+00:00" }, - { - "name": "michield/phplist-plugin-addons", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/michield/phplist-plugin-addons.git", - "reference": "f4f6c873c0977498557a57e5d9f1c7488e15cf1e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/michield/phplist-plugin-addons/zipball/f4f6c873c0977498557a57e5d9f1c7488e15cf1e", - "reference": "f4f6c873c0977498557a57e5d9f1c7488e15cf1e", - "shasum": "" - }, - "require": { - "symfony/filesystem": "3.4" - }, - "default-branch": true, - "type": "phplist-plugin", - "license": [ - "GNU Affero General Public License version 3.0 or later (AGPLv3+)" - ], - "description": "Addons plugin for phpList", - "homepage": "https://www.phpList.org/", - "keywords": [ - "email", - "manager", - "newsletter", - "permission marketing", - "phplist" - ], - "support": { - "issues": "https://github.com/phpList/phpList3/issues", - "forum": "https://discuss.phplist.org/", - "wiki": "http://resources.phplist.com/", - "source": "https://github.com/phpList/phpList3" - }, - "time": "2023-03-26T19:19:30+00:00" - }, { "name": "michield/phplist-plugin-campaignslicer", "version": "dev-master", @@ -1473,16 +1471,16 @@ "packages-dev": [ { "name": "behat/behat", - "version": "v3.12.0", + "version": "v3.13.0", "source": { "type": "git", "url": "https://github.com/Behat/Behat.git", - "reference": "2f059c9172764ba1f1759b3679aca499b665330a" + "reference": "9dd7cdb309e464ddeab095cd1a5151c2dccba4ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Behat/zipball/2f059c9172764ba1f1759b3679aca499b665330a", - "reference": "2f059c9172764ba1f1759b3679aca499b665330a", + "url": "https://api.github.com/repos/Behat/Behat/zipball/9dd7cdb309e464ddeab095cd1a5151c2dccba4ab", + "reference": "9dd7cdb309e464ddeab095cd1a5151c2dccba4ab", "shasum": "" }, "require": { @@ -1554,9 +1552,9 @@ ], "support": { "issues": "https://github.com/Behat/Behat/issues", - "source": "https://github.com/Behat/Behat/tree/v3.12.0" + "source": "https://github.com/Behat/Behat/tree/v3.13.0" }, - "time": "2022-11-29T15:30:11+00:00" + "time": "2023-04-18T15:40:53+00:00" }, { "name": "behat/gherkin", @@ -1994,16 +1992,16 @@ }, { "name": "genesis/behat-fail-aid", - "version": "3.7.4", + "version": "3.7.5", "source": { "type": "git", "url": "https://github.com/forceedge01/behat-fail-aid.git", - "reference": "43fb34def35a66a073d1b23cedf07d65fcf24572" + "reference": "bd25adc2b39352155b93eee7ba162194bb27259b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/forceedge01/behat-fail-aid/zipball/43fb34def35a66a073d1b23cedf07d65fcf24572", - "reference": "43fb34def35a66a073d1b23cedf07d65fcf24572", + "url": "https://api.github.com/repos/forceedge01/behat-fail-aid/zipball/bd25adc2b39352155b93eee7ba162194bb27259b", + "reference": "bd25adc2b39352155b93eee7ba162194bb27259b", "shasum": "" }, "require": { @@ -2050,28 +2048,28 @@ ], "support": { "issues": "https://github.com/forceedge01/behat-fail-aid/issues", - "source": "https://github.com/forceedge01/behat-fail-aid/tree/3.7.4" + "source": "https://github.com/forceedge01/behat-fail-aid/tree/3.7.5" }, - "time": "2022-07-28T21:59:26+00:00" + "time": "2023-05-04T10:11:46+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.4.4", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf" + "reference": "b635f279edd83fc275f822a1188157ffea568ff6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6", + "reference": "b635f279edd83fc275f822a1188157ffea568ff6", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.1 || ^2.0", "ralouphie/getallheaders": "^3.0" }, "provide": { @@ -2091,9 +2089,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "2.4-dev" } }, "autoload": { @@ -2155,7 +2150,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.4" + "source": "https://github.com/guzzle/psr7/tree/2.5.0" }, "funding": [ { @@ -2171,7 +2166,7 @@ "type": "tidelift" } ], - "time": "2023-03-09T13:19:02+00:00" + "time": "2023-04-17T16:11:26+00:00" }, { "name": "instaclick/php-webdriver", @@ -2288,21 +2283,21 @@ }, { "name": "psr/http-factory", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "reference": "e616d01114759c4c489f93b099585439f795fe35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", "shasum": "" }, "require": { "php": ">=7.0.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -2322,7 +2317,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interfaces for PSR-7 HTTP message factories", @@ -2337,31 +2332,31 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" + "source": "https://github.com/php-fig/http-factory/tree/1.0.2" }, - "time": "2019-04-30T12:38:16+00:00" + "time": "2023-04-10T20:10:41+00:00" }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" }, "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/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -2376,7 +2371,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP messages", @@ -2390,9 +2385,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/2.0" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:54:51+00:00" }, { "name": "ralouphie/getallheaders", @@ -2561,16 +2556,16 @@ }, { "name": "symfony/console", - "version": "v5.4.21", + "version": "v5.4.23", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c77433ddc6cdc689caf48065d9ea22ca0853fbd9" + "reference": "90f21e27d0d88ce38720556dd164d4a1e4c3934c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c77433ddc6cdc689caf48065d9ea22ca0853fbd9", - "reference": "c77433ddc6cdc689caf48065d9ea22ca0853fbd9", + "url": "https://api.github.com/repos/symfony/console/zipball/90f21e27d0d88ce38720556dd164d4a1e4c3934c", + "reference": "90f21e27d0d88ce38720556dd164d4a1e4c3934c", "shasum": "" }, "require": { @@ -2635,12 +2630,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.21" + "source": "https://github.com/symfony/console/tree/v5.4.23" }, "funding": [ { @@ -2656,7 +2651,7 @@ "type": "tidelift" } ], - "time": "2023-02-25T16:59:41+00:00" + "time": "2023-04-24T18:47:29+00:00" }, { "name": "symfony/dependency-injection", @@ -2813,16 +2808,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v5.4.21", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "f0ae1383a8285dfc6752b8d8602790953118ff5a" + "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f0ae1383a8285dfc6752b8d8602790953118ff5a", - "reference": "f0ae1383a8285dfc6752b8d8602790953118ff5a", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1df20e45d56da29a4b1d8259dd6e950acbf1b13f", + "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f", "shasum": "" }, "require": { @@ -2878,7 +2873,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.21" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.22" }, "funding": [ { @@ -2894,7 +2889,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-03-17T11:31:58+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -3689,16 +3684,16 @@ }, { "name": "symfony/string", - "version": "v5.4.21", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "edac10d167b78b1d90f46a80320d632de0bd9f2f" + "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/edac10d167b78b1d90f46a80320d632de0bd9f2f", - "reference": "edac10d167b78b1d90f46a80320d632de0bd9f2f", + "url": "https://api.github.com/repos/symfony/string/zipball/8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", + "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", "shasum": "" }, "require": { @@ -3755,7 +3750,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.21" + "source": "https://github.com/symfony/string/tree/v5.4.22" }, "funding": [ { @@ -3771,7 +3766,7 @@ "type": "tidelift" } ], - "time": "2023-02-22T08:00:55+00:00" + "time": "2023-03-14T06:11:53+00:00" }, { "name": "symfony/translation", @@ -3942,16 +3937,16 @@ }, { "name": "symfony/yaml", - "version": "v5.4.21", + "version": "v5.4.23", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "3713e20d93e46e681e51605d213027e48dab3469" + "reference": "4cd2e3ea301aadd76a4172756296fe552fb45b0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/3713e20d93e46e681e51605d213027e48dab3469", - "reference": "3713e20d93e46e681e51605d213027e48dab3469", + "url": "https://api.github.com/repos/symfony/yaml/zipball/4cd2e3ea301aadd76a4172756296fe552fb45b0b", + "reference": "4cd2e3ea301aadd76a4172756296fe552fb45b0b", "shasum": "" }, "require": { @@ -3997,7 +3992,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.21" + "source": "https://github.com/symfony/yaml/tree/v5.4.23" }, "funding": [ { @@ -4013,7 +4008,7 @@ "type": "tidelift" } ], - "time": "2023-02-21T19:46:44+00:00" + "time": "2023-04-23T19:33:36+00:00" }, { "name": "zbateson/mail-mime-parser", @@ -4158,27 +4153,27 @@ }, { "name": "zbateson/stream-decorators", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/zbateson/stream-decorators.git", - "reference": "7466ff45d249c86b96267a83cdae68365ae1787e" + "reference": "712b9e7d25dc665a6c64bdba65929bbb6f0932aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zbateson/stream-decorators/zipball/7466ff45d249c86b96267a83cdae68365ae1787e", - "reference": "7466ff45d249c86b96267a83cdae68365ae1787e", + "url": "https://api.github.com/repos/zbateson/stream-decorators/zipball/712b9e7d25dc665a6c64bdba65929bbb6f0932aa", + "reference": "712b9e7d25dc665a6c64bdba65929bbb6f0932aa", "shasum": "" }, "require": { "guzzlehttp/psr7": "^1.9 | ^2.0", - "php": ">=7.1", + "php": ">=7.2", "zbateson/mb-wrapper": "^1.0.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "*", "phpstan/phpstan": "*", - "phpunit/phpunit": "<=9.0" + "phpunit/phpunit": "<10.0" }, "type": "library", "autoload": { @@ -4209,7 +4204,7 @@ ], "support": { "issues": "https://github.com/zbateson/stream-decorators/issues", - "source": "https://github.com/zbateson/stream-decorators/tree/1.1.0" + "source": "https://github.com/zbateson/stream-decorators/tree/1.2.0" }, "funding": [ { @@ -4217,7 +4212,7 @@ "type": "github" } ], - "time": "2023-01-11T23:22:44+00:00" + "time": "2023-04-19T16:56:59+00:00" } ], "aliases": [], @@ -4240,7 +4235,7 @@ "bramley/phplist-plugin-ckeditor": 20, "bramley/phplist-plugin-segment": 20, "phplist/phplist-plugin-subjectlineplaceholders": 20, - "michield/phplist-plugin-addons": 20, + "bramley/phplist-plugin-updater": 20, "behat/behat": 0, "behat/mink-selenium2-driver": 0, "friends-of-behat/mink": 0, diff --git a/docker/docker-phplist-config-dev.php b/docker/docker-phplist-config-dev.php index 14eb4cd61..33f779f4d 100644 --- a/docker/docker-phplist-config-dev.php +++ b/docker/docker-phplist-config-dev.php @@ -23,4 +23,7 @@ $addonsUpdater = [ 'work' => '/var/tmp/phplistupdate', +]; +$updaterConfig = [ + 'work' => '/var/tmp/phplistupdate', ]; \ No newline at end of file diff --git a/docker/docker-phplist-config-live.php b/docker/docker-phplist-config-live.php index 48d539fc9..5ed3ab3fb 100644 --- a/docker/docker-phplist-config-live.php +++ b/docker/docker-phplist-config-live.php @@ -17,4 +17,7 @@ $addonsUpdater = [ 'work' => '/var/tmp/phplistupdate', +]; +$updaterConfig = [ + 'work' => '/var/tmp/phplistupdate', ]; \ No newline at end of file