Skip to content

Commit

Permalink
Merge pull request #189 from OXID-eSales/UNZER-227_Compatibility-Issue
Browse files Browse the repository at this point in the history
remove "correct" returnTypes of Methods that are extended from core
  • Loading branch information
HonkDerHase authored Aug 7, 2023
2 parents 1ccb08f + 6d3bc59 commit db728e1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</ul>',
],
'thumbnail' => 'logo.svg',
'version' => '1.1.1',
'version' => '1.1.2-rc.1',
'author' => 'OXID eSales AG',
'url' => 'https://www.oxid-esales.com',
'email' => '[email protected]',
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/Admin/AdminOrderController.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class AdminOrderController extends AdminDetailsController
*
* @SuppressWarnings(PHPMD.ElseExpression)
*/
public function render(): string
public function render()
{
parent::render();

Expand Down
2 changes: 1 addition & 1 deletion src/Controller/Admin/ModuleConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function __construct()
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function render(): string
public function render()
{
parent::render();

Expand Down

0 comments on commit db728e1

Please sign in to comment.