diff --git a/README.md b/README.md index 5a9f64d..755a1e0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Versions for Kirby 3 +# Versions for Kirby [![Kirby 3.7.0+](https://img.shields.io/badge/Kirby-3.7.0%2B-green)](https://getkirby.com) [![MIT license](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE.md) @@ -6,7 +6,7 @@ [![CI Status](https://img.shields.io/github/actions/workflow/status/lukasbestle/kirby-versions/ci.yml?branch=main&label=CI)](https://github.com/lukasbestle/kirby-versions/actions?query=workflow%3ACI+branch%3Amain) [![Coverage Status](https://img.shields.io/codecov/c/gh/lukasbestle/kirby-versions?token=IBYEIB22SM)](https://codecov.io/gh/lukasbestle/kirby-versions) -> Keep track of content changes and switch between different versions from the Kirby 3 Panel +> Keep track of content changes and switch between different versions from the Kirby Panel ![Screenshot of the Versions view in the Kirby Panel](screenshot.png) @@ -38,8 +38,8 @@ This plugin is made for you if you have one or multiple of the use cases describ ## Requirements -- Kirby 3.7.0+ -- PHP 8.0+ +- Kirby 4.0.0+ (version 1.1.0 supports Kirby 3.7.0+) +- PHP 8.1+ - Git 2.5+ (ideally newer for better reliability) Support for older Kirby versions is provided by previous versions of this plugin. I recommend to update your Kirby installation to benefit from fixes and improvements both in Kirby and in this plugin. diff --git a/composer.json b/composer.json index 0acb557..7fe2417 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "lukasbestle/kirby-versions", - "description": "Versions Plugin for Kirby 3", + "description": "Versions Plugin for Kirby", "license": "MIT", "type": "kirby-plugin", "version": "1.1.0", @@ -11,8 +11,8 @@ } ], "require": { - "php": ">=8.0.0 <8.4.0", - "getkirby/cms": "^3.7", + "php": ">=8.1.0 <8.4.0", + "getkirby/cms": "^4.0", "getkirby/composer-installer": "^1.1" }, "minimum-stability": "RC", diff --git a/composer.lock b/composer.lock index 3abab94..c365d98 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,67 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5b6fca03411203fb4183dd2d4514cfa9", + "content-hash": "1e2fb72f6d61f367e9bcf8a6d711cb7f", "packages": [ + { + "name": "christian-riesen/base32", + "version": "1.6.0", + "source": { + "type": "git", + "url": "https://github.com/ChristianRiesen/base32.git", + "reference": "2e82dab3baa008e24a505649b0d583c31d31e894" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ChristianRiesen/base32/zipball/2e82dab3baa008e24a505649b0d583c31d31e894", + "reference": "2e82dab3baa008e24a505649b0d583c31d31e894", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.17", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^8.5.13 || ^9.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Base32\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Riesen", + "email": "chris.riesen@gmail.com", + "homepage": "http://christianriesen.com", + "role": "Developer" + } + ], + "description": "Base32 encoder/decoder according to RFC 4648", + "homepage": "https://github.com/ChristianRiesen/base32", + "keywords": [ + "base32", + "decode", + "encode", + "rfc4648" + ], + "support": { + "issues": "https://github.com/ChristianRiesen/base32/issues", + "source": "https://github.com/ChristianRiesen/base32/tree/1.6.0" + }, + "time": "2021-02-26T10:19:33+00:00" + }, { "name": "claviska/simpleimage", "version": "4.0.6", @@ -213,19 +272,20 @@ }, { "name": "getkirby/cms", - "version": "3.10.0.1", + "version": "4.1.2", "source": { "type": "git", "url": "https://github.com/getkirby/kirby.git", - "reference": "0a128e49eb98b7e28d58b21a2d5ac64ebdd023f9" + "reference": "6b7ac66c55ecac20d6b580ef01a667d1806d5c72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getkirby/kirby/zipball/0a128e49eb98b7e28d58b21a2d5ac64ebdd023f9", - "reference": "0a128e49eb98b7e28d58b21a2d5ac64ebdd023f9", + "url": "https://api.github.com/repos/getkirby/kirby/zipball/6b7ac66c55ecac20d6b580ef01a667d1806d5c72", + "reference": "6b7ac66c55ecac20d6b580ef01a667d1806d5c72", "shasum": "" }, "require": { + "christian-riesen/base32": "1.6.0", "claviska/simpleimage": "4.0.6", "composer/semver": "3.4.0", "ext-ctype": "*", @@ -244,10 +304,10 @@ "laminas/laminas-escaper": "2.13.0", "michelf/php-smartypants": "1.8.1", "php": "~8.1.0 || ~8.2.0 || ~8.3.0", - "phpmailer/phpmailer": "6.8.1", + "phpmailer/phpmailer": "6.9.1", "symfony/polyfill-intl-idn": "1.28.0", "symfony/polyfill-mbstring": "1.28.0", - "symfony/yaml": "5.4.30" + "symfony/yaml": "6.4.0" }, "replace": { "symfony/polyfill-php72": "*" @@ -292,7 +352,7 @@ "homepage": "https://getkirby.com" } ], - "description": "The Kirby 3 core", + "description": "The Kirby core", "homepage": "https://getkirby.com", "keywords": [ "cms", @@ -311,7 +371,7 @@ "type": "custom" } ], - "time": "2024-02-25T17:44:39+00:00" + "time": "2024-03-06T11:38:42+00:00" }, { "name": "getkirby/composer-installer", @@ -539,16 +599,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.8.1", + "version": "v6.9.1", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "e88da8d679acc3824ff231fdc553565b802ac016" + "reference": "039de174cd9c17a8389754d3b877a2ed22743e18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e88da8d679acc3824ff231fdc553565b802ac016", - "reference": "e88da8d679acc3824ff231fdc553565b802ac016", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/039de174cd9c17a8389754d3b877a2ed22743e18", + "reference": "039de174cd9c17a8389754d3b877a2ed22743e18", "shasum": "" }, "require": { @@ -568,6 +628,7 @@ "yoast/phpunit-polyfills": "^1.0.4" }, "suggest": { + "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication", "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses", "ext-openssl": "Needed for secure SMTP sending and DKIM signing", "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication", @@ -607,7 +668,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.8.1" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.9.1" }, "funding": [ { @@ -615,7 +676,7 @@ "type": "github" } ], - "time": "2023-08-29T08:26:30+00:00" + "time": "2023-11-25T22:23:28+00:00" }, { "name": "psr/log", @@ -1066,31 +1127,28 @@ }, { "name": "symfony/yaml", - "version": "v5.4.30", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "c6980e82a6656f6ebfabfd82f7585794cb122554" + "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/c6980e82a6656f6ebfabfd82f7585794cb122554", - "reference": "c6980e82a6656f6ebfabfd82f7585794cb122554", + "url": "https://api.github.com/repos/symfony/yaml/zipball/4f9237a1bb42455d609e6687d2613dde5b41a587", + "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<5.3" + "symfony/console": "<5.4" }, "require-dev": { - "symfony/console": "^5.3|^6.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" + "symfony/console": "^5.4|^6.0|^7.0" }, "bin": [ "Resources/bin/yaml-lint" @@ -1121,7 +1179,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.30" + "source": "https://github.com/symfony/yaml/tree/v6.4.0" }, "funding": [ { @@ -1137,7 +1195,7 @@ "type": "tidelift" } ], - "time": "2023-10-27T18:36:14+00:00" + "time": "2023-11-06T11:00:25+00:00" } ], "packages-dev": [], @@ -1147,7 +1205,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=8.0.0 <8.4.0" + "php": ">=8.1.0 <8.4.0" }, "platform-dev": [], "plugin-api-version": "2.6.0" diff --git a/index.php b/index.php index 83c3dfd..216f9a5 100644 --- a/index.php +++ b/index.php @@ -7,7 +7,7 @@ /** * Kirby Versions Plugin * Keep track of content changes and switch between - * different versions from the Kirby 3 Panel + * different versions from the Kirby Panel * * @package Kirby Versions Plugin * @author Lukas Bestle @@ -22,8 +22,8 @@ if ( $kirbyVersion !== null && ( - version_compare($kirbyVersion, '3.7.0-rc.1', '<') === true || - version_compare($kirbyVersion, '4.0.0-alpha', '>=') === true + version_compare($kirbyVersion, '4.0.0-rc.1', '<') === true || + version_compare($kirbyVersion, '5.0.0-alpha', '>=') === true ) ) { throw new Exception(