From c0c743f9c6330bcbcaff5a73cdafa62b99df5069 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 18 Mar 2023 13:41:03 -0400 Subject: [PATCH 01/67] Bump badge version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b1746ed62..c14f6d437 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ _Shaarli is a minimalist link sharing service that you can install on your own s _It is designed to be personal (single-user), fast and handy._ [![](https://img.shields.io/badge/stable-v0.11.1-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.11.1) -[![](https://img.shields.io/badge/latest-v0.12.1-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.12.1) +[![](https://img.shields.io/badge/latest-v0.12.2-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.12.2) [![](https://img.shields.io/badge/master-v0.12.x-blue.svg)](https://github.com/shaarli/Shaarli) [![](https://github.com/shaarli/Shaarli/actions/workflows/ci.yml/badge.svg)](https://github.com/shaarli/Shaarli/actions) [![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli) From 6624f00c05ad3cfdc664287189e42d8caf11470a Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 18 Mar 2023 14:03:34 -0400 Subject: [PATCH 02/67] Makefile: Use GNU tar if available (#1957) --- Makefile | 13 ++++++++++--- doc/md/dev/Release-Shaarli.md | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 22c63138e..b96600453 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,13 @@ docker_%: ## PHPCS := $(BIN)/phpcs +# Use GNU Tar where available +ifneq (, $(shell which gtar)) +TAR := gtar +else +TAR := tar +endif + code_sniffer: @$(PHPCS) @@ -115,9 +122,9 @@ build_frontend: frontend_dependencies ### generate a release tarball and include 3rd-party dependencies and translations release_tar: composer_dependencies htmldoc translate build_frontend git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).tar HEAD - tar rvf $(ARCHIVE_VERSION).tar --transform "s|^vendor|$(ARCHIVE_PREFIX)vendor|" vendor/ - tar rvf $(ARCHIVE_VERSION).tar --transform "s|^doc/html|$(ARCHIVE_PREFIX)doc/html|" doc/html/ - tar rvf $(ARCHIVE_VERSION).tar --transform "s|^tpl|$(ARCHIVE_PREFIX)tpl|" tpl/ + $(TAR) rvf $(ARCHIVE_VERSION).tar --transform "s|^vendor|$(ARCHIVE_PREFIX)vendor|" vendor/ + $(TAR) rvf $(ARCHIVE_VERSION).tar --transform "s|^doc/html|$(ARCHIVE_PREFIX)doc/html|" doc/html/ + $(TAR) rvf $(ARCHIVE_VERSION).tar --transform "s|^tpl|$(ARCHIVE_PREFIX)tpl|" tpl/ gzip $(ARCHIVE_VERSION).tar ### generate a release zip and include 3rd-party dependencies and translations diff --git a/doc/md/dev/Release-Shaarli.md b/doc/md/dev/Release-Shaarli.md index e1ada539c..9440c2fb2 100644 --- a/doc/md/dev/Release-Shaarli.md +++ b/doc/md/dev/Release-Shaarli.md @@ -14,6 +14,7 @@ This guide assumes that you have: - create a new release - [Composer](https://getcomposer.org/) needs to be installed - The [venv](https://docs.python.org/3/library/venv.html) Python 3 module needs to be installed for HTML documentation generation. +- Make sure you have GNU `tar` installed (not BSD `tar`). On macOS, you can install it with `brew install gnu-tar`. ## Release notes and `CHANGELOG.md` From 0a47d8919352c46e50fd17c44d3410a36484f3c7 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 18 Mar 2023 14:27:41 -0400 Subject: [PATCH 03/67] Drop support for PHP 7.1, 7.2 and 7.3 This commit doesn't yet enforce the new requirement since previous version will continue to work for a short while. --- .github/workflows/ci.yml | 2 +- application/helper/ApplicationUtils.php | 4 +- composer.json | 8 +- composer.lock | 1599 ++++++++++++----------- 4 files changed, 867 insertions(+), 746 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9c708099..81547154e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] + php-versions: ['7.4', '8.0', '8.1', '8.2'] name: PHP ${{ matrix.php-versions }} steps: - name: Set locales diff --git a/application/helper/ApplicationUtils.php b/application/helper/ApplicationUtils.php index 063300ca0..d875f2b8c 100644 --- a/application/helper/ApplicationUtils.php +++ b/application/helper/ApplicationUtils.php @@ -329,7 +329,9 @@ public static function getPhpEol(string $fullVersion): string '7.2' => '2020-11-30', '7.3' => '2021-12-06', '7.4' => '2022-11-28', - '8.0' => '2023-12-01', + '8.0' => '2023-11-26', + '8.1' => '2024-11-25', + '8.2' => '2025-12-08', ][$matches[1]] ?? (new \DateTime('+2 year'))->format('Y-m-d'); } } diff --git a/composer.json b/composer.json index 3015d8eb4..a2d378c76 100644 --- a/composer.json +++ b/composer.json @@ -12,11 +12,11 @@ "config": { "sort-packages": true, "platform": { - "php": "7.1.29" + "php": "7.4.33" } }, "require": { - "php": ">=7.1", + "php": ">=7.4", "ext-json": "*", "ext-zlib": "*", "arthurhoaro/web-thumbnailer": "^2.0", @@ -31,8 +31,8 @@ }, "require-dev": { "roave/security-advisories": "dev-master", - "squizlabs/php_codesniffer": "3.*", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "squizlabs/php_codesniffer": "^3.0", + "phpunit/phpunit": "^9.0" }, "suggest": { "ext-curl": "Allows fetching web pages and thumbnails in a more robust way", diff --git a/composer.lock b/composer.lock index 7b14f5996..1aaa4d77f 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": "326e743376bd043cd7de28c02b5ac1d5", + "content-hash": "e37830ae8a7cbd6670f0493c3d90c618", "packages": [ { "name": "arthurhoaro/web-thumbnailer", - "version": "v2.1.0", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/ArthurHoaro/web-thumbnailer.git", - "reference": "47675fc58f6fd1dfd63f911b6e86ee5f31e8efd1" + "reference": "7b471c2c184fb07fb7f0c2aa32d7fd35b865a799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ArthurHoaro/web-thumbnailer/zipball/47675fc58f6fd1dfd63f911b6e86ee5f31e8efd1", - "reference": "47675fc58f6fd1dfd63f911b6e86ee5f31e8efd1", + "url": "https://api.github.com/repos/ArthurHoaro/web-thumbnailer/zipball/7b471c2c184fb07fb7f0c2aa32d7fd35b865a799", + "reference": "7b471c2c184fb07fb7f0c2aa32d7fd35b865a799", "shasum": "" }, "require": { @@ -50,9 +50,9 @@ "description": "PHP library which will retrieve a thumbnail for any given URL", "support": { "issues": "https://github.com/ArthurHoaro/web-thumbnailer/issues", - "source": "https://github.com/ArthurHoaro/web-thumbnailer/tree/v2.1.0" + "source": "https://github.com/ArthurHoaro/web-thumbnailer/tree/v2.2.0" }, - "time": "2021-05-08T11:20:56+00:00" + "time": "2022-11-24T19:36:50+00:00" }, { "name": "erusev/parsedown", @@ -157,16 +157,16 @@ }, { "name": "gettext/gettext", - "version": "v4.8.7", + "version": "v4.8.8", "source": { "type": "git", "url": "https://github.com/php-gettext/Gettext.git", - "reference": "3f7bc5ef23302a9059e64934f3d59e454516bec0" + "reference": "302a00aa9d6762c92c884d879c15d3ed05d6a37d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/3f7bc5ef23302a9059e64934f3d59e454516bec0", - "reference": "3f7bc5ef23302a9059e64934f3d59e454516bec0", + "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/302a00aa9d6762c92c884d879c15d3ed05d6a37d", + "reference": "302a00aa9d6762c92c884d879c15d3ed05d6a37d", "shasum": "" }, "require": { @@ -218,7 +218,7 @@ "support": { "email": "oom@oscarotero.com", "issues": "https://github.com/oscarotero/Gettext/issues", - "source": "https://github.com/php-gettext/Gettext/tree/v4.8.7" + "source": "https://github.com/php-gettext/Gettext/tree/v4.8.8" }, "funding": [ { @@ -234,20 +234,20 @@ "type": "patreon" } ], - "time": "2022-08-02T09:42:10+00:00" + "time": "2022-12-08T11:59:50+00:00" }, { "name": "gettext/languages", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/php-gettext/Languages.git", - "reference": "ed56dd2c7f4024cc953ed180d25f02f2640e3ffa" + "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Languages/zipball/ed56dd2c7f4024cc953ed180d25f02f2640e3ffa", - "reference": "ed56dd2c7f4024cc953ed180d25f02f2640e3ffa", + "url": "https://api.github.com/repos/php-gettext/Languages/zipball/4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab", + "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab", "shasum": "" }, "require": { @@ -296,7 +296,7 @@ ], "support": { "issues": "https://github.com/php-gettext/Languages/issues", - "source": "https://github.com/php-gettext/Languages/tree/2.9.0" + "source": "https://github.com/php-gettext/Languages/tree/2.10.0" }, "funding": [ { @@ -308,7 +308,7 @@ "type": "github" } ], - "time": "2021-11-11T17:30:39+00:00" + "time": "2022-10-18T15:00:10+00:00" }, { "name": "katzgrau/klogger", @@ -366,39 +366,43 @@ }, { "name": "malkusch/lock", - "version": "v2.1", + "version": "v2.2.1", "source": { "type": "git", "url": "https://github.com/php-lock/lock.git", - "reference": "093f389ec2f38fc8686d2f70e23378182fce7714" + "reference": "63c1b268f521a702cb8755ed92631c1fac1775e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-lock/lock/zipball/093f389ec2f38fc8686d2f70e23378182fce7714", - "reference": "093f389ec2f38fc8686d2f70e23378182fce7714", + "url": "https://api.github.com/repos/php-lock/lock/zipball/63c1b268f521a702cb8755ed92631c1fac1775e6", + "reference": "63c1b268f521a702cb8755ed92631c1fac1775e6", "shasum": "" }, "require": { - "php": ">=7.1", - "psr/log": "^1" + "php": "^7.2 || ^8.0", + "psr/log": "^1|^2|^3" }, "require-dev": { "eloquent/liberator": "^2.0", "ext-memcached": "*", "ext-pcntl": "*", + "ext-pdo": "*", "ext-pdo_mysql": "*", "ext-pdo_sqlite": "*", - "ext-redis": "*", "ext-sysvsem": "*", + "friendsofphp/php-cs-fixer": "^2.16", "johnkary/phpunit-speedtrap": "^3.0", - "kriswallsmith/spork": "^0.3", - "mikey179/vfsstream": "^1.6", + "mikey179/vfsstream": "^1.6.7", "php-mock/php-mock-phpunit": "^2.1", - "phpunit/phpunit": "^7.4", + "phpstan/phpstan": "^0.12.58", + "phpunit/phpunit": "^9.4", "predis/predis": "^1.1", + "spatie/async": "^1.5", "squizlabs/php_codesniffer": "^3.3" }, "suggest": { + "ext-igbinary": "To use this library with PHP Redis igbinary serializer enabled.", + "ext-lzf": "To use this library with PHP Redis lzf compression enabled.", "ext-pnctl": "Enables locking with flock without busy waiting in CLI scripts.", "ext-redis": "To use this library with the PHP Redis extension.", "ext-sysvsem": "Enables locking using semaphores.", @@ -445,9 +449,9 @@ ], "support": { "issues": "https://github.com/php-lock/lock/issues", - "source": "https://github.com/php-lock/lock/tree/v2.1" + "source": "https://github.com/php-lock/lock/tree/v2.2.1" }, - "time": "2018-12-12T19:53:29+00:00" + "time": "2022-04-26T09:25:15+00:00" }, { "name": "nikic/fast-route", @@ -501,22 +505,30 @@ }, { "name": "phpunit/php-text-template", - "version": "1.2.1", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -540,35 +552,41 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" + "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" }, - "time": "2015-06-21T13:50:34+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T05:33:50+00:00" }, { "name": "pimple/pimple", - "version": "v3.2.3", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/silexphp/Pimple.git", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32" + "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed", + "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/container": "^1.0" + "php": ">=7.2.5", + "psr/container": "^1.1 || ^2.0" }, "require-dev": { - "symfony/phpunit-bridge": "^3.2" + "symfony/phpunit-bridge": "^5.4@dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "3.4.x-dev" } }, "autoload": { @@ -587,40 +605,34 @@ } ], "description": "Pimple, a simple Dependency Injection Container", - "homepage": "http://pimple.sensiolabs.org", + "homepage": "https://pimple.symfony.com", "keywords": [ "container", "dependency injection" ], "support": { - "issues": "https://github.com/silexphp/Pimple/issues", - "source": "https://github.com/silexphp/Pimple/tree/master" + "source": "https://github.com/silexphp/Pimple/tree/v3.5.0" }, - "time": "2018-01-21T07:42:36+00:00" + "time": "2021-10-28T11:13:42+00:00" }, { "name": "psr/container", - "version": "1.0.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.4.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -633,7 +645,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common Container Interface (PHP FIG PSR-11)", @@ -647,9 +659,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" + "source": "https://github.com/php-fig/container/tree/1.1.2" }, - "time": "2017-02-14T16:28:37+00:00" + "time": "2021-11-05T16:50:12+00:00" }, { "name": "psr/http-message", @@ -963,30 +975,30 @@ "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^0.16 || ^1", "phpstan/phpstan": "^1.4", "phpstan/phpstan-phpunit": "^1", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -1013,7 +1025,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.1" + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" }, "funding": [ { @@ -1029,20 +1041,20 @@ "type": "tidelift" } ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "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": { @@ -1080,7 +1092,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": [ { @@ -1088,38 +1100,43 @@ "type": "tidelift" } ], - "time": "2022-03-03T13:19:32+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { - "name": "phar-io/manifest", - "version": "1.0.3", + "name": "nikic/php-parser", + "version": "v4.15.4", "source": { "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", - "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-phar": "*", - "phar-io/version": "^2.0", - "php": "^5.6 || ^7.0" + "ext-tokenizer": "*", + "php": ">=7.0" }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "4.9-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1127,46 +1144,47 @@ ], "authors": [ { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" + "name": "Nikita Popov" } ], - "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], "support": { - "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/master" + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4" }, - "time": "2018-07-08T19:23:20+00:00" + "time": "2023-03-05T19:49:14+00:00" }, { - "name": "phar-io/version", - "version": "2.0.1", + "name": "phar-io/manifest", + "version": "2.0.3", "source": { "type": "git", - "url": "https://github.com/phar-io/version.git", - "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" + "url": "https://github.com/phar-io/manifest.git", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", - "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "ext-dom": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -1193,276 +1211,104 @@ "role": "Developer" } ], - "description": "Library for handling version information and constraints", - "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/master" - }, - "time": "2018-07-08T19:19:57+00:00" - }, - { - "name": "phpdocumentor/reflection-common", - "version": "2.1.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b", - "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", - "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/master" - }, - "time": "2020-04-27T09:25:28+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "4.3.4", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c", - "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c", - "shasum": "" - }, - "require": { - "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0", - "phpdocumentor/type-resolver": "~0.4 || ^1.0.0", - "webmozart/assert": "^1.0" - }, - "require-dev": { - "doctrine/instantiator": "^1.0.5", - "mockery/mockery": "^1.0", - "phpdocumentor/type-resolver": "0.4.*", - "phpunit/phpunit": "^6.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/4.x" + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/2.0.3" }, - "time": "2019-12-28T18:55:12+00:00" + "time": "2021-07-20T11:28:43+00:00" }, { - "name": "phpdocumentor/type-resolver", - "version": "1.0.1", + "name": "phar-io/version", + "version": "3.2.1", "source": { "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9" + "url": "https://github.com/phar-io/version.git", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", - "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", "shasum": "" }, "require": { - "php": "^7.1", - "phpdocumentor/reflection-common": "^2.0" - }, - "require-dev": { - "ext-tokenizer": "^7.1", - "mockery/mockery": "~1", - "phpunit/phpunit": "^7.0" + "php": "^7.2 || ^8.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "support": { - "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/0.7.2" - }, - "time": "2019-08-22T18:11:29+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "v1.10.3", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "451c3cd1418cf640de218914901e51b064abb093" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093", - "reference": "451c3cd1418cf640de218914901e51b064abb093", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", - "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" - }, - "require-dev": { - "phpspec/phpspec": "^2.5 || ^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.10.x-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\": "src/Prophecy" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" }, { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" } ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], + "description": "Library for handling version information and constraints", "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.10.3" + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.2.1" }, - "time": "2020-03-05T15:02:03+00:00" + "time": "2022-02-21T01:04:05+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "6.1.4", + "version": "9.2.26", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" + "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-xmlwriter": "*", - "php": "^7.1", - "phpunit/php-file-iterator": "^2.0", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.0", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.1 || ^4.0", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1" + "nikic/php-parser": "^4.15", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.3", + "phpunit/php-text-template": "^2.0.2", + "sebastian/code-unit-reverse-lookup": "^2.0.2", + "sebastian/complexity": "^2.0", + "sebastian/environment": "^5.1.2", + "sebastian/lines-of-code": "^1.0.3", + "sebastian/version": "^3.0.1", + "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-xdebug": "^2.6.0" + "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": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "9.2-dev" } }, "autoload": { @@ -1490,34 +1336,40 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/master" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26" }, - "time": "2018-10-31T16:06:48+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-03-06T12:58:08+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "2.0.5", + "version": "3.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5" + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1544,7 +1396,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" }, "funding": [ { @@ -1552,32 +1404,36 @@ "type": "github" } ], - "time": "2021-12-02T12:42:26+00:00" + "time": "2021-12-02T12:48:52+00:00" }, { - "name": "phpunit/php-timer", - "version": "2.1.3", + "name": "phpunit/php-invoker", + "version": "3.1.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -1596,14 +1452,14 @@ "role": "lead" } ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", "keywords": [ - "timer" + "process" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" }, "funding": [ { @@ -1611,33 +1467,32 @@ "type": "github" } ], - "time": "2020-11-30T08:20:02+00:00" + "time": "2020-09-28T05:58:55+00:00" }, { - "name": "phpunit/php-token-stream", - "version": "3.1.3", + "name": "phpunit/php-timer", + "version": "5.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "9c1da83261628cb24b6a6df371b6e312b3954768" + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768", - "reference": "9c1da83261628cb24b6a6df371b6e312b3954768", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1652,17 +1507,18 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", "keywords": [ - "tokenizer" + "timer" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3" + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" }, "funding": [ { @@ -1670,58 +1526,54 @@ "type": "github" } ], - "abandoned": true, - "time": "2021-07-26T12:15:06+00:00" + "time": "2020-10-26T13:16:10+00:00" }, { "name": "phpunit/phpunit", - "version": "7.5.20", + "version": "9.6.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9467db479d1b0487c99733bb1e7944d32deded2c" + "reference": "86e761949019ae83f49240b2f2123fb5ab3b2fc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c", - "reference": "9467db479d1b0487c99733bb1e7944d32deded2c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86e761949019ae83f49240b2f2123fb5ab3b2fc5", + "reference": "86e761949019ae83f49240b2f2123fb5ab3b2fc5", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.7", - "phar-io/manifest": "^1.0.2", - "phar-io/version": "^2.0", - "php": "^7.1", - "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^6.0.7", - "phpunit/php-file-iterator": "^2.0.1", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1", - "sebastian/comparator": "^3.0", - "sebastian/diff": "^3.0", - "sebastian/environment": "^4.0", - "sebastian/exporter": "^3.1", - "sebastian/global-state": "^2.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0", - "sebastian/version": "^2.0.1" - }, - "conflict": { - "phpunit/phpunit-mock-objects": "*" - }, - "require-dev": { - "ext-pdo": "*" + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.10.1", + "phar-io/manifest": "^2.0.3", + "phar-io/version": "^3.0.2", + "php": ">=7.3", + "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.3", + "phpunit/php-timer": "^5.0.2", + "sebastian/cli-parser": "^1.0.1", + "sebastian/code-unit": "^1.0.6", + "sebastian/comparator": "^4.0.8", + "sebastian/diff": "^4.0.3", + "sebastian/environment": "^5.1.3", + "sebastian/exporter": "^4.0.5", + "sebastian/global-state": "^5.0.1", + "sebastian/object-enumerator": "^4.0.3", + "sebastian/resource-operations": "^3.0.3", + "sebastian/type": "^3.2", + "sebastian/version": "^3.0.2" }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0" + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -1729,10 +1581,13 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], "classmap": [ "src/" ] @@ -1757,9 +1612,23 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/7.5.20" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.5" }, - "time": "2020-01-08T08:45:45+00:00" + "funding": [ + { + "url": "https://phpunit.de/sponsors.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" + } + ], + "time": "2023-03-09T06:34:10+00:00" }, { "name": "roave/security-advisories", @@ -1767,20 +1636,22 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "773292d413a97c357a0b49635afd5fdb1d4f314a" + "reference": "ad434708152844968e15adf8eb3f4a2d7066242e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/773292d413a97c357a0b49635afd5fdb1d4f314a", - "reference": "773292d413a97c357a0b49635afd5fdb1d4f314a", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/ad434708152844968e15adf8eb3f4a2d7066242e", + "reference": "ad434708152844968e15adf8eb3f4a2d7066242e", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", "admidio/admidio": "<4.1.9", "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", + "aheinze/cockpit": "<=2.2.1", "akaunting/akaunting": "<2.1.13", - "alextselegidis/easyappointments": "<=1.4.3", + "akeneo/pim-community-dev": "<5.0.119|>=6,<6.0.53", + "alextselegidis/easyappointments": "<1.5", "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1", "amazing/media2click": ">=1,<1.3.3", "amphp/artax": "<1.0.6|>=2,<2.0.6", @@ -1788,16 +1659,24 @@ "amphp/http-client": ">=4,<4.4", "anchorcms/anchor-cms": "<=0.12.7", "andreapollastri/cipi": "<=3.1.15", - "api-platform/core": ">=2.2,<2.2.10|>=2.3,<2.3.6", + "apereo/phpcas": "<1.6", + "api-platform/core": ">=2.2,<2.2.10|>=2.3,<2.3.6|>=2.6,<2.7.10|>=3,<3.0.12|>=3.1,<3.1.3", "appwrite/server-ce": "<0.11.1|>=0.12,<0.12.2", + "arc/web": "<3", "area17/twill": "<1.2.5|>=2,<2.5.3", "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99", + "automad/automad": "<1.8", + "awesome-support/awesome-support": "<=6.0.7", "aws/aws-sdk-php": ">=3,<3.2.1", + "backdrop/backdrop": "<=1.23", + "badaso/core": "<2.7", "bagisto/bagisto": "<0.1.5", "barrelstrength/sprout-base-email": "<1.2.7", "barrelstrength/sprout-forms": "<3.9", "barryvdh/laravel-translation-manager": "<0.6.2", - "baserproject/basercms": "<4.5.4", + "barzahlen/barzahlen-php": "<2.0.1", + "baserproject/basercms": "<4.7.2", + "bassjobsen/bootstrap-3-typeahead": ">4.0.2", "billz/raspap-webgui": "<=2.6.6", "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", "bmarshall511/wordpress_zero_spam": "<5.2.13", @@ -1812,19 +1691,22 @@ "bugsnag/bugsnag-laravel": ">=2,<2.0.2", "bytefury/crater": "<6.0.2", "cachethq/cachet": "<2.5.1", - "cakephp/cakephp": "<3.10.3|>=4,<4.0.6", + "cakephp/cakephp": "<3.10.3|>=4,<4.0.10|>=4.2,<4.2.12|>=4.3,<4.3.11|>=4.4,<4.4.10|= 1.3.7|>=4.1,<4.1.4", + "cakephp/database": ">=4.2,<4.2.12|>=4.3,<4.3.11|>=4.4,<4.4.10", "cardgate/magento2": "<2.0.33", "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", "cartalyst/sentry": "<=2.1.6", "catfan/medoo": "<1.7.5", - "centreon/centreon": "<20.10.7", + "centreon/centreon": "<22.10-beta.1", "cesnet/simplesamlphp-module-proxystatistics": "<3.1", + "cockpit-hq/cockpit": "<2.4.1", "codeception/codeception": "<3.1.3|>=4,<4.1.22", "codeigniter/framework": "<=3.0.6", - "codeigniter4/framework": "<4.1.9", + "codeigniter4/framework": "<4.2.11", + "codeigniter4/shield": "<1-beta.4|= 1.0.0-beta", "codiad/codiad": "<=2.8.4", "composer/composer": "<1.10.26|>=2-alpha.1,<2.2.12|>=2.3,<2.3.5", - "concrete5/concrete5": "<9", + "concrete5/concrete5": "<=9.1.3|>= 9.0.0RC1, < 9.1.3", "concrete5/core": "<8.5.8|>=9,<9.1", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/contao": ">=4,<4.4.56|>=4.5,<4.9.18|>=4.10,<4.11.7|>=4.13,<4.13.3", @@ -1832,13 +1714,15 @@ "contao/core-bundle": "<4.9.18|>=4.10,<4.11.7|>=4.13,<4.13.3|= 4.10.0", "contao/listing-bundle": ">=4,<4.4.8", "contao/managed-edition": "<=1.5", - "craftcms/cms": "<3.7.36", + "craftcms/cms": "<3.7.64|>= 4.0.0-RC1, < 4.3.7|>= 4.0.0-RC1, < 4.2.1", "croogo/croogo": "<3.0.7", "cuyz/valinor": "<0.12", "czproject/git-php": "<4.0.3", "darylldoyle/safe-svg": "<1.9.10", "datadog/dd-trace": ">=0.30,<0.30.2", "david-garcia/phpwhois": "<=4.3.1", + "dbrisinajumi/d2files": "<1", + "derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3", "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1", "directmailteam/direct-mail": "<5.2.4", "doctrine/annotations": ">=1,<1.2.7", @@ -1850,8 +1734,8 @@ "doctrine/mongodb-odm": ">=1,<1.0.2", "doctrine/mongodb-odm-bundle": ">=2,<3.0.1", "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", - "dolibarr/dolibarr": "<16|= 12.0.5|>= 3.3.beta1, < 13.0.2", - "dompdf/dompdf": "<2", + "dolibarr/dolibarr": "<16|>=16.0.1,<16.0.3|= 12.0.5|>= 3.3.beta1, < 13.0.2", + "dompdf/dompdf": "<2.0.2|= 2.0.2", "drupal/core": ">=7,<7.91|>=8,<9.3.19|>=9.4,<9.4.3", "drupal/drupal": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", "dweeves/magmi": "<=0.7.24", @@ -1859,34 +1743,41 @@ "ectouch/ectouch": "<=2.7.2", "elefant/cms": "<1.3.13", "elgg/elgg": "<3.3.24|>=4,<4.0.5", + "encore/laravel-admin": "<=1.8.19", "endroid/qr-code-bundle": "<3.4.2", "enshrined/svg-sanitize": "<0.15", "erusev/parsedown": "<1.7.2", "ether/logs": "<3.0.4", + "exceedone/exment": "<4.4.3|>=5,<5.0.3", + "exceedone/laravel-admin": "= 3.0.0|<2.2.3", "ezsystems/demobundle": ">=5.4,<5.4.6.1", "ezsystems/ez-support-tools": ">=2.2,<2.2.3", "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1", "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1|>=5.4,<5.4.11.1|>=2017.12,<2017.12.0.1", "ezsystems/ezplatform": "<=1.13.6|>=2,<=2.5.24", - "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.27", + "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26", "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1", - "ezsystems/ezplatform-kernel": "<=1.2.5|>=1.3,<1.3.19", + "ezsystems/ezplatform-graphql": ">=1-rc.1,<1.0.13|>=2-beta.1,<2.3.12", + "ezsystems/ezplatform-kernel": "<1.2.5.1|>=1.3,<1.3.26", "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8", "ezsystems/ezplatform-richtext": ">=2.3,<=2.3.7", "ezsystems/ezplatform-user": ">=1,<1.0.1", - "ezsystems/ezpublish-kernel": "<=6.13.8.1|>=7,<7.5.29", + "ezsystems/ezpublish-kernel": "<6.13.8.2|>=7,<7.5.30", "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.3.5.1", "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", - "ezsystems/repository-forms": ">=2.3,<2.3.2.1", + "ezsystems/repository-forms": ">=2.3,<2.3.2.1|>=2.5,<2.5.15", "ezyang/htmlpurifier": "<4.1.1", "facade/ignition": "<1.16.15|>=2,<2.4.2|>=2.5,<2.5.2", "facturascripts/facturascripts": "<=2022.8", "feehi/cms": "<=2.1.1", - "feehi/feehicms": "<=0.1.3", + "feehi/feehicms": "<=2.1.1", "fenom/fenom": "<=2.12.1", "filegator/filegator": "<7.8", - "firebase/php-jwt": "<2", - "flarum/core": ">=1,<=1.0.1", + "firebase/php-jwt": "<6", + "fixpunkt/fp-masterquiz": "<2.2.1|>=3,<3.5.2", + "fixpunkt/fp-newsletter": "<1.1.1|>=2,<2.1.2|>=2.2,<3.2.6", + "flarum/core": "<1.7", + "flarum/mentions": "<1.6.3", "flarum/sticky": ">=0.1-beta.14,<=0.1-beta.15", "flarum/tags": "<=0.1-beta.13", "fluidtypo3/vhs": "<5.1.1", @@ -1895,34 +1786,41 @@ "fooman/tcpdf": "<6.2.22", "forkcms/forkcms": "<5.11.1", "fossar/tcpdf-parser": "<6.2.22", - "francoisjacquet/rosariosis": "<9.1", + "francoisjacquet/rosariosis": "<10.8.2", + "frappant/frp-form-answers": "<3.1.2|>=4,<4.0.2", "friendsofsymfony/oauth2-php": "<1.3", "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", "friendsoftypo3/mediace": ">=7.6.2,<7.6.5", "froala/wysiwyg-editor": "<3.2.7", - "froxlor/froxlor": "<=0.10.22", + "froxlor/froxlor": "<2.0.13", "fuel/core": "<1.8.1", + "funadmin/funadmin": "<=3.2", "gaoming13/wechat-php-sdk": "<=1.10.2", "genix/cms": "<=1.1.11", "getgrav/grav": "<1.7.34", - "getkirby/cms": "<3.5.8", + "getkirby/cms": "= 3.8.0|<3.5.8.2|>=3.6,<3.6.6.2|>=3.7,<3.7.5.1", "getkirby/panel": "<2.5.14", + "getkirby/starterkit": "<=3.7.0.2", "gilacms/gila": "<=1.11.4", "globalpayments/php-sdk": "<2", "google/protobuf": "<3.15", "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3", - "gree/jose": "<=2.2", + "gree/jose": "<2.2.1", "gregwar/rst": "<1.0.3", - "grumpydictator/firefly-iii": "<5.6.5", + "grumpydictator/firefly-iii": "<5.8", "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5", "guzzlehttp/psr7": "<1.8.4|>=2,<2.1.1", + "harvesthq/chosen": "<1.8.7", "helloxz/imgurl": "= 2.31|<=2.31", "hillelcoren/invoice-ninja": "<5.3.35", + "himiklab/yii2-jqgrid-widget": "<1.0.8", "hjue/justwriting": "<=1", "hov/jobfair": "<1.0.13|>=2,<2.0.2", "hyn/multi-tenant": ">=5.6,<5.7.2", - "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4", + "ibexa/admin-ui": ">=4.2,<4.2.3", + "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3", + "ibexa/graphql": ">=2.5,<2.5.31|>=3.3,<3.3.28|>=4.2,<4.2.3", "ibexa/post-install": "<=1.0.4", "icecoder/icecoder": "<=8.1", "idno/known": "<=1.3.1", @@ -1932,24 +1830,30 @@ "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", "illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "impresscms/impresscms": "<=1.4.3", - "in2code/femanager": "<5.5.1|>=6,<6.3.1", + "in2code/femanager": "<5.5.3|>=6,<6.3.4|>=7,<7.1", "in2code/lux": "<17.6.1|>=18,<24.0.2", + "innologi/typo3-appointments": "<2.0.6", "intelliants/subrion": "<=4.2.1", "islandora/islandora": ">=2,<2.4.1", "ivankristianto/phpwhois": "<=4.3", "jackalope/jackalope-doctrine-dbal": "<1.7.4", "james-heinrich/getid3": "<1.9.21", + "jasig/phpcas": "<1.3.3", "joomla/archive": "<1.1.12|>=2,<2.0.1", "joomla/filesystem": "<1.6.2|>=2,<2.0.1", "joomla/filter": "<1.4.4|>=2,<2.0.1", "joomla/input": ">=2,<2.0.2", "joomla/session": "<1.3.1", + "joyqi/hyper-down": "<=2.4.27", "jsdecena/laracom": "<2.0.9", "jsmitty12/phpwhois": "<5.1", "kazist/phpwhois": "<=4.2.6", + "kelvinmo/simplexrd": "<3.1.1", "kevinpapst/kimai2": "<1.16.7", + "kimai/kimai": "<1.1", "kitodo/presentation": "<3.1.2", "klaviyo/magento2-extension": ">=1,<3", + "knplabs/knp-snappy": "<=1.4.1", "krayin/laravel-crm": "<1.2.2", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", @@ -1958,7 +1862,6 @@ "laminas/laminas-http": "<2.14.2", "laravel/fortify": "<1.11.1", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", - "laravel/laravel": "<=9.1.8", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", "latte/latte": "<2.10.8", "lavalite/cms": "<=5.8", @@ -1966,7 +1869,8 @@ "league/commonmark": "<0.18.3", "league/flysystem": "<1.1.4|>=2,<2.1.1", "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3", - "librenms/librenms": "<22.4", + "librenms/librenms": "<22.10", + "liftkit/database": "<2.13.2", "limesurvey/limesurvey": "<3.27.19", "livehelperchat/livehelperchat": "<=3.91", "livewire/livewire": ">2.2.4,<2.2.6", @@ -1977,18 +1881,26 @@ "magento/magento1ce": "<1.9.4.3", "magento/magento1ee": ">=1,<1.14.4.3", "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2-p.2", + "maikuolan/phpmussel": ">=1,<1.6", + "mantisbt/mantisbt": "<=2.25.5", "marcwillmann/turn": "<0.3.3", "matyhtf/framework": "<3.0.6", "mautic/core": "<4.3|= 2.13.1", "mediawiki/core": ">=1.27,<1.27.6|>=1.29,<1.29.3|>=1.30,<1.30.2|>=1.31,<1.31.9|>=1.32,<1.32.6|>=1.32.99,<1.33.3|>=1.33.99,<1.34.3|>=1.34.99,<1.35", + "mediawiki/matomo": "<2.4.3", + "melisplatform/melis-asset-manager": "<5.0.1", + "melisplatform/melis-cms": "<5.0.1", + "melisplatform/melis-front": "<5.0.1", "mezzio/mezzio-swoole": "<3.7|>=4,<4.3", - "microweber/microweber": "<1.3.1", + "mgallegos/laravel-jqgrid": "<=1.3", + "microweber/microweber": "<=1.3.2", "miniorange/miniorange-saml": "<1.4.3", "mittwald/typo3_forum": "<1.2.1", + "mobiledetect/mobiledetectlib": "<2.8.32", "modx/revolution": "<= 2.8.3-pl|<2.8", "mojo42/jirafeau": "<4.4", "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<4.0.1", + "moodle/moodle": "<4.0.6|= 3.11|>=4.1-beta,<4.1.1", "mustache/mustache": ">=2,<2.14.1", "namshi/jose": "<2.2", "neoan3-apps/template": "<1.1.1", @@ -2000,7 +1912,8 @@ "netgen/tagsbundle": ">=3.4,<3.4.11|>=4,<4.0.15", "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6", "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13", - "nilsteampassnet/teampass": "<=2.1.27.36", + "nilsteampassnet/teampass": "<3.0.0.23", + "notrinos/notrinos-erp": "<=0.7", "noumo/easyii": "<=0.9", "nukeviet/nukeviet": "<4.5.2", "nystudio107/craft-seomatic": "<3.4.12", @@ -2009,15 +1922,15 @@ "october/cms": "= 1.1.1|= 1.0.471|= 1.0.469|>=1.0.319,<1.0.469", "october/october": ">=1.0.319,<1.0.466|>=2.1,<2.1.12", "october/rain": "<1.0.472|>=1.1,<1.1.2", - "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.15", + "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.0.66", "onelogin/php-saml": "<2.10.4", "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5", "open-web-analytics/open-web-analytics": "<1.7.4", - "opencart/opencart": "<=3.0.3.2", + "opencart/opencart": "<=3.0.3.7", "openid/php-openid": "<2.3", - "openmage/magento-lts": "<19.4.15|>=20,<20.0.13", + "openmage/magento-lts": "<19.4.22|>=20,<20.0.19", "orchid/platform": ">=9,<9.4.4", - "oro/commerce": ">=5,<5.0.4", + "oro/commerce": ">=4.1,<5.0.6", "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7", "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<4.2.8", "packbackbooks/lti-1-3-php-library": "<5", @@ -2032,42 +1945,51 @@ "pegasus/google-for-jobs": "<1.5.1|>=2,<2.1.1", "personnummer/personnummer": "<3.0.2", "phanan/koel": "<5.1.4", + "php-mod/curl": "<2.3.2", "phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7", "phpmailer/phpmailer": "<6.5", "phpmussel/phpmussel": ">=1,<1.6", - "phpmyadmin/phpmyadmin": "<5.1.3", + "phpmyadmin/phpmyadmin": "<5.2.1", + "phpmyfaq/phpmyfaq": "<=3.1.7", "phpoffice/phpexcel": "<1.8", "phpoffice/phpspreadsheet": "<1.16", - "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.7", + "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.19", "phpservermon/phpservermon": "<=3.5.2", "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5,<5.6.3", "phpwhois/phpwhois": "<=4.2.5", "phpxmlrpc/extras": "<0.6.1", + "phpxmlrpc/phpxmlrpc": "<4.9.2", "pimcore/data-hub": "<1.2.4", - "pimcore/pimcore": "<10.4.4", + "pimcore/pimcore": "<11", + "pixelfed/pixelfed": "<=0.11.4", "pocketmine/bedrock-protocol": "<8.0.2", - "pocketmine/pocketmine-mp": ">= 4.0.0-BETA5, < 4.4.2|<4.2.10", + "pocketmine/pocketmine-mp": "<4.12.5|>= 4.0.0-BETA5, < 4.4.2", "pressbooks/pressbooks": "<5.18", "prestashop/autoupgrade": ">=4,<4.10.1", "prestashop/blockwishlist": ">=2,<2.1.1", - "prestashop/contactform": ">1.0.1,<4.3", + "prestashop/contactform": ">=1.0.1,<4.3", "prestashop/gamification": "<2.3.2", - "prestashop/prestashop": ">=1.6.0.10,<1.7.8.7", - "prestashop/productcomments": ">=4,<4.2.1", + "prestashop/prestashop": "<8.0.1", + "prestashop/productcomments": "<5.0.2", "prestashop/ps_emailsubscription": "<2.6.1", "prestashop/ps_facetedsearch": "<3.4.1", "prestashop/ps_linklist": "<3.1", "privatebin/privatebin": "<1.4", + "processwire/processwire": "<=3.0.200", "propel/propel": ">=2-alpha.1,<=2-alpha.7", "propel/propel1": ">=1,<=1.7.1", "pterodactyl/panel": "<1.7", "ptrofimov/beanstalk_console": "<1.7.14", "pusher/pusher-php-server": "<2.2.1", "pwweb/laravel-core": "<=0.3.6-beta", + "pyrocms/pyrocms": "<=3.9.1", "rainlab/debugbar-plugin": "<3.1", + "rankmath/seo-by-rank-math": "<=1.0.95", + "react/http": ">=0.7,<1.7", "remdex/livehelperchat": "<3.99", "rmccue/requests": ">=1.6,<1.8", "robrichards/xmlseclibs": "<3.0.4", + "roots/soil": "<4.1", "rudloff/alltube": "<3.0.3", "s-cart/core": "<6.9", "s-cart/s-cart": "<6.9", @@ -2076,37 +1998,41 @@ "scheb/two-factor-bundle": ">=0,<3.26|>=4,<4.11", "sensiolabs/connect": "<4.2.3", "serluck/phpwhois": "<=4.2.6", - "shopware/core": "<=6.4.9", - "shopware/platform": "<=6.4.9", + "shopware/core": "<=6.4.18", + "shopware/platform": "<=6.4.18", "shopware/production": "<=6.3.5.2", - "shopware/shopware": "<=5.7.13", + "shopware/shopware": "<=5.7.14", "shopware/storefront": "<=6.4.8.1", "shopxo/shopxo": "<2.2.6", "showdoc/showdoc": "<2.10.4", - "silverstripe/admin": ">=1,<1.8.1", - "silverstripe/assets": ">=1,<1.10.1", - "silverstripe/cms": "<4.3.6|>=4.4,<4.4.4", + "silverstripe/admin": ">=1,<1.11.3", + "silverstripe/assets": ">=1,<1.11.1", + "silverstripe/cms": "<4.11.3", "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", - "silverstripe/framework": "<4.10.9", - "silverstripe/graphql": "<3.5.2|>=4-alpha.1,<4-alpha.2|= 4.0.0-alpha1", + "silverstripe/framework": "<4.11.14", + "silverstripe/graphql": "<3.5.2|>=4-alpha.1,<4-alpha.2|>=4.1.1,<4.1.2|>=4.2.2,<4.2.3|= 4.0.0-alpha1", "silverstripe/hybridsessions": ">=1,<2.4.1|>=2.5,<2.5.1", "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4", "silverstripe/silverstripe-omnipay": "<2.5.2|>=3,<3.0.2|>=3.1,<3.1.4|>=3.2,<3.2.1", - "silverstripe/subsites": ">=2,<2.1.1", + "silverstripe/subsites": ">=2,<2.6.1", "silverstripe/taxonomy": ">=1.3,<1.3.1|>=2,<2.0.1", "silverstripe/userforms": "<3", + "silverstripe/versioned-admin": ">=1,<1.11.1", "simple-updates/phpwhois": "<=1", "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4", "simplesamlphp/simplesamlphp": "<1.18.6", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", + "simplesamlphp/simplesamlphp-module-openid": "<1", + "simplesamlphp/simplesamlphp-module-openidprovider": "<0.9", "simplito/elliptic-php": "<1.0.6", "slim/slim": "<2.6", - "smarty/smarty": "<3.1.45|>=4,<4.1.1", - "snipe/snipe-it": "<=6.0.2|>= 6.0.0-RC-1, <= 6.0.0-RC-5", + "smarty/smarty": "<3.1.47|>=4,<4.2.1", + "snipe/snipe-it": "<=6.0.14|>= 6.0.0-RC-1, <= 6.0.0-RC-5", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", + "spatie/browsershot": "<3.57.4", "spipu/html2pdf": "<5.2.4", "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", @@ -2115,7 +2041,10 @@ "stormpath/sdk": ">=0,<9.9.99", "studio-42/elfinder": "<2.1.59", "subrion/cms": "<=4.2.1", + "sukohi/surpass": "<1", "sulu/sulu": "= 2.4.0-RC1|<1.6.44|>=2,<2.2.18|>=2.3,<2.3.8", + "sumocoders/framework-user-bundle": "<1.4", + "swag/paypal": "<5.4.4", "swiftmailer/swiftmailer": ">=4,<5.4.5", "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", @@ -2125,15 +2054,16 @@ "sylius/sylius": "<1.9.10|>=1.10,<1.10.11|>=1.11,<1.11.2", "symbiote/silverstripe-multivaluefield": ">=3,<3.0.99", "symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4", + "symbiote/silverstripe-seed": "<6.0.3", "symbiote/silverstripe-versionedfiles": "<=2.0.3", - "symfont/process": ">=0,<4", + "symfont/process": ">=0", "symfony/cache": ">=3.1,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8", "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4", "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3|= 6.0.3|= 5.4.3|= 5.3.14", "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", - "symfony/http-kernel": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.4.13|>=5,<5.1.5|>=5.2,<5.3.12", + "symfony/http-kernel": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", "symfony/maker-bundle": ">=1.27,<1.29.2|>=1.30,<1.31.1", "symfony/mime": ">=4.3,<4.3.8", @@ -2143,13 +2073,13 @@ "symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/routing": ">=2,<2.0.19", "symfony/security": ">=2,<2.7.51|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.8", - "symfony/security-bundle": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11|>=5.3,<5.3.12", + "symfony/security-bundle": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6", "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.9", "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.3.2", "symfony/serializer": ">=2,<2.0.11|>=4.1,<4.4.35|>=5,<5.3.12", - "symfony/symfony": ">=2,<3.4.49|>=4,<4.4.35|>=5,<5.3.12|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3", + "symfony/symfony": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6", "symfony/translation": ">=2,<2.0.17", "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8", @@ -2164,54 +2094,68 @@ "thelia/thelia": ">=2.1-beta.1,<2.1.3", "theonedemon/phpwhois": "<=4.2.5", "thinkcmf/thinkcmf": "<=5.1.7", - "tinymce/tinymce": "<5.10", + "thorsten/phpmyfaq": "<3.1.11", + "tinymce/tinymce": "<5.10.7|>=6,<6.3.1", + "tinymighty/wiki-seo": "<1.2.2", "titon/framework": ">=0,<9.9.99", - "topthink/framework": "<=6.0.12", - "topthink/think": "<=6.0.9", + "tobiasbg/tablepress": "<= 2.0-RC1", + "topthink/framework": "<6.0.14", + "topthink/think": "<=6.1.1", "topthink/thinkphp": "<=3.2.3", - "tribalsystems/zenario": "<9.2.55826", + "tribalsystems/zenario": "<=9.3.57595", "truckersmp/phpwhois": "<=4.3.1", - "twig/twig": "<1.38|>=2,<2.14.11|>=3,<3.3.8", - "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.29|>=11,<11.5.11", + "ttskch/pagination-service-provider": "<1", + "twig/twig": "<1.44.7|>=2,<2.15.3|>=3,<3.4.3", + "typo3/cms": "<2.0.5|>=3,<3.0.3|>=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2", "typo3/cms-backend": ">=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", - "typo3/cms-core": ">=6.2,<=6.2.56|>=7,<7.6.57|>=8,<8.7.47|>=9,<9.5.35|>=10,<10.4.29|>=11,<11.5.11", + "typo3/cms-core": "<8.7.51|>=9,<9.5.40|>=10,<10.4.36|>=11,<11.5.23|>=12,<12.2", "typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", + "typo3/html-sanitizer": ">=1,<1.5|>=2,<2.1.1", "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.3.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3", "typo3/phar-stream-wrapper": ">=1,<2.1.1|>=3,<3.1.1", "typo3/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5", "typo3fluid/fluid": ">=2,<2.0.8|>=2.1,<2.1.7|>=2.2,<2.2.4|>=2.3,<2.3.7|>=2.4,<2.4.4|>=2.5,<2.5.11|>=2.6,<2.6.10", "ua-parser/uap-php": "<3.8", - "unisharp/laravel-filemanager": "<=2.3", + "unisharp/laravel-filemanager": "<=2.5.1", "userfrosting/userfrosting": ">=0.3.1,<4.6.3", "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2", + "uvdesk/community-skeleton": "<1.1", "vanilla/safecurl": "<0.9.2", "verot/class.upload.php": "<=1.0.3|>=2,<=2.0.4", + "vova07/yii2-fileapi-widget": "<0.1.9", "vrana/adminer": "<4.8.1", "wallabag/tcpdf": "<6.2.22", + "wallabag/wallabag": "<2.5.4", "wanglelecc/laracms": "<=1.0.3", "web-auth/webauthn-framework": ">=3.3,<3.3.4", + "webbuilders-group/silverstripe-kapost-bridge": "<0.4", "webcoast/deferred-image-processing": "<1.0.2", + "webpa/webpa": "<3.1.2", "wikimedia/parsoid": "<0.12.2", "willdurand/js-translation-bundle": "<2.1.1", - "wintercms/winter": "<1.0.475|>=1.1,<1.1.9", + "wintercms/winter": "<1.0.475|>=1.1,<1.1.10|>=1.2,<1.2.1", "woocommerce/woocommerce": "<6.6", "wp-cli/wp-cli": "<2.5", "wp-graphql/wp-graphql": "<0.3.5", "wpanel/wpanel4-cms": "<=4.3.1", - "wwbn/avideo": "<=11.6", + "wpcloud/wp-stateless": "<3.2", + "wwbn/avideo": "<12.4", + "xataface/xataface": "<3", + "xpressengine/xpressengine": "<3.0.15", "yeswiki/yeswiki": "<4.1", - "yetiforce/yetiforce-crm": "<6.4", + "yetiforce/yetiforce-crm": "<=6.4", "yidashi/yii2cmf": "<=2", "yii2mod/yii2-cms": "<1.9.2", - "yiisoft/yii": ">=1.1.14,<1.1.15", + "yiisoft/yii": "<1.1.27", "yiisoft/yii2": "<2.0.38", "yiisoft/yii2-bootstrap": "<2.0.4", "yiisoft/yii2-dev": "<2.0.43", "yiisoft/yii2-elasticsearch": "<2.0.5", - "yiisoft/yii2-gii": "<2.0.4", + "yiisoft/yii2-gii": "<=2.2.4", "yiisoft/yii2-jui": "<2.0.4", "yiisoft/yii2-redis": "<2.0.8", + "yikesinc/yikes-inc-easy-mailchimp-extender": "<6.8.6", "yoast-seo-for-typo3/yoast_seo": "<7.2.3", "yourls/yourls": "<=1.8.2", "zendesk/zendesk_api_client_php": "<2.2.11", @@ -2260,6 +2204,9 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", + "keywords": [ + "dev" + ], "support": { "issues": "https://github.com/Roave/SecurityAdvisories/issues", "source": "https://github.com/Roave/SecurityAdvisories/tree/latest" @@ -2274,32 +2221,144 @@ "type": "tidelift" } ], - "time": "2022-08-12T16:04:45+00:00" + "time": "2023-03-17T19:03:58+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "name": "sebastian/cli-parser", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "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" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:08:49+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:08:54+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" } }, "autoload": { @@ -2321,7 +2380,7 @@ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" }, "funding": [ { @@ -2329,34 +2388,34 @@ "type": "github" } ], - "time": "2020-11-30T08:15:22+00:00" + "time": "2020-09-28T05:30:19+00:00" }, { "name": "sebastian/comparator", - "version": "3.0.3", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { - "php": ">=7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" + "php": ">=7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -2395,7 +2454,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" }, "funding": [ { @@ -2403,33 +2462,90 @@ "type": "github" } ], - "time": "2020-11-30T08:04:30+00:00" + "time": "2022-09-14T12:41:17+00:00" + }, + { + "name": "sebastian/complexity", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", + "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.7", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T15:52:27+00:00" }, { "name": "sebastian/diff", - "version": "3.0.3", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" + "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -2461,7 +2577,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" }, "funding": [ { @@ -2469,27 +2585,27 @@ "type": "github" } ], - "time": "2020-11-30T07:59:04+00:00" + "time": "2020-10-26T13:10:38+00:00" }, { "name": "sebastian/environment", - "version": "4.2.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-posix": "*" @@ -2497,7 +2613,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -2524,7 +2640,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" }, "funding": [ { @@ -2532,34 +2648,34 @@ "type": "github" } ], - "time": "2020-11-30T07:53:42+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", - "version": "3.1.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", - "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/recursion-context": "^4.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -2594,14 +2710,14 @@ } ], "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", + "homepage": "https://www.github.com/sebastianbergmann/exporter", "keywords": [ "export", "exporter" ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -2609,27 +2725,30 @@ "type": "github" } ], - "time": "2021-11-11T13:51:24+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { "name": "sebastian/global-state", - "version": "2.0.0", + "version": "5.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "ext-dom": "*", + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-uopz": "*" @@ -2637,7 +2756,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -2662,36 +2781,99 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/2.0.0" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2022-02-14T08:28:10+00:00" + }, + { + "name": "sebastian/lines-of-code", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.6", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] }, - "time": "2017-04-27T15:39:26+00:00" + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "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" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-28T06:42:11+00:00" }, { "name": "sebastian/object-enumerator", - "version": "3.0.4", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -2713,7 +2895,7 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" }, "funding": [ { @@ -2721,32 +2903,32 @@ "type": "github" } ], - "time": "2020-11-30T07:40:27+00:00" + "time": "2020-10-26T13:12:34+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.2", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", "shasum": "" }, "require": { - "php": ">=7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2768,7 +2950,7 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" + "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" }, "funding": [ { @@ -2776,32 +2958,32 @@ "type": "github" } ], - "time": "2020-11-30T07:37:18+00:00" + "time": "2020-10-26T13:14:26+00:00" }, { "name": "sebastian/recursion-context", - "version": "3.0.1", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { - "php": ">=7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -2828,10 +3010,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/3.0.1" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" }, "funding": [ { @@ -2839,29 +3021,32 @@ "type": "github" } ], - "time": "2020-11-30T07:34:24+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", - "version": "2.0.2", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2883,7 +3068,7 @@ "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/2.0.2" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" }, "funding": [ { @@ -2891,29 +3076,32 @@ "type": "github" } ], - "time": "2020-11-30T07:30:19+00:00" + "time": "2020-09-28T06:45:17+00:00" }, { - "name": "sebastian/version", - "version": "2.0.1", + "name": "sebastian/type", + "version": "3.2.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2932,171 +3120,149 @@ "role": "lead" } ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", "support": { - "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/master" + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" }, - "time": "2016-10-03T07:35:21+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:13:03+00:00" }, { - "name": "squizlabs/php_codesniffer", - "version": "3.7.1", + "name": "sebastian/version", + "version": "3.0.2", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619" + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "c6c1022351a901512170118436c764e473f6de8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", + "reference": "c6c1022351a901512170118436c764e473f6de8c", "shasum": "" }, "require": { - "ext-simplexml": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.4.0" + "php": ">=7.3" }, - "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" - }, - "bin": [ - "bin/phpcs", - "bin/phpcbf" - ], "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "3.0-dev" } }, + "autoload": { + "classmap": [ + "src/" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], "authors": [ { - "name": "Greg Sherwood", + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", "role": "lead" } ], - "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", - "keywords": [ - "phpcs", - "standards" - ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", "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/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" }, - "time": "2022-06-18T07:21:10+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:39:44+00:00" }, { - "name": "symfony/polyfill-ctype", - "version": "v1.26.0", + "name": "squizlabs/php_codesniffer", + "version": "3.7.2", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", + "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "provide": { - "ext-ctype": "*" + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" }, - "suggest": { - "ext-ctype": "For best performance" + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, + "bin": [ + "bin/phpcs", + "bin/phpcbf" + ], "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\\Ctype\\": "" + "dev-master": "3.x-dev" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Greg Sherwood", + "role": "lead" } ], - "description": "Symfony polyfill for ctype functions", - "homepage": "https://symfony.com", + "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", "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" + "phpcs", + "standards", + "static analysis" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" + "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", + "source": "https://github.com/squizlabs/PHP_CodeSniffer", + "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "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" + "time": "2023-02-22T23:07:41+00:00" }, { "name": "theseer/tokenizer", - "version": "1.1.3", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" + "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", - "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", + "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", "shasum": "" }, "require": { "ext-dom": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": "^7.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { @@ -3118,62 +3284,15 @@ "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/master" - }, - "time": "2019-06-13T22:48:21+00:00" - }, - { - "name": "webmozart/assert", - "version": "1.9.1", - "source": { - "type": "git", - "url": "https://github.com/webmozarts/assert.git", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0 || ^8.0", - "symfony/polyfill-ctype": "^1.8" - }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<3.9.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.1" }, - "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^7.5.13" - }, - "type": "library", - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ + "funding": [ { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" + "url": "https://github.com/theseer", + "type": "github" } ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "support": { - "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.9.1" - }, - "time": "2020-07-08T17:02:28+00:00" + "time": "2021-07-28T10:34:58+00:00" } ], "aliases": [], @@ -3185,13 +3304,13 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.1", + "php": ">=7.4", "ext-json": "*", "ext-zlib": "*" }, "platform-dev": [], "platform-overrides": { - "php": "7.1.29" + "php": "7.4.33" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.3.0" } From 062698c123451670432eb512c1e815d29f800f80 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Mon, 20 Mar 2023 18:08:02 +0100 Subject: [PATCH 04/67] doc: update release procedure (merge the latest release to the release branch) - ref. https://github.com/shaarli/Shaarli/pull/1959 --- doc/md/dev/Release-Shaarli.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/md/dev/Release-Shaarli.md b/doc/md/dev/Release-Shaarli.md index 9440c2fb2..c56654c9a 100644 --- a/doc/md/dev/Release-Shaarli.md +++ b/doc/md/dev/Release-Shaarli.md @@ -139,16 +139,16 @@ make release_archive This will create `shaarli-v0.x.y-full.tar`, `shaarli-v0.x.y-full.zip`. These archives need to be manually uploaded on the previously created GitHub [release](https://github.com/shaarli/Shaarli/releases). -### Update the `latest` branch +### Update the `release` branch ```bash -# checkout the 'latest' branch -git checkout latest +# checkout the 'release' branch +git checkout release # merge changes from your newly published release branch git merge v0.x.y # fix eventual conflicts with git mergetool... # run tests make test # push the latest branch -git push upstream latest +git push upstream release ``` From 625235787e88ba5db4b45bb92effd91c0b6e212b Mon Sep 17 00:00:00 2001 From: nodiscc Date: Mon, 20 Mar 2023 18:15:00 +0100 Subject: [PATCH 05/67] admin/server: use the 'release' branch as reference for latest release version number detection - ref. https://github.com/shaarli/Shaarli/issues/1961 --- application/front/controller/admin/ServerController.php | 2 +- application/legacy/LegacyUpdater.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/front/controller/admin/ServerController.php b/application/front/controller/admin/ServerController.php index 4b74f4a94..9be5ea772 100644 --- a/application/front/controller/admin/ServerController.php +++ b/application/front/controller/admin/ServerController.php @@ -28,7 +28,7 @@ public function index(Request $request, Response $response): Response $releaseUrl = ApplicationUtils::$GITHUB_URL . '/releases/'; if ($this->container->conf->get('updates.check_updates', true)) { $latestVersion = 'v' . ApplicationUtils::getVersion( - ApplicationUtils::$GIT_RAW_URL . '/latest/' . ApplicationUtils::$VERSION_FILE + ApplicationUtils::$GIT_RAW_URL . '/release/' . ApplicationUtils::$VERSION_FILE ); $releaseUrl .= 'tag/' . $latestVersion; } else { diff --git a/application/legacy/LegacyUpdater.php b/application/legacy/LegacyUpdater.php index 9bda54b8d..d457c5438 100644 --- a/application/legacy/LegacyUpdater.php +++ b/application/legacy/LegacyUpdater.php @@ -438,7 +438,7 @@ public function updateMethodCheckUpdateRemoteBranch() // Get latest branch major version digit $latestVersion = ApplicationUtils::getLatestGitVersionCode( - 'https://raw.githubusercontent.com/shaarli/Shaarli/latest/shaarli_version.php', + 'https://raw.githubusercontent.com/shaarli/Shaarli/release/shaarli_version.php', 5 ); if (preg_match('/(\d+)\.\d+$/', $latestVersion, $matches) === false) { From fd4379992dc1a4c7d031914add088951cf4da79a Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 21 Mar 2023 16:19:24 +0100 Subject: [PATCH 06/67] github actions: build OCI images that contin both amd64 and armv7 - ref. https://docs.docker.com/engine/reference/commandline/buildx_build/#platform - ref. https://docs.docker.com/build/ci/github-actions/multi-platform/ - replaces https://github.com/shaarli/Shaarli/pull/1496 - make docker image name configurable through CI variables for easier testing --- .github/workflows/docker-latest.yml | 5 +++-- .github/workflows/docker-tags.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml index ee8f5e62e..f01f25c2c 100644 --- a/.github/workflows/docker-latest.yml +++ b/.github/workflows/docker-latest.yml @@ -35,8 +35,9 @@ jobs: with: context: . push: true + platforms: linux/amd64,linux/arm/v7 tags: | - shaarli/shaarli:latest - ghcr.io/shaarli/shaarli:latest + ${{ secrets.DOCKER_IMAGE }}:latest + ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/docker-tags.yml b/.github/workflows/docker-tags.yml index 9d09d770b..b9412f525 100644 --- a/.github/workflows/docker-tags.yml +++ b/.github/workflows/docker-tags.yml @@ -35,8 +35,9 @@ jobs: uses: docker/build-push-action@v3 with: push: true + platforms: linux/amd64,linux/arm/v7 tags: | - shaarli/shaarli:${{ env.REF }} - ghcr.io/shaarli/shaarli:${{ env.REF }} + ${{ secrets.DOCKER_IMAGE }}:${{ env.REF }} + ghcr.io/${{ secrets.DOCKER_IMAGE }}:${{ env.REF }} - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} From 9a1ad45e9003dd697fdcca01f2b2685a93d61d3d Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 21 Mar 2023 18:18:12 +0100 Subject: [PATCH 07/67] remove ununsed Dockerfile.armhf --- Dockerfile.armhf | 79 ------------------------------------------------ 1 file changed, 79 deletions(-) delete mode 100644 Dockerfile.armhf diff --git a/Dockerfile.armhf b/Dockerfile.armhf deleted file mode 100644 index 6dfa87ec5..000000000 --- a/Dockerfile.armhf +++ /dev/null @@ -1,79 +0,0 @@ -# Stage 1: -# - Copy Shaarli sources -# - Build documentation -FROM arm32v6/alpine:3.16 as docs -ADD . /usr/src/app/shaarli -RUN apk --update --no-cache add py3-pip \ - && cd /usr/src/app/shaarli \ - && pip install --no-cache-dir mkdocs \ - && mkdocs build --clean - -# Stage 2: -# - Resolve PHP dependencies with Composer -FROM arm32v6/alpine:3.16 as composer -COPY --from=docs /usr/src/app/shaarli /app/shaarli -RUN apk --update --no-cache add \ - php8-curl \ - php8-mbstring \ - php8-simplexml \ - composer \ - && cd /app/shaarli \ - && composer --prefer-dist --no-dev install - -# Stage 3: -# - Frontend dependencies -FROM arm32v6/alpine:3.16 as node -COPY --from=composer /app/shaarli /shaarli -RUN apk --update --no-cache add yarn nodejs-current python3 build-base \ - && cd /shaarli \ - && yarnpkg install \ - && yarnpkg run build \ - && rm -rf node_modules - -# Stage 4: -# - Shaarli image -FROM arm32v6/alpine:3.16 -LABEL maintainer="Shaarli Community" - -RUN apk --update --no-cache add \ - ca-certificates \ - nginx \ - php8 \ - php8-ctype \ - php8-curl \ - php8-fpm \ - php8-gd \ - php8-iconv \ - php8-intl \ - php8-json \ - php8-ldap \ - php8-mbstring \ - php8-openssl \ - php8-session \ - php8-xml \ - php8-zlib \ - s6 - -COPY .docker/nginx.conf /etc/nginx/nginx.conf -COPY .docker/php-fpm.conf /etc/php8/php-fpm.conf -COPY .docker/services.d /etc/services.d - -RUN rm -rf /etc/php8/php-fpm.d/www.conf \ - && sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php8/php.ini \ - && sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php8/php.ini - - -WORKDIR /var/www -COPY --from=node /shaarli /var/www/shaarli - -RUN chown -R nginx:nginx . \ - && ln -sf /dev/stdout /var/log/nginx/shaarli.access.log \ - && ln -sf /dev/stderr /var/log/nginx/shaarli.error.log - -VOLUME /var/www/shaarli/cache -VOLUME /var/www/shaarli/data - -EXPOSE 80 - -ENTRYPOINT ["/bin/s6-svscan", "/etc/services.d"] -CMD [] From ef9d019ccdf1121ee4bf0444d91cb4087395bd66 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 25 Mar 2023 09:35:58 -0400 Subject: [PATCH 08/67] Docker build: add ARM64 platform and bump Github action version (#1965) --- .github/workflows/docker-latest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml index f01f25c2c..6611a18b3 100644 --- a/.github/workflows/docker-latest.yml +++ b/.github/workflows/docker-latest.yml @@ -31,11 +31,11 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: context: . push: true - platforms: linux/amd64,linux/arm/v7 + platforms: linux/amd64,linux/arm64,linux/arm/v7 tags: | ${{ secrets.DOCKER_IMAGE }}:latest ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest From 050bb50cdfa0c86a3de78097cabebcc11b8df609 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 25 Mar 2023 09:42:42 -0400 Subject: [PATCH 09/67] Update compatibility matrix --- doc/md/Server-configuration.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/md/Server-configuration.md b/doc/md/Server-configuration.md index 6dc48abe7..9b5d0a81c 100644 --- a/doc/md/Server-configuration.md +++ b/doc/md/Server-configuration.md @@ -43,9 +43,9 @@ Version | Status | Shaarli compatibility 8.1 | Supported | Yes 8.0 | EOL: 2023-11-26| Yes 7.4 | EOL: 2022-11-28 | Yes -7.3 | EOL: 2021-12-06 | Yes (up to Shaarli 0.12.1) -7.2 | EOL: 2020-11-30 | Yes (up to Shaarli 0.12.1) -7.1 | EOL: 2019-12-01 | Yes (up to Shaarli 0.12.1) +7.3 | EOL: 2021-12-06 | Yes (up to Shaarli 0.12.2) +7.2 | EOL: 2020-11-30 | Yes (up to Shaarli 0.12.2) +7.1 | EOL: 2019-12-01 | Yes (up to Shaarli 0.12.2) 7.0 | EOL: 2018-12-03 | Yes (up to Shaarli 0.10.x) 5.6 | EOL: 2018-12-31 | Yes (up to Shaarli 0.10.x) 5.5 | EOL: 2016-07-10 | Yes From 739776a754b52567ee150931406cab2f62250a87 Mon Sep 17 00:00:00 2001 From: bschwede Date: Sat, 8 Apr 2023 15:26:27 +0200 Subject: [PATCH 10/67] Update german translation (#1969) --- inc/languages/de/LC_MESSAGES/shaarli.po | 296 +++++++++++++++--------- 1 file changed, 190 insertions(+), 106 deletions(-) diff --git a/inc/languages/de/LC_MESSAGES/shaarli.po b/inc/languages/de/LC_MESSAGES/shaarli.po index f46f66fa1..4769858ee 100644 --- a/inc/languages/de/LC_MESSAGES/shaarli.po +++ b/inc/languages/de/LC_MESSAGES/shaarli.po @@ -2,17 +2,17 @@ msgid "" msgstr "" "Project-Id-Version: Shaarli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-23 23:57+0100\n" -"PO-Revision-Date: 2021-01-24 00:37+0100\n" +"POT-Creation-Date: 2023-04-05 08:38+0200\n" +"PO-Revision-Date: 2023-04-05 08:39+0200\n" "Last-Translator: \n" "Language-Team: Shaarli\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.4.2\n" -"X-Poedit-Basepath: ../../../..\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.2.2\n" +"X-Poedit-Basepath: ../../../..\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: t:1,2;t\n" "X-Poedit-SearchPath-0: .\n" @@ -51,6 +51,10 @@ msgstr "Japanisch" msgid "Russian" msgstr "Russisch" +#: application/Languages.php:190 +msgid "Chinese (Simplified)" +msgstr "Chinesisch (vereinfacht)" + #: application/Thumbnailer.php:62 msgid "" "php-gd extension must be loaded to use thumbnails. Thumbnails are now " @@ -60,41 +64,41 @@ msgstr "" "(Thumbnails) verwenden zu können. Thumbnails sind jetzt deaktiviert. Bitte " "lade die Seite neu." -#: application/Utils.php:405 tests/UtilsTest.php:327 +#: application/Utils.php:409 tests/UtilsTest.php:329 msgid "Setting not set" msgstr "Einstellung nicht gesetzt" -#: application/Utils.php:412 tests/UtilsTest.php:325 tests/UtilsTest.php:326 +#: application/Utils.php:416 tests/UtilsTest.php:327 tests/UtilsTest.php:328 msgid "Unlimited" msgstr "Unbegrenzt" -#: application/Utils.php:415 tests/UtilsTest.php:322 tests/UtilsTest.php:323 -#: tests/UtilsTest.php:337 +#: application/Utils.php:419 tests/UtilsTest.php:324 tests/UtilsTest.php:325 +#: tests/UtilsTest.php:339 msgid "B" msgstr "B" -#: application/Utils.php:415 tests/UtilsTest.php:316 tests/UtilsTest.php:317 -#: tests/UtilsTest.php:324 +#: application/Utils.php:419 tests/UtilsTest.php:318 tests/UtilsTest.php:319 +#: tests/UtilsTest.php:326 msgid "kiB" msgstr "kiB" -#: application/Utils.php:415 tests/UtilsTest.php:318 tests/UtilsTest.php:319 -#: tests/UtilsTest.php:335 tests/UtilsTest.php:336 +#: application/Utils.php:419 tests/UtilsTest.php:320 tests/UtilsTest.php:321 +#: tests/UtilsTest.php:337 tests/UtilsTest.php:338 msgid "MiB" msgstr "MiB" -#: application/Utils.php:415 tests/UtilsTest.php:320 tests/UtilsTest.php:321 +#: application/Utils.php:419 tests/UtilsTest.php:322 tests/UtilsTest.php:323 msgid "GiB" msgstr "GiB" -#: application/bookmark/BookmarkFileService.php:185 -#: application/bookmark/BookmarkFileService.php:207 -#: application/bookmark/BookmarkFileService.php:229 -#: application/bookmark/BookmarkFileService.php:243 +#: application/bookmark/BookmarkFileService.php:203 +#: application/bookmark/BookmarkFileService.php:225 +#: application/bookmark/BookmarkFileService.php:247 +#: application/bookmark/BookmarkFileService.php:261 msgid "You're not authorized to alter the datastore" msgstr "Du bist nicht berechtigt, den Datenspeicher zu ändern" -#: application/bookmark/BookmarkFileService.php:210 +#: application/bookmark/BookmarkFileService.php:228 msgid "This bookmarks already exists" msgstr "Diese Lesezeichen sind bereits vorhanden" @@ -194,7 +198,7 @@ msgstr "" "| Karotte | Gemüse | rot | 14 |\n" #: application/bookmark/BookmarkInitializer.php:94 -#: application/legacy/LegacyLinkDB.php:246 +#: application/legacy/LegacyLinkDB.php:249 #: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:15 #: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:48 #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:15 @@ -293,11 +297,11 @@ msgstr "Du bist nicht berechtigt, die Konfiguration zu ändern." msgid "Error accessing" msgstr "Fehler beim Zugriff" -#: application/feed/FeedBuilder.php:180 +#: application/feed/FeedBuilder.php:174 msgid "Direct link" msgstr "Direct Link" -#: application/feed/FeedBuilder.php:182 +#: application/feed/FeedBuilder.php:176 #: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:103 #: tmp/dailyrss.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26 #: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:179 @@ -372,25 +376,25 @@ msgstr "Tags verwalten" msgid "Invalid tags provided." msgstr "Ungültige Tags übergeben." -#: application/front/controller/admin/ManageTagController.php:78 +#: application/front/controller/admin/ManageTagController.php:81 #, php-format msgid "The tag was removed from %d bookmark." msgid_plural "The tag was removed from %d bookmarks." msgstr[0] "Der Tag wurde aus dem Lesezeichen %d entfernt." msgstr[1] "Der Tag wurde aus den Lesezeichen %d entfernt." -#: application/front/controller/admin/ManageTagController.php:83 +#: application/front/controller/admin/ManageTagController.php:86 #, php-format msgid "The tag was renamed in %d bookmark." msgid_plural "The tag was renamed in %d bookmarks." msgstr[0] "Der Tag wurde im Lesezeichen %d umbenannt." msgstr[1] "Der Tag wurde in den Lesezeichen %d umbenannt." -#: application/front/controller/admin/ManageTagController.php:105 +#: application/front/controller/admin/ManageTagController.php:108 msgid "Tags separator must be a single character." msgstr "Tags müssen durch ein einzelnen Zeichen getrennt werden." -#: application/front/controller/admin/ManageTagController.php:111 +#: application/front/controller/admin/ManageTagController.php:114 msgid "These characters are reserved and can't be used as tags separator: " msgstr "" "Diese Zeichen sind reserviert und können nicht als Tag-Trennzeichen genutzt " @@ -450,22 +454,32 @@ msgid "Shaare a new link" msgstr "Teile einen neuen Link" #: application/front/controller/admin/ShaareManageController.php:35 -#: application/front/controller/admin/ShaareManageController.php:93 +#: application/front/controller/admin/ShaareManageController.php:97 +#: application/front/controller/admin/ShaareManageController.php:227 msgid "Invalid bookmark ID provided." msgstr "Ungültige Lesezeichen-ID bereitgestellt." #: application/front/controller/admin/ShaareManageController.php:47 -#: application/front/controller/admin/ShaareManageController.php:116 -#: application/front/controller/admin/ShaareManageController.php:156 +#: application/front/controller/admin/ShaareManageController.php:120 +#: application/front/controller/admin/ShaareManageController.php:160 +#: application/front/controller/admin/ShaareManageController.php:257 #: application/front/controller/admin/ShaarePublishController.php:82 #, php-format msgid "Bookmark with identifier %s could not be found." msgstr "Lesezeichen mit der ID %s konnte nicht gefunden werden." -#: application/front/controller/admin/ShaareManageController.php:101 +#: application/front/controller/admin/ShaareManageController.php:105 msgid "Invalid visibility provided." msgstr "Ungültige Sichtbarkeit angegeben." +#: application/front/controller/admin/ShaareManageController.php:235 +msgid "Invalid action provided." +msgstr "Ungültige Aktion übergeben." + +#: application/front/controller/admin/ShaareManageController.php:243 +msgid "Invalid tag name provided." +msgstr "Ungültiger Tag-Name übergeben." + #: application/front/controller/admin/ShaarePublishController.php:173 #: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:171 msgid "Edit" @@ -492,7 +506,7 @@ msgstr "Thumbnail-Aktualisierung" msgid "Tools" msgstr "Tools" -#: application/front/controller/visitor/BookmarkListController.php:121 +#: application/front/controller/visitor/BookmarkListController.php:103 msgid "Search: " msgstr "Suche: " @@ -566,6 +580,10 @@ msgstr "" "Speicher fehlschlägt. Wir empfehlen den Zugriff auf deinen Server über die " "IP-Adresse oder den Fully Qualified Domain Namen.
" +#: application/front/controller/visitor/InstallController.php:134 +msgid "Shared Bookmarks" +msgstr "Geteilte Lesezeichen " + #: application/front/controller/visitor/InstallController.php:162 msgid "" "Shaarli is now configured. Please login and start shaaring your bookmarks!" @@ -694,15 +712,15 @@ msgstr "Verwende das Übersetzungssystem im gettext-Modus" msgid "Login using LDAP server" msgstr "Anmeldung mittels LDAP-Server" -#: application/helper/DailyPageHelper.php:179 +#: application/helper/DailyPageHelper.php:184 msgid "Week" msgstr "Woche" -#: application/helper/DailyPageHelper.php:183 +#: application/helper/DailyPageHelper.php:188 msgid "Today" msgstr "Heute" -#: application/helper/DailyPageHelper.php:185 +#: application/helper/DailyPageHelper.php:190 msgid "Yesterday" msgstr "Gestern" @@ -730,7 +748,7 @@ msgstr "Du musst eine Ganzzahl als Schlüssel angeben." msgid "Array offset and link ID must be equal." msgstr "Array-Offset und Link-ID müssen gleich sein." -#: application/legacy/LegacyLinkDB.php:249 +#: application/legacy/LegacyLinkDB.php:252 msgid "" "Welcome to Shaarli! This is your first public bookmark. To edit or delete " "me, you must first login.\n" @@ -750,11 +768,11 @@ msgstr "" "Du verwendest die von der Community unterstützte Version des ursprünglichen " "Shaarli-Projekts von Sebastien Sauvage." -#: application/legacy/LegacyLinkDB.php:266 +#: application/legacy/LegacyLinkDB.php:269 msgid "My secret stuff... - Pastebin.com" msgstr "Meine geheimen Sachen... - Pastebin.com" -#: application/legacy/LegacyLinkDB.php:268 +#: application/legacy/LegacyLinkDB.php:271 msgid "Shhhh! I'm a private link only YOU can see. You can delete me too." msgstr "" "Pssst Ich bin ein privater Link, den nur du sehen kannst. Du kannst mich " @@ -772,16 +790,16 @@ msgstr "" msgid "Invalid export selection:" msgstr "Ungültige Exportauswahl:" -#: application/netscape/NetscapeBookmarkUtils.php:215 +#: application/netscape/NetscapeBookmarkUtils.php:213 #, php-format msgid "File %s (%d bytes) " msgstr "Datei %s (%d bytes) " -#: application/netscape/NetscapeBookmarkUtils.php:217 +#: application/netscape/NetscapeBookmarkUtils.php:215 msgid "has an unknown file format. Nothing was imported." msgstr "hat ein unbekanntes Dateiformat. Es wurde nichts importiert." -#: application/netscape/NetscapeBookmarkUtils.php:221 +#: application/netscape/NetscapeBookmarkUtils.php:219 #, php-format msgid "" "was successfully processed in %d seconds: %d bookmarks imported, %d " @@ -790,8 +808,8 @@ msgstr "" "wurde erfolgreich in %d Sekunden verarbeitet: %d Lesezeichen importiert, %d " "Lesezeichen überschrieben, %d Lesezeichen übersprungen." -#: application/plugin/PluginManager.php:99 -#: application/plugin/PluginManager.php:137 +#: application/plugin/PluginManager.php:103 +#: application/plugin/PluginManager.php:141 msgid " [plugin incompatibility]: " msgstr " [Plugin-Inkompatibiliät]: " @@ -809,7 +827,7 @@ msgstr "Kann nicht löschen, %s ist kein Verzeichnis" msgid "An error occurred while running the update " msgstr "Beim Ausführen des Updates ist ein Fehler aufgetreten " -#: index.php:82 +#: index.php:87 msgid "Shared bookmarks on " msgstr "Geteilte Lesezeichen auf " @@ -858,7 +876,7 @@ msgstr "Hintergrund-Farbe (hellgrau)" msgid "Dark main color (e.g. visited links)" msgstr "Dunkle Haupt-Farbe (z. B. besuchte Links)" -#: plugins/demo_plugin/demo_plugin.php:495 +#: plugins/demo_plugin/demo_plugin.php:528 msgid "" "A demo plugin covering all use cases for template designers and plugin " "developers." @@ -866,12 +884,12 @@ msgstr "" "Ein Demo-Plugin, das alle Anwendungsfälle für Template-Designer und Plugin-" "Entwickler abdeckt." -#: plugins/demo_plugin/demo_plugin.php:496 +#: plugins/demo_plugin/demo_plugin.php:529 msgid "This is a parameter dedicated to the demo plugin. It'll be suffixed." msgstr "" "Dies ist ein Parameter, der dem Demo-Plugin gewidmet ist. Es wird angehängt." -#: plugins/demo_plugin/demo_plugin.php:497 +#: plugins/demo_plugin/demo_plugin.php:530 msgid "Other demo parameter" msgstr "Andere Demo-Parameter" @@ -885,9 +903,7 @@ msgstr "" #: plugins/isso/isso.php:92 msgid "Let visitor comment your shaares on permalinks with Isso." -msgstr "" -"Lassen Sie Besucher Ihre Shaares auf Permalinks mit Isso " -"kommentieren." +msgstr "Lassen Sie Besucher Ihre Shaares auf Permalinks mit Isso kommentieren." #: plugins/isso/isso.php:93 msgid "Isso server URL (without 'http://')" @@ -932,29 +948,41 @@ msgstr "" msgid "plugins/playvideos/jquery-1.11.2.min.js" msgstr "plugins/playvideos/jquery-1.11.2.min.js" -#: plugins/pubsubhubbub/pubsubhubbub.php:72 +#: plugins/pubsubhubbub/pubsubhubbub.php:80 #, php-format msgid "Could not publish to PubSubHubbub: %s" msgstr "Veröffentlichung auf PubSubHubbub nicht möglich: %s" -#: plugins/pubsubhubbub/pubsubhubbub.php:99 +#: plugins/pubsubhubbub/pubsubhubbub.php:107 #, php-format msgid "Could not post to %s" msgstr "Kann nicht posten auf %s" -#: plugins/pubsubhubbub/pubsubhubbub.php:103 +#: plugins/pubsubhubbub/pubsubhubbub.php:111 #, php-format msgid "Bad response from the hub %s" msgstr "Ungültige Antwort vom Hub %s" -#: plugins/pubsubhubbub/pubsubhubbub.php:114 +#: plugins/pubsubhubbub/pubsubhubbub.php:122 msgid "Enable PubSubHubbub feed publishing." msgstr "Aktiviere PubSubHubbub Feed Veröffentlichung." -#: plugins/qrcode/qrcode.php:74 plugins/wallabag/wallabag.php:72 +#: plugins/qrcode/qrcode.php:74 msgid "For each link, add a QRCode icon." msgstr "Für jeden Link, füge eine QRCode Icon hinzu." +#: plugins/readitlater/readitlater.php:118 +msgid "Mark as Read" +msgstr "Als gelesen markieren" + +#: plugins/readitlater/readitlater.php:118 +msgid "Read it later" +msgstr "Später lesen" + +#: plugins/readitlater/readitlater.php:130 +msgid "Filter ReadItLater bookmarks" +msgstr "ReadItLater-Lesezeichen filtern" + #: plugins/wallabag/wallabag.php:22 msgid "" "Wallabag plugin error: Please define the \"WALLABAG_URL\" setting in the " @@ -967,6 +995,12 @@ msgstr "" msgid "Save to wallabag" msgstr "Auf Wallabag speichern" +#: plugins/wallabag/wallabag.php:72 +msgid "For each link, add a Wallabag icon to save it in your instance." +msgstr "" +"Für jeden Link ein Wallabag-Symbol hinzufügen, um es in Deiner Instanz zu " +"speichern." + #: plugins/wallabag/wallabag.php:73 msgid "Wallabag API URL" msgstr "Wallabag API URL" @@ -976,8 +1010,8 @@ msgid "Wallabag API version (1 or 2)" msgstr "Wallabag API version (1 oder 2)" #: tests/LanguagesTest.php:214 tests/LanguagesTest.php:227 -#: tests/languages/fr/LanguagesFrTest.php:159 -#: tests/languages/fr/LanguagesFrTest.php:172 +#: tests/languages/fr/LanguagesFrTest.php:160 +#: tests/languages/fr/LanguagesFrTest.php:173 #: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:46 #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:87 #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:139 @@ -1071,6 +1105,7 @@ msgid "Rename tag" msgstr "Tag umbenennen" #: tmp/changetag.b91ef64efc3688266305ea9b42e5017e.rtpl.php:35 +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:195 msgid "Delete tag" msgstr "Lösche Tag" @@ -1108,6 +1143,38 @@ msgstr "" "Beachten Sie, dass Hashtags nicht vollständig mit einem Nicht-" "Leerraumtrennzeichen funktionieren." +#: tmp/configure.90100d2eaf5d3705e14b9b4f78ecddc9.rtpl.php:167 +#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:339 +#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:30 +#: tmp/server.b91ef64efc3688266305ea9b42e5017e.rtpl.php:102 +msgid "All" +msgstr "Alle" + +#: tmp/configure.90100d2eaf5d3705e14b9b4f78ecddc9.rtpl.php:171 +#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:343 +#: tmp/server.b91ef64efc3688266305ea9b42e5017e.rtpl.php:106 +msgid "Only common media hosts" +msgstr "Nur gängige Medienhosts" + +#: tmp/configure.90100d2eaf5d3705e14b9b4f78ecddc9.rtpl.php:175 +#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:347 +#: tmp/server.b91ef64efc3688266305ea9b42e5017e.rtpl.php:110 +msgid "None" +msgstr "Keine" + +#: tmp/configure.90100d2eaf5d3705e14b9b4f78ecddc9.rtpl.php:182 +#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:324 +msgid "You need to enable the extension php-gd to use thumbnails." +msgstr "" +"Sie müssen die Erweiterung php-gd aktivieren, um " +"Miniaturansichten zu verwenden." + +#: tmp/configure.90100d2eaf5d3705e14b9b4f78ecddc9.rtpl.php:186 +#, fuzzy +#| msgid "Synchronize thumbnails" +msgid "Synchonize thumbnails" +msgstr "Thumbnails synchronisieren" + #: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:29 msgid "title" msgstr "Titel" @@ -1121,17 +1188,16 @@ msgid "Default value" msgstr "Standardwert" #: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:58 -msgid "Theme" -msgstr "Thema" +msgid "Themes" +msgstr "Themen" #: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:85 msgid "Description formatter" msgstr "Beschreibungsformatierer" #: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:114 -#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:77 -msgid "Language" -msgstr "Sprache" +msgid "Languages" +msgstr "Sprachen" #: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:143 #: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:101 @@ -1185,8 +1251,9 @@ msgid "Do not show any links if the user is not logged in" msgstr "Zeige keine Links, wenn der Benutzer nicht angemeldet ist" #: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:258 -#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:149 -msgid "Check updates" +#, fuzzy +#| msgid "Check updates" +msgid "Check for updates" msgstr "Auf Updates prüfen" #: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:259 @@ -1215,40 +1282,18 @@ msgstr "" "Anwendung" #: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:306 -msgid "API secret" -msgstr "API-Geheimnis" +msgid "REST API secret" +msgstr "REST API-Geheimnis" #: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:320 msgid "Enable thumbnails" -msgstr "Aktivierte Thunbnails" - -#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:324 -msgid "You need to enable the extension php-gd to use thumbnails." -msgstr "" -"Sie müssen die Erweiterung php-gd aktivieren, um " -"Miniaturansichten zu verwenden." +msgstr "Aktivierte Thumbnails" #: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:328 #: tmp/server.b91ef64efc3688266305ea9b42e5017e.rtpl.php:122 msgid "Synchronize thumbnails" msgstr "Thumbnails synchronisieren" -#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:339 -#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:30 -#: tmp/server.b91ef64efc3688266305ea9b42e5017e.rtpl.php:102 -msgid "All" -msgstr "Alle" - -#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:343 -#: tmp/server.b91ef64efc3688266305ea9b42e5017e.rtpl.php:106 -msgid "Only common media hosts" -msgstr "Nur gängige Medienhosts" - -#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:347 -#: tmp/server.b91ef64efc3688266305ea9b42e5017e.rtpl.php:110 -msgid "None" -msgstr "Keine" - #: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26 msgid "1 RSS entry per :type" msgid_plural "" @@ -1315,6 +1360,7 @@ msgid "Markdown syntax" msgstr "Markdown-Syntax" #: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:115 +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:198 msgid "Cancel" msgstr "Abbruch" @@ -1400,14 +1446,14 @@ msgstr "" #: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:32 #: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:16 #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:167 -#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:167 +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:209 msgid "Username" msgstr "Benutzername" #: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:47 #: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:20 #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:168 -#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:168 +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:210 msgid "Password" msgstr "Passwort" @@ -1419,6 +1465,14 @@ msgstr "Shaarli Titel" msgid "My links" msgstr "Meine Links" +#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:77 +msgid "Language" +msgstr "Sprache" + +#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:149 +msgid "Check updates" +msgstr "Auf Updates prüfen" + #: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:181 msgid "Install" msgstr "Installiere" @@ -1504,6 +1558,7 @@ msgid "permalink" msgstr "Permalink" #: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:183 +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:195 msgid "Add tag" msgstr "Tag hinzufügen" @@ -1560,7 +1615,7 @@ msgstr "Links pro Seite" #: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:25 #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:171 -#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:171 +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:213 msgid "Remember me" msgstr "Erinnere dich an mich" @@ -1632,15 +1687,33 @@ msgid "Set private" msgstr "Setze Status auf Privat" #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:189 -#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:189 +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:231 msgid "is available" msgstr "ist verfügbar" #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:196 -#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:196 +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:238 msgid "Error" msgstr "Fehler" +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:162 +msgid "Add tags" +msgstr "Tags hinzufügen" + +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:167 +msgid "Delete tags" +msgstr "Lösche Tags" + +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:184 +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:185 +msgid "Tag to add" +msgstr "Tag hinzufügen" + +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:184 +#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:185 +msgid "Tag to delete" +msgstr "Tag zur Löschung" + #: tmp/picwall.b91ef64efc3688266305ea9b42e5017e.rtpl.php:15 msgid "There is no cached thumbnail." msgstr "Es gibt keine zwischengespeicherte Miniaturansicht / Thumbnail." @@ -1658,7 +1731,9 @@ msgid "pics" msgstr "Bilder" #: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:15 -msgid "You need to enable Javascript to change plugin loading order." +#, fuzzy +#| msgid "You need to enable Javascript to change plugin loading order." +msgid "You have to enable JavaScript to change plugin loading order." msgstr "" "Du musst Javascript aktivieren um die Ladereihenfolge der Plugins zu ändern." @@ -1678,8 +1753,10 @@ msgstr "Kein Plugin aktiviert." #: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:40 #: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:73 -msgid "Disable" -msgstr "Deaktivieren" +#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:97 +#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:122 +msgid "Enabled" +msgstr "Aktiviert" #: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:41 #: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:74 @@ -1701,11 +1778,6 @@ msgstr "Deaktivierte Plugins" msgid "No plugin disabled." msgstr "Kein Plugin deaktiviert." -#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:97 -#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:122 -msgid "Enable" -msgstr "Aktiviere" - #: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:134 msgid "More plugins available" msgstr "Weitere Plugins verfügbar" @@ -1934,6 +2006,10 @@ msgstr "" msgid "Export database" msgstr "Exportiere Datenbank" +#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:75 +msgid "Bookmarklets" +msgstr "Lesezeichen (Bookmarklets)" + #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:77 msgid "" "Drag one of these button to your bookmarks toolbar or right-click it and " @@ -1985,15 +2061,14 @@ msgid "Add Note" msgstr "Notiz hinzufügen" #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:132 -msgid "3rd party" -msgstr "Von Dritten" +msgid "Third-party resources" +msgstr "Ressourcen von Dritt-Anbietern" #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:135 -#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:140 -msgid "plugin" -msgstr "Plugin" +msgid "Community and related software" +msgstr "Gemeinschaft und zugehörige Software" -#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:165 +#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:144 msgid "" "Drag this link to your bookmarks toolbar, or right-click it and choose " "Bookmark This Link" @@ -2001,6 +2076,15 @@ msgstr "" "Ziehe diesen Link in deine Lesezeichen-Symbolleiste oder klicke mit der " "rechten Maustaste darauf und wähle \"Speichere diesen Link als Lesezeichen\"" +#~ msgid "Disable" +#~ msgstr "Deaktivieren" + +#~ msgid "3rd party" +#~ msgstr "Von Dritten" + +#~ msgid "plugin" +#~ msgstr "Plugin" + #~ msgid "Rename" #~ msgstr "Umbenennen" From e0a8f961ba021a0f5a3b8dd7d2fee02ff72f4c57 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 8 Apr 2023 10:10:29 -0400 Subject: [PATCH 11/67] Support: ignore disk_free_space if the function is unavailable (#1970) --- application/bookmark/BookmarkIO.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/application/bookmark/BookmarkIO.php b/application/bookmark/BookmarkIO.php index fa5cefb5e..969e831fd 100644 --- a/application/bookmark/BookmarkIO.php +++ b/application/bookmark/BookmarkIO.php @@ -168,6 +168,10 @@ protected function synchronized(callable $function): void */ public function checkDiskSpace(string $data): bool { + if (function_exists('disk_free_space') === false) { + return true; + } + return disk_free_space(dirname($this->datastore)) > (strlen($data) + 1024 * 500); } } From 5f69e1731074ded5f72d8bf1469177d33ddcfedd Mon Sep 17 00:00:00 2001 From: Gregory Date: Sat, 15 Apr 2023 15:02:48 +0200 Subject: [PATCH 12/67] Update Server-configuration.md (#1973) --- doc/md/Server-configuration.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/md/Server-configuration.md b/doc/md/Server-configuration.md index 9b5d0a81c..39bfd00ee 100644 --- a/doc/md/Server-configuration.md +++ b/doc/md/Server-configuration.md @@ -223,6 +223,10 @@ sudo nano /etc/apache2/sites-available/shaarli.mydomain.org.conf Header set Cache-Control "max-age=2628000, public, must-revalidate, proxy-revalidate" + + Require all granted + + # serve the Shaarli favicon from its custom location Alias favicon.ico /var/www/shaarli.mydomain.org/images/favicon.ico From 1cd642619f1e77657f1ddda717c15dac5faf88c7 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 15 Apr 2023 12:01:50 -0400 Subject: [PATCH 13/67] Documentation: fix broken link to 3rd party plugins (#1975) --- tpl/default/pluginsadmin.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html index ba1e12ffe..c7955ba1e 100644 --- a/tpl/default/pluginsadmin.html +++ b/tpl/default/pluginsadmin.html @@ -117,7 +117,7 @@

{'Disabled Plugins'|t}

{"More plugins available"|t} - {"in the documentation"|t}. + {"in the documentation"|t}.
From 88b76c44f7fb53e3f8da30b0f8a1b1045b1582fc Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 15 Apr 2023 12:46:09 -0400 Subject: [PATCH 14/67] Fix autofocus: load bulk action input on linklist only (#1976) --- tpl/default/page.header.html | 97 +++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 47 deletions(-) diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 9a1a5eed2..c8ecbc520 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -117,59 +117,62 @@
- - {$addDelete=['add', 'delete']} - {loop="$addDelete"} -
-
+ {if="$is_logged_in && $template === 'linklist'"} +
- {/loop} + + {$addDelete=['add', 'delete']} + {loop="$addDelete"} + + {/loop} + {/if} {if="!$is_logged_in"}
From d48e06f4389417465fb7cd416d4d5301490d4307 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 2 May 2023 12:15:57 +0200 Subject: [PATCH 15/67] run trivy vulnerability scanner on the 'latest' docker image - run trivy from makefile so that it can be run both locally and through github actions - usage: make test_trivy TRIVY_TARGET_DOCKER_IMAGE=regist.ry/user/image:tag - tested by downgrading the base image to alpine 3.15.7 and verifying that vulnerabilities are reported (https://github.com/nodiscc/Shaarli/actions/runs/4860040980/jobs/8663400103) - TEMP/TESTING only push image to ghcr.io, run trivy on trivy branch/docker tag as well as master - ref. https://github.com/shaarli/Shaarli/issues/1531 --- .github/workflows/docker-latest.yml | 22 ++++++++++++---------- Makefile | 9 +++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml index 6611a18b3..52d86ff00 100644 --- a/.github/workflows/docker-latest.yml +++ b/.github/workflows/docker-latest.yml @@ -1,7 +1,7 @@ name: Build/push Docker image (master/latest) on: push: - branches: [ master ] + branches: [ master, trivy ] jobs: docker-build: runs-on: ubuntu-latest @@ -11,11 +11,11 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + # - name: Login to DockerHub + # uses: docker/login-action@v2 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry uses: docker/login-action@v2 with: @@ -35,9 +35,11 @@ jobs: with: context: . push: true - platforms: linux/amd64,linux/arm64,linux/arm/v7 - tags: | - ${{ secrets.DOCKER_IMAGE }}:latest - ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest + # tags: | + # ${{ secrets.DOCKER_IMAGE }}:trivy + # ghcr.io/${{ secrets.DOCKER_IMAGE }}:trivy + tags: ghcr.io/${{ secrets.DOCKER_IMAGE }}:trivy - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} + - name: Run trivy image scanner + run: make test_trivy TRIVY_TARGET_DOCKER_IMAGE=ghcr.io/${{ secrets.DOCKER_IMAGE }}:trivy diff --git a/Makefile b/Makefile index b96600453..1587b3056 100644 --- a/Makefile +++ b/Makefile @@ -82,6 +82,15 @@ locale_test_%: --bootstrap tests/languages/bootstrap.php \ --testsuite language-$(firstword $(subst _, ,$*)) +# trivy version (https://github.com/aquasecurity/trivy/releases) +TRIVY_VERSION=0.39.0 +# default docker image to scan with trivy +TRIVY_TARGET_DOCKER_IMAGE=ghcr.io/shaarli/shaarli:latest +test_trivy: + wget --quiet --continue -O trivy_$(TRIVY_VERSION)_Linux-64bit.tar.gz https://github.com/aquasecurity/trivy/releases/download/v$(TRIVY_VERSION)/trivy_$(TRIVY_VERSION)_Linux-64bit.tar.gz + tar -zxf trivy_$(TRIVY_VERSION)_Linux-64bit.tar.gz + ./trivy image $(TRIVY_TARGET_DOCKER_IMAGE) + all_tests: test locale_test_de_DE locale_test_en_US locale_test_fr_FR @# --The current version is not compatible with PHP 7.2 @#$(BIN)/phpcov merge --html coverage coverage From 22b40449866559cb6046d167a5629eaff094a5da Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 2 May 2023 12:24:38 +0200 Subject: [PATCH 16/67] tools/github actions: revert temporary changes used for trivy tests on fork/branch --- .github/workflows/docker-latest.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml index 52d86ff00..2ce685e84 100644 --- a/.github/workflows/docker-latest.yml +++ b/.github/workflows/docker-latest.yml @@ -1,7 +1,7 @@ name: Build/push Docker image (master/latest) on: push: - branches: [ master, trivy ] + branches: [ master ] jobs: docker-build: runs-on: ubuntu-latest @@ -11,11 +11,11 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - # - name: Login to DockerHub - # uses: docker/login-action@v2 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry uses: docker/login-action@v2 with: @@ -35,10 +35,10 @@ jobs: with: context: . push: true - # tags: | - # ${{ secrets.DOCKER_IMAGE }}:trivy - # ghcr.io/${{ secrets.DOCKER_IMAGE }}:trivy - tags: ghcr.io/${{ secrets.DOCKER_IMAGE }}:trivy + platforms: linux/amd64,linux/arm64,linux/arm/v7 + tags: | + ${{ secrets.DOCKER_IMAGE }}:latest + ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} - name: Run trivy image scanner From eb340c7eb6d9631e0b5b99b578307c57fbae0ca9 Mon Sep 17 00:00:00 2001 From: Nicolas Le Gaillart Date: Wed, 17 May 2023 22:33:36 +0200 Subject: [PATCH 17/67] Update Community-and-related-software.md Hi, here are my two little plugins for Shaarli. --- doc/md/Community-and-related-software.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/md/Community-and-related-software.md b/doc/md/Community-and-related-software.md index d5f92015c..9a3beeb39 100644 --- a/doc/md/Community-and-related-software.md +++ b/doc/md/Community-and-related-software.md @@ -13,6 +13,7 @@ See [REST API](REST-API) for a list of official and community clients. ### Third party plugins - [autosave](https://github.com/kalvn/shaarli-plugin-autosave) by [@kalvn](https://github.com/kalvn): Automatically saves data when editing a Shaare to avoid any loss in case of crash or unexpected shutdown. +- [clickat](https://forge.tourmentine.com/n/shaarli-plugin-clickat) by [@n](https://forge.tourmentine.com/n): Makes Twitter and Fediverse addresses clickable. - [code-coloration](https://github.com/ArthurHoaro/code-coloration) by [@ArthurHoaro](https://github.com/ArthurHoaro): client side code syntax highlighter. - [custom-css](https://github.com/immanuelfodor/shaarli-custom-css) by [@immanuelfodor](https://github.com/immanuelfodor) - Customize the look and feel of the UI with custom CSS rules - [disqus](https://github.com/kalvn/shaarli-plugin-disqus) by [@kalvn](https://github.com/kalvn): Adds Disqus comment system to your Shaarli. @@ -22,6 +23,7 @@ See [REST API](REST-API) for a list of official and community clients. - [launch](https://github.com/ArthurHoaro/launch-plugin) - Launch Plugin is a plugin designed to enhance and customize Launch Theme for Shaarli. - [markdown-toolbar](https://github.com/immanuelfodor/shaarli-markdown-toolbar) by [@immanuelfodor](https://github.com/immanuelfodor) - Easily insert markdown syntax into the Description field when editing a Shaare. - [related](https://github.com/ilesinge/shaarli-related) by [@ilesinge](https://github.com/ilesinge) - Show related Shaares based on the number of identical tags. +- [shaargem](https://forge.tourmentine.com/n/shaarli-plugin-shaargem) by [@n](https://forge.tourmentine.com/n): Allow to shaare gemini capsules. - [shaarli-descriptor](https://github.com/immanuelfodor/shaarli-descriptor) by [@immanuelfodor](https://github.com/immanuelfodor) - Customize the default height/number of rows of the Description field when editing a Shaare. - [shaarli2mastodon](https://github.com/kalvn/shaarli2mastodon) by [@kalvn](https://github.com/kalvn) - This Shaarli plugin allows you to automatically publish links you post on your Mastodon timeline. - [shaarli2twitter](https://github.com/ArthurHoaro/shaarli2twitter) by [@ArthurHoaro](https://github.com/ArthurHoaro) - Automatically tweet your Shaares from Shaarli From a1c6460077b805b00be6f2b9ab23a845a8138535 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 21 May 2023 20:27:12 +0200 Subject: [PATCH 18/67] doc: improve docs on usage of OR operator in tags search - fixes https://github.com/shaarli/Shaarli/issues/1982 --- doc/md/Usage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/md/Usage.md b/doc/md/Usage.md index c4f1b179d..4df9aaa94 100644 --- a/doc/md/Usage.md +++ b/doc/md/Usage.md @@ -53,7 +53,7 @@ Shaarli can be used as a minimal blog, notepad, pastebin...: While adding or edi - **Tags search:** `Filter by tags` allow only displaying Shaares tagged with one or multiple tags (use space to separate tags). A plus sign `+` is optional and will restrict suggested tags to only those starting with the string (example: `pr` will hint `apron` and `printer` but `+pr` will only hint printer). - **Hidden tags:** tags starting with a dot `.` (example `.secret`) are private. They can only be seen and searched when logged in. - **Exclude text/tags:** Use the `-` operator before a word or tag to exclude Shaares matching this word from search results (`NOT` operator). -- **Optional tags:** Use the `~` operator before multiple tags to search for any one of them (`OR` operator). +- **Optional tags:** Use the `~` operator before multiple tags to search for any one of them (`OR` operator). Note that the OR operator only works if there are multiple tags with a tilde. A search for `webdesign ~ai ~youtube` search would match `webdesign AND (ai OR youtube)`. A search for `webdesign ~youtube` is equivalent to `+webdesign +youtube`. - **Wildcard tag search:** An asterisk (`*`) can be used as a wildcard and will match any number of characters. Wildcards can appear in the middle of a search term or at the end (example: pro\*in\* will match programming and protein). - **Untagged links:** Shaares without tags can be searched by clicking the `untagged` toggle button top left of the Shaares list (only when logged in). From 0eee6a2ba199706ee45d8bae80d82ab4d4b761a5 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 21 May 2023 21:08:33 +0200 Subject: [PATCH 19/67] gihub actions: fix value of TRIVY_TARGET_DOCKER_IMAGE - fixes Error response from daemon: no such image: ghcr.io/***:trivy: No such image: ghcr.io/***:trivy - introduced in https://github.com/shaarli/Shaarli/pull/1980 but the test target branch/tag was never reverted to 'latest' --- .github/workflows/docker-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml index 2ce685e84..bce2d4c0e 100644 --- a/.github/workflows/docker-latest.yml +++ b/.github/workflows/docker-latest.yml @@ -42,4 +42,4 @@ jobs: - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} - name: Run trivy image scanner - run: make test_trivy TRIVY_TARGET_DOCKER_IMAGE=ghcr.io/${{ secrets.DOCKER_IMAGE }}:trivy + run: make test_trivy TRIVY_TARGET_DOCKER_IMAGE=ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest From 3b5923b7e18cdc487b510445fc320400429efd36 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 21 May 2023 22:16:48 +0200 Subject: [PATCH 20/67] tools/CI: scan repository with trivy security scanner (yarn.lock, composer.lock) - run scan on each push/pull request update - can be run locally using make test_trivy_repo - exit with error code 0/success when vulnerabilities are found, as not to make the workflow fail, a separate periodic run that exits with code 1 should be added in parallel - update trivy to v0.43.0 - https://github.com/aquasecurity/trivy/releases/tag/v0.43.0 - also consider TRIVY_EXIT_CODE when running trivy on the latest docker image - ref. https://github.com/shaarli/Shaarli/issues/1531 --- .github/workflows/ci.yml | 9 +++++++ .github/workflows/docker-latest.yml | 4 ++-- .gitignore | 1 + Makefile | 37 ++++++++++++++++++++--------- 4 files changed, 38 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81547154e..bdb058a58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,3 +98,12 @@ jobs: - name: Build documentation run: mkdocs build --clean + + trivy-repo: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Run trivy scanner on repository (non-blocking) + run: make test_trivy_repo TRIVY_EXIT_CODE=0 diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml index bce2d4c0e..ad885b6a4 100644 --- a/.github/workflows/docker-latest.yml +++ b/.github/workflows/docker-latest.yml @@ -41,5 +41,5 @@ jobs: ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} - - name: Run trivy image scanner - run: make test_trivy TRIVY_TARGET_DOCKER_IMAGE=ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest + - name: Run trivy scanner on latest docker image + run: make test_trivy_docker TRIVY_TARGET_DOCKER_IMAGE=ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest diff --git a/.gitignore b/.gitignore index de11480fb..8216ed15a 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ sandbox phpmd.html phpdoc.xml .phpunit.result.cache +trivy # User plugin configuration plugins/* diff --git a/Makefile b/Makefile index 1587b3056..11f05d0fe 100644 --- a/Makefile +++ b/Makefile @@ -82,15 +82,6 @@ locale_test_%: --bootstrap tests/languages/bootstrap.php \ --testsuite language-$(firstword $(subst _, ,$*)) -# trivy version (https://github.com/aquasecurity/trivy/releases) -TRIVY_VERSION=0.39.0 -# default docker image to scan with trivy -TRIVY_TARGET_DOCKER_IMAGE=ghcr.io/shaarli/shaarli:latest -test_trivy: - wget --quiet --continue -O trivy_$(TRIVY_VERSION)_Linux-64bit.tar.gz https://github.com/aquasecurity/trivy/releases/download/v$(TRIVY_VERSION)/trivy_$(TRIVY_VERSION)_Linux-64bit.tar.gz - tar -zxf trivy_$(TRIVY_VERSION)_Linux-64bit.tar.gz - ./trivy image $(TRIVY_TARGET_DOCKER_IMAGE) - all_tests: test locale_test_de_DE locale_test_en_US locale_test_fr_FR @# --The current version is not compatible with PHP 7.2 @#$(BIN)/phpcov merge --html coverage coverage @@ -156,7 +147,7 @@ release_zip: composer_dependencies htmldoc translate build_frontend ### remove all unversioned files clean: @git clean -df - @rm -rf sandbox + @rm -rf sandbox trivy* ### generate the AUTHORS file from Git commit information generate_authors: @@ -178,7 +169,6 @@ htmldoc: find doc/html/ -type f -exec chmod a-x '{}' \; rm -r venv - ### Generate Shaarli's translation compiled file (.mo) translate: @echo "----------------------" @@ -198,3 +188,28 @@ eslint: ### Run CSSLint check against Shaarli's SCSS files sasslint: @yarnpkg run stylelint --config .dev/.stylelintrc.js 'assets/default/scss/*.scss' + +## +# Security scans +## + +# trivy version (https://github.com/aquasecurity/trivy/releases) +TRIVY_VERSION=0.43.0 +# default trivy exit code when vulnerabilities are found +TRIVY_EXIT_CODE=1 +# default docker image to scan with trivy +TRIVY_TARGET_DOCKER_IMAGE=ghcr.io/shaarli/shaarli:latest + +### download trivy vulneravbility scanner +download_trivy: + wget --quiet --continue -O trivy_$(TRIVY_VERSION)_Linux-64bit.tar.gz https://github.com/aquasecurity/trivy/releases/download/v$(TRIVY_VERSION)/trivy_$(TRIVY_VERSION)_Linux-64bit.tar.gz + tar -z -x trivy -f trivy_$(TRIVY_VERSION)_Linux-64bit.tar.gz + +### run trivy vulnerability scanner on docker image +test_trivy_docker: download_trivy + ./trivy --exit-code $(TRIVY_EXIT_CODE) image $(TRIVY_TARGET_DOCKER_IMAGE) + +### run trivy vulnerability scanner on composer/yarn dependency trees +test_trivy_repo: download_trivy + ./trivy --exit-code $(TRIVY_EXIT_CODE) fs composer.lock + ./trivy --exit-code $(TRIVY_EXIT_CODE) fs yarn.lock From 9fd6739a1fad315207edb1aabf40b072f17409e8 Mon Sep 17 00:00:00 2001 From: Alistair Young Date: Fri, 30 Jun 2023 17:08:02 -0500 Subject: [PATCH 21/67] docker: nginx: listen on IPv6 in addition to IPv4 (#1983) --- .docker/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/.docker/nginx.conf b/.docker/nginx.conf index 30810a871..ca4789ce4 100644 --- a/.docker/nginx.conf +++ b/.docker/nginx.conf @@ -18,6 +18,7 @@ http { server { listen 80; + listen [::]:80; root /var/www/shaarli; access_log /var/log/nginx/shaarli.access.log; From c44a0d200d115b781052c8b6199a4dba194457ca Mon Sep 17 00:00:00 2001 From: Amadeous Date: Sat, 1 Jul 2023 00:15:41 +0200 Subject: [PATCH 22/67] Expose tags_separator config through /info API (#1997) --- application/api/controllers/Info.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/api/controllers/Info.php b/application/api/controllers/Info.php index ae7db93e5..1cacfb42b 100644 --- a/application/api/controllers/Info.php +++ b/application/api/controllers/Info.php @@ -35,6 +35,7 @@ public function getInfo($request, $response) 'timezone' => $this->conf->get('general.timezone', 'UTC'), 'enabled_plugins' => $this->conf->get('general.enabled_plugins', []), 'default_private_links' => $this->conf->get('privacy.default_private_links', false), + 'tags_separator' => $this->conf->get('general.tags_separator', ' '), ], ]; From 910b695d4d8197be74525b2669e6776d51eb9bd6 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Thu, 6 Jul 2023 18:57:10 +0200 Subject: [PATCH 23/67] correct usage of hyphens in all occurences of 'super fast, database-free' - fixes https://github.com/shaarli/Shaarli/issues/1758 --- Makefile | 2 +- README.md | 2 +- application/bookmark/BookmarkInitializer.php | 2 +- application/legacy/LegacyLinkDB.php | 2 +- composer.json | 2 +- doc/md/index.md | 2 +- inc/languages/de/LC_MESSAGES/shaarli.po | 2 +- inc/languages/fr/LC_MESSAGES/shaarli.po | 2 +- inc/languages/jp/LC_MESSAGES/shaarli.po | 2 +- inc/languages/ru/LC_MESSAGES/shaarli.po | 2 +- inc/languages/zh_CN/LC_MESSAGES/shaarli.po | 2 +- index.php | 2 +- mkdocs.yml | 2 +- tpl/default/page.footer.html | 4 ++-- tpl/vintage/page.footer.html | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 11f05d0fe..38d05bb7f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# The personal, minimalist, super-fast, database free, bookmarking service. +# The personal, minimalist, super fast, database-free, bookmarking service. # Makefile for PHP code analysis & testing, documentation and release generation BIN = vendor/bin diff --git a/README.md b/README.md index c14f6d437..81ebfa1ff 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Shaarli logo](doc/md/images/doc-logo.png) -The personal, minimalist, super-fast, database free, bookmarking service. +The personal, minimalist, super fast, database-free, bookmarking service. _Do you want to share the links you discover?_ _Shaarli is a minimalist link sharing service that you can install on your own server._ diff --git a/application/bookmark/BookmarkInitializer.php b/application/bookmark/BookmarkInitializer.php index 8ab5c441a..3c2c10cbc 100644 --- a/application/bookmark/BookmarkInitializer.php +++ b/application/bookmark/BookmarkInitializer.php @@ -91,7 +91,7 @@ public function initialize(): void $bookmark = new Bookmark(); $bookmark->setTitle( - 'Shaarli - ' . t('The personal, minimalist, super-fast, database free, bookmarking service') + 'Shaarli - ' . t('The personal, minimalist, super fast, database-free, bookmarking service') ); $bookmark->setDescription(t( 'Welcome to Shaarli! diff --git a/application/legacy/LegacyLinkDB.php b/application/legacy/LegacyLinkDB.php index cb19eda50..af1e6cba8 100644 --- a/application/legacy/LegacyLinkDB.php +++ b/application/legacy/LegacyLinkDB.php @@ -246,7 +246,7 @@ private function check() $this->links = []; $link = [ 'id' => 1, - 'title' => t('The personal, minimalist, super-fast, database free, bookmarking service'), + 'title' => t('The personal, minimalist, super fast, database-free, bookmarking service'), 'url' => 'https://shaarli.readthedocs.io', 'description' => t( 'Welcome to Shaarli! This is your first public bookmark. ' diff --git a/composer.json b/composer.json index a2d378c76..a8690dbea 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "shaarli/shaarli", - "description": "The personal, minimalist, super-fast, database-free bookmarking service", + "description": "The personal, minimalist, super fast, database-free bookmarking service", "type": "project", "license": "MIT", "homepage": "https://github.com/shaarli/Shaarli", diff --git a/doc/md/index.md b/doc/md/index.md index cc4dd2ebc..4d4f0b060 100644 --- a/doc/md/index.md +++ b/doc/md/index.md @@ -1,6 +1,6 @@ # Shaarli - The personal, minimalist, super-fast, database free, bookmarking service. + The personal, minimalist, super fast, database-free, bookmarking service. Do you want to share the links you discover? Shaarli is a minimalist bookmark manager and link sharing service that you can install on your own server. It is designed to be personal (single-user), fast and handy. diff --git a/inc/languages/de/LC_MESSAGES/shaarli.po b/inc/languages/de/LC_MESSAGES/shaarli.po index 4769858ee..053bfbb3b 100644 --- a/inc/languages/de/LC_MESSAGES/shaarli.po +++ b/inc/languages/de/LC_MESSAGES/shaarli.po @@ -204,7 +204,7 @@ msgstr "" #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:15 #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:48 msgid "" -"The personal, minimalist, super-fast, database free, bookmarking service" +"The personal, minimalist, super fast, database-free, bookmarking service" msgstr "" "Der persönliche, minimalistische, superschnelle, datenbankfreie " "Lesezeichenservice" diff --git a/inc/languages/fr/LC_MESSAGES/shaarli.po b/inc/languages/fr/LC_MESSAGES/shaarli.po index a54fbcdf2..ffe871297 100644 --- a/inc/languages/fr/LC_MESSAGES/shaarli.po +++ b/inc/languages/fr/LC_MESSAGES/shaarli.po @@ -193,7 +193,7 @@ msgstr "" #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:15 #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:48 msgid "" -"The personal, minimalist, super-fast, database free, bookmarking service" +"The personal, minimalist, super fast, database-free, bookmarking service" msgstr "" "Le gestionnaire de marque-pages personnel, minimaliste, et sans base de " "données" diff --git a/inc/languages/jp/LC_MESSAGES/shaarli.po b/inc/languages/jp/LC_MESSAGES/shaarli.po index 361644335..53663fedc 100644 --- a/inc/languages/jp/LC_MESSAGES/shaarli.po +++ b/inc/languages/jp/LC_MESSAGES/shaarli.po @@ -194,7 +194,7 @@ msgstr "" #: application/bookmark/BookmarkInitializer.php:94 #: application/legacy/LegacyLinkDB.php:246 msgid "" -"The personal, minimalist, super-fast, database free, bookmarking service" +"The personal, minimalist, super fast, database-free, bookmarking service" msgstr "" "個人向けの、ミニマムで高速でかつデータベースのいらないブックマークサービス" diff --git a/inc/languages/ru/LC_MESSAGES/shaarli.po b/inc/languages/ru/LC_MESSAGES/shaarli.po index 98e704252..825fe2b2e 100644 --- a/inc/languages/ru/LC_MESSAGES/shaarli.po +++ b/inc/languages/ru/LC_MESSAGES/shaarli.po @@ -196,7 +196,7 @@ msgstr "" #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:15 #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:48 msgid "" -"The personal, minimalist, super-fast, database free, bookmarking service" +"The personal, minimalist, super fast, database-free, bookmarking service" msgstr "Личный, минималистичный, сверхбыстрый сервис закладок без баз данных" #: application/bookmark/BookmarkInitializer.php:97 diff --git a/inc/languages/zh_CN/LC_MESSAGES/shaarli.po b/inc/languages/zh_CN/LC_MESSAGES/shaarli.po index 07c300c00..d8eaf6fdb 100644 --- a/inc/languages/zh_CN/LC_MESSAGES/shaarli.po +++ b/inc/languages/zh_CN/LC_MESSAGES/shaarli.po @@ -195,7 +195,7 @@ msgstr "" #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:15 #: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:48 msgid "" -"The personal, minimalist, super-fast, database free, bookmarking service" +"The personal, minimalist, super fast, database-free, bookmarking service" msgstr "个人、超快、极简、掌握数据库的书签服务" #: application/bookmark/BookmarkInitializer.php:97 diff --git a/index.php b/index.php index f4210aed3..2a0246b7b 100644 --- a/index.php +++ b/index.php @@ -1,7 +1,7 @@ {'Documentation'|t} {loop="$plugins_footer.text"} {$value} @@ -34,7 +34,7 @@ {'Are you sure you want to delete this link?'|t} {'Are you sure you want to delete this tag?'|t} - {'The personal, minimalist, super-fast, database free, bookmarking service'|t} {'by the Shaarli community'|t} + {'The personal, minimalist, super fast, database-free, bookmarking service'|t} {'by the Shaarli community'|t}
diff --git a/tpl/vintage/page.footer.html b/tpl/vintage/page.footer.html index be709aeb1..c437dc089 100644 --- a/tpl/vintage/page.footer.html +++ b/tpl/vintage/page.footer.html @@ -1,6 +1,6 @@