From 97cb30565cb39932c9c676785af2e16bca93b4a2 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 3 Mar 2024 18:50:23 +0100 Subject: [PATCH] Add v4.0.0 --- CHANGELOG.md | 2 +- composer.json | 12 ++++++------ ...Core.RedirectRule.Entity.ShortUrlRedirectRule.php | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 362524a8..c59a0a53 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). -## [4.0.0] +## [4.0.0] - 2024-03-03 ### Added * [#1914](https://github.com/shlinkio/shlink/issues/1914) Add new dynamic redirects engine based on rules. Rules are conditions checked against the visitor's request, and when matching, they can result in a redirect to a different long URL. diff --git a/composer.json b/composer.json index 65605957..a2cb2131 100644 --- a/composer.json +++ b/composer.json @@ -43,12 +43,12 @@ "pugx/shortid-php": "^1.1", "ramsey/uuid": "^4.7", "shlinkio/doctrine-specification": "^2.1.1", - "shlinkio/shlink-common": "dev-main#3e5bf59 as 6.0", - "shlinkio/shlink-config": "dev-main#a43b380 as 3.0", - "shlinkio/shlink-event-dispatcher": "dev-main#aa9023c as 4.0", - "shlinkio/shlink-importer": "dev-main#65a9a30 as 5.3", - "shlinkio/shlink-installer": "dev-develop#5943255 as 9.0", - "shlinkio/shlink-ip-geolocation": "dev-main#a807668 as 3.5", + "shlinkio/shlink-common": "^6.0", + "shlinkio/shlink-config": "^3.0", + "shlinkio/shlink-event-dispatcher": "^4.0", + "shlinkio/shlink-importer": "^5.3", + "shlinkio/shlink-installer": "^9.0", + "shlinkio/shlink-ip-geolocation": "^3.5", "shlinkio/shlink-json": "^1.1", "spiral/roadrunner": "^2023.3", "spiral/roadrunner-cli": "^2.6", diff --git a/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.RedirectRule.Entity.ShortUrlRedirectRule.php b/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.RedirectRule.Entity.ShortUrlRedirectRule.php index 3851de00..eaedd590 100644 --- a/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.RedirectRule.Entity.ShortUrlRedirectRule.php +++ b/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.RedirectRule.Entity.ShortUrlRedirectRule.php @@ -39,7 +39,6 @@ return static function (ClassMetadata $metadata, array $emConfig): void { ->setJoinTable(determineTableName('redirect_conditions_in_short_url_redirect_rules', $emConfig)) ->addInverseJoinColumn('redirect_condition_id', 'id', onDelete: 'CASCADE') ->addJoinColumn('short_url_redirect_rule_id', 'id', onDelete: 'CASCADE') - ->fetchEager() // Always fetch the corresponding conditions when loading a rule ->setOrderBy(['id' => 'ASC']) // Ensure a reliable order in the list of conditions ->cascadePersist() // Create automatically with the rule ->orphanRemoval() // Remove conditions when they are not linked to any rule