diff --git a/CHANGELOG.md b/CHANGELOG.md index 49025acc..f64fd7f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.1.2] - 2023-XX-XX + +### FIXED +- compatibility-issue against other modules that also extend the moduleconfiguration + ## [1.1.1] - 2023-06-19 ### FIXED diff --git a/metadata.php b/metadata.php index 5a3f4455..5fe32d0f 100644 --- a/metadata.php +++ b/metadata.php @@ -51,7 +51,7 @@ ', ], 'thumbnail' => 'logo.svg', - 'version' => '1.1.1', + 'version' => '1.1.2-rc.1', 'author' => 'OXID eSales AG', 'url' => 'https://www.oxid-esales.com', 'email' => 'info@oxid-esales.com', diff --git a/src/Controller/Admin/AdminOrderController.php b/src/Controller/Admin/AdminOrderController.php index 3230067a..5e5e3722 100644 --- a/src/Controller/Admin/AdminOrderController.php +++ b/src/Controller/Admin/AdminOrderController.php @@ -60,7 +60,7 @@ class AdminOrderController extends AdminDetailsController * * @SuppressWarnings(PHPMD.ElseExpression) */ - public function render(): string + public function render() { parent::render(); diff --git a/src/Controller/Admin/ModuleConfiguration.php b/src/Controller/Admin/ModuleConfiguration.php index e59f8270..1a671eac 100644 --- a/src/Controller/Admin/ModuleConfiguration.php +++ b/src/Controller/Admin/ModuleConfiguration.php @@ -47,7 +47,7 @@ public function __construct() * * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function render(): string + public function render() { parent::render();