From 95b8c2976a591313b9679d6c91fc3c69527a716e Mon Sep 17 00:00:00 2001 From: Maik Schneider Date: Fri, 14 Jan 2022 15:51:33 +0100 Subject: [PATCH 1/5] feat: set compatibility to typo3 v11 in composer.json and ext_emconf.php --- composer.json | 4 ++-- ext_emconf.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 92e254d..52cc1fe 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "license": ["GPL-2.0-or-later"], "require": { - "typo3/cms-core": "~8.7.32 || ~9.5.24 || ~10.4.12" + "typo3/cms-core": "~8.7.32 || ~9.5.24 || ~10.4.12 || ~v11.5.0" }, "autoload": { "psr-4": { @@ -33,4 +33,4 @@ "extension-key": "rt_simpleosm" } } -} \ No newline at end of file +} diff --git a/ext_emconf.php b/ext_emconf.php index 13fc214..319248b 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -22,7 +22,7 @@ 'clearCacheOnLoad' => 0, 'version' => '4.1.2', 'constraints' => [ - 'depends' => [ 'typo3' => '8.7.32-10.4.99' ], + 'depends' => [ 'typo3' => '8.7.32-11.5.99' ], 'conflicts' => [], 'suggests' => [ 'tt_address' => '4.0.0-5.99.99', From e889bf664302aeddb5e13f3a6f3e097b96c97080 Mon Sep 17 00:00:00 2001 From: Maik Schneider Date: Fri, 14 Jan 2022 16:23:28 +0100 Subject: [PATCH 2/5] feat: plugin registration for typo3 v11 --- ext_localconf.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ext_localconf.php b/ext_localconf.php index 71698a7..6fe447d 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -4,15 +4,19 @@ call_user_func( function() { + // configure plugin + $typo3Version = TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionStringToArray(TYPO3\CMS\Core\Utility\VersionNumberUtility::getNumericTypo3Version()); + $controllerName = $typo3Version['version_main'] >= 10 ? \SYRADEV\RtSimpleosm\Controller\OsmController::class : 'Osm'; + $extensionName = $typo3Version['version_main'] >= 10 ? 'RtSimpleosm' : 'SYRADEV.RtSimpleosm'; \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( - 'SYRADEV.RtSimpleosm', + $extensionName, 'Sosm', [ - 'Osm' => 'displayMap' + $controllerName => 'displayMap' ], // non-cacheable actions [ - 'Osm' => '' + $controllerName => '' ] ); From 485e0245dda5e4102539bd20c51c945a69bd0350 Mon Sep 17 00:00:00 2001 From: Maik Schneider Date: Fri, 14 Jan 2022 16:27:18 +0100 Subject: [PATCH 3/5] chore: raise extension version to 4.1.3 --- ext_emconf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext_emconf.php b/ext_emconf.php index 319248b..4a6df47 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -20,7 +20,7 @@ 'uploadfolder' => 0, 'createDirs' => '', 'clearCacheOnLoad' => 0, - 'version' => '4.1.2', + 'version' => '4.1.3', 'constraints' => [ 'depends' => [ 'typo3' => '8.7.32-11.5.99' ], 'conflicts' => [], From a355bbf180b3941b6e482ef8c491c5a3d9be404e Mon Sep 17 00:00:00 2001 From: Maik Schneider Date: Fri, 14 Jan 2022 16:29:03 +0100 Subject: [PATCH 4/5] feat: update documentation --- Documentation/ChangeLog/Index.rst | 6 +++++- Documentation/Settings.cfg | 4 ++-- Documentation/Settings.yml | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst index 6227b3c..cde4b1b 100644 --- a/Documentation/ChangeLog/Index.rst +++ b/Documentation/ChangeLog/Index.rst @@ -11,6 +11,10 @@ ChangeLog ========= +2022-01-14 : Upload of version 4.1.3 + + - Added Compatibility for TYPO3 V11 LTS. + 2020-12-29 : Upload of version 4.1.2 - Added Compatibility for TYPO3 V10 LTS. @@ -71,4 +75,4 @@ ChangeLog 2019-03-16 : First upload of version 1.0.0. - - Supports TYPO3 V7, V8 and V9. \ No newline at end of file + - Supports TYPO3 V7, V8 and V9. diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg index 5161d28..c3354d8 100644 --- a/Documentation/Settings.cfg +++ b/Documentation/Settings.cfg @@ -20,7 +20,7 @@ project = rt_simpleosm # ... Set during rendering based on rendered version # ................................................................................. -release = 4.1.2 +release = 4.1.3 # ................................................................................. # ... (recommended) displayed in footer @@ -110,4 +110,4 @@ t3core = https://docs.typo3.org/c/typo3/cms-core/master/en-us/ # ... :issue:`number` # ................................................................................. -issue = https://github.com/Treedent/rt_pages_tree_icons/issues/%s | Issue # \ No newline at end of file +issue = https://github.com/Treedent/rt_pages_tree_icons/issues/%s | Issue # diff --git a/Documentation/Settings.yml b/Documentation/Settings.yml index 9cc43e8..013ffc7 100644 --- a/Documentation/Settings.yml +++ b/Documentation/Settings.yml @@ -11,7 +11,7 @@ conf.py: copyright: 2021 project: Simple OpenStreetMap version: 4.1 - release: 4.1.2 + release: 4.1.3 intersphinx_mapping: t3tsref: - http://docs.typo3.org/typo3cms/TyposcriptReference/ From 8f0f3006ffaa96a8b3169974ffbae6abf4bee5ad Mon Sep 17 00:00:00 2001 From: Maik Schneider Date: Fri, 14 Jan 2022 16:33:10 +0100 Subject: [PATCH 5/5] fix: reverse auto formatting of lines of no interest --- Documentation/ChangeLog/Index.rst | 2 +- Documentation/Settings.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst index cde4b1b..eb6e25d 100644 --- a/Documentation/ChangeLog/Index.rst +++ b/Documentation/ChangeLog/Index.rst @@ -75,4 +75,4 @@ ChangeLog 2019-03-16 : First upload of version 1.0.0. - - Supports TYPO3 V7, V8 and V9. + - Supports TYPO3 V7, V8 and V9. \ No newline at end of file diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg index c3354d8..3199267 100644 --- a/Documentation/Settings.cfg +++ b/Documentation/Settings.cfg @@ -110,4 +110,4 @@ t3core = https://docs.typo3.org/c/typo3/cms-core/master/en-us/ # ... :issue:`number` # ................................................................................. -issue = https://github.com/Treedent/rt_pages_tree_icons/issues/%s | Issue # +issue = https://github.com/Treedent/rt_pages_tree_icons/issues/%s | Issue # \ No newline at end of file