From a931c60230743c6df53c2e07f5e9675c0191f927 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 25 Nov 2023 20:08:29 +0100 Subject: [PATCH] Point to actual versions on shlink deps --- CHANGELOG.md | 6 +++++- README.md | 2 +- composer.json | 16 ++++++++-------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc34660c..2b0d0d1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org). -## [Unreleased] +## [3.7.0] - 2023-11-25 ### Added * [#1798](https://github.com/shlinkio/shlink/issues/1798) Experimental support to send visits to an external Matomo instance. * [#1780](https://github.com/shlinkio/shlink/issues/1780) Add new `NO_ORPHAN_VISITS` API key role. @@ -23,12 +23,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this Encryption should work out of the box if servers schema is set tp `tls` or `rediss`, including support for self-signed certificates. + This has been tested with AWS ElasticCache using in-transit encryption, and with Digital Ocean Redis database. + * [#1906](https://github.com/shlinkio/shlink/issues/1906) Add support for RabbitMQ encrypted connections using SSL/TLS. In order to enable SLL, you need to pass `RABBITMQ_USE_SSL=true` or the corresponding config option. Connections using self-signed certificates should work out of the box. + This has been tested with AWS RabbitMQ using in-transit encryption, and with CloudAMQP. + ### Changed * [#1799](https://github.com/shlinkio/shlink/issues/1799) RoadRunner/openswoole jobs are not run anymore for tasks that are actually disabled. diff --git a/README.md b/README.md index c01e343c..ee27f030 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ The idea is that you can just generate a container using the image and provide t First, make sure the host where you are going to run shlink fulfills these requirements: -* PHP 8.2 +* PHP 8.2 or 8.3 * The next PHP extensions: json, curl, pdo, intl, gd and gmp/bcmath. * apcu extension is recommended if you don't plan to use openswoole. * xml extension is required if you want to generate QR codes in svg format. diff --git a/composer.json b/composer.json index 27f8b9ed..84dc7f82 100644 --- a/composer.json +++ b/composer.json @@ -46,13 +46,13 @@ "php-middleware/request-id": "^4.1", "pugx/shortid-php": "^1.1", "ramsey/uuid": "^4.7", - "shlinkio/shlink-common": "dev-main#a9b5d21 as 5.7", - "shlinkio/shlink-config": "dev-main#cde5d3b as 2.5", - "shlinkio/shlink-event-dispatcher": "dev-main#35ccc0b as 3.1", - "shlinkio/shlink-importer": "dev-main#d621b20 as 5.2", - "shlinkio/shlink-installer": "dev-develop#18829f7 as 8.6", - "shlinkio/shlink-ip-geolocation": "dev-main#4a1cef8 as 3.3", - "shlinkio/shlink-json": "dev-main#e5a111c as 1.1", + "shlinkio/shlink-common": "^5.7", + "shlinkio/shlink-config": "^2.5", + "shlinkio/shlink-event-dispatcher": "^3.1", + "shlinkio/shlink-importer": "^5.2", + "shlinkio/shlink-installer": "^8.6", + "shlinkio/shlink-ip-geolocation": "3.3", + "shlinkio/shlink-json": "^1.1", "spiral/roadrunner": "^2023.2", "spiral/roadrunner-cli": "^2.5", "spiral/roadrunner-http": "^3.1", @@ -76,7 +76,7 @@ "phpunit/phpunit": "^10.4", "roave/security-advisories": "dev-master", "shlinkio/php-coding-standard": "~2.3.0", - "shlinkio/shlink-test-utils": "dev-main#cbbb64e as 3.8.0", + "shlinkio/shlink-test-utils": "^3.8", "symfony/var-dumper": "^6.3", "veewee/composer-run-parallel": "^1.3" },