Merge pull request #86 from mschwemer/v11_compat

Provide V11 Compatibility Ok. Thank you @mschwemer for your contribution. I'll merge this and will make the release asap.
bobosch · May 31, 2022 · 136006f · 136006f
2 parents 3b2f056 + ac04cb3
commit 136006f
Show file tree

Hide file tree

Showing 19 changed files with 117 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,21 @@
 .vscode
 Documentation-GENERATED-temp
+
+.Build
+.idea
+nbproject
+.DS_Store
+.DS_Store?
+
+composer.lock
+package-lock.json
+
+/.php_cs
+/.php_cs.cache
+
+.ddev/**
+.project/**
+
+/var
+/config
+
diff --git a/Classes/Controller/PluginController.php b/Classes/Controller/PluginController.php
@@ -236,6 +236,7 @@ private function extractGroup($record_ids)
 
         // if no markers are set, select current page to find records on it
         if (count($record_ids) == 0) {
+            //@extensionScannerIgnoreLine
             $record_ids['pages'] = array($GLOBALS['TSFE']->id);
         }
 

diff --git a/Classes/Div.php b/Classes/Div.php
@@ -17,6 +17,7 @@
 
 class Div
 {
+    const RESOURCE_BASE_PATH = 'EXT:ods_osm/Resources/Public/';
 
     public static function getConstraintsForQueryBuilder($table, ContentObjectRenderer $cObj,
         \TYPO3\CMS\Core\Database\Query\QueryBuilder $queryBuilder) : array

diff --git a/Classes/Provider/Leaflet.php b/Classes/Provider/Leaflet.php
@@ -2,6 +2,7 @@
 
 namespace Bobosch\OdsOsm\Provider;
 
+use Bobosch\OdsOsm\Div;
 use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Resource\FileRepository;
@@ -22,7 +23,11 @@ class Leaflet extends BaseProvider
 
     public function getMapCore($backpath = '')
     {
-        $this->path_res = ($backpath ? $backpath : $GLOBALS['TSFE']->absRefPrefix) . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('ods_osm')) . 'Resources/Public/JavaScript/Leaflet/';
+        $this->path_res = ($backpath ? $backpath :
+            PathUtility::getAbsoluteWebPath(
+                GeneralUtility::getFileAbsFileName(Div::RESOURCE_BASE_PATH . 'JavaScript/Leaflet/')
+            )
+        );
         $this->path_leaflet = ($this->config['local_js'] ? $this->path_res . 'Core/' : 'https://unpkg.com/[email protected]/dist/');
         $pageRenderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(PageRenderer::class);
         $pageRenderer->addCssFile($this->path_leaflet . 'leaflet.css');
@@ -165,7 +170,9 @@ protected function getMarker($item, $table)
                     break;
                 }
 
-                $path = $GLOBALS['TSFE']->absRefPrefix . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('ods_osm')) . 'Resources/Public/JavaScript/Leaflet/';
+                $path = PathUtility::getAbsoluteWebPath(
+                    GeneralUtility::getFileAbsFileName(Div::RESOURCE_BASE_PATH . 'JavaScript/Leaflet/')
+                );
                 // Add tracks to layerswitcher
                 $this->layers[1][$item['title']] = $jsElementVar;
 
@@ -175,7 +182,7 @@ protected function getMarker($item, $table)
                         $this->scripts['leaflet-plugins'] = ['src' => $path . 'leaflet-plugins/layer/vector/KML.js'];
 
                         $jsMarker .= 'var ' . $jsElementVar . ' = new L.KML(';
-                        $jsMarker .= '"/' . $file->getPublicUrl() . '"';
+                        $jsMarker .= '"' . $file->getPublicUrl() . '"';
                         $jsMarker .= ");\n";
                         break;
                     case 'gpx':
@@ -192,7 +199,8 @@ protected function getMarker($item, $table)
                                 'shadowUrl' => $path . 'leaflet-gpx/pin-shadow.png',
                             ),
                         );
-                        $jsMarker .= 'var ' . $jsElementVar . ' = new L.GPX("/' . $file->getPublicUrl() . '",';
+                        $jsMarker .= 'var ' . $jsElementVar . ' = new L.GPX("' . $file->getPublicUrl() . '",';
+
                         $jsMarker .= json_encode($options) . ");\n";
                         $jsMarker .= $this->config['id'] . '.addLayer(' . $jsElementVar . ');' . "\n";
                         break;
@@ -258,7 +266,7 @@ protected function getMarker($item, $table)
                         $markerOptions['icon'] = 'icon: new L.Icon(' . json_encode($iconOptions) . ')';
                     }
                 } else {
-                    $icon = $GLOBALS['TSFE']->absRefPrefix . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('ods_osm')) . 'Resources/Public/JavaScript/Leaflet/Core/images/marker-icon.png';
+                    $icon = $this->path_leaflet . 'Core/images/marker-icon.png';
                 }
                 $jsMarker .= 'var ' . $jsElementVar . ' = new L.Marker([' . $item['latitude'] . ', ' . $item['longitude'] . '], {' . implode(',', $markerOptions) . "});\n";
                 // Add group to layer switch

diff --git a/Classes/Provider/Openlayers.php b/Classes/Provider/Openlayers.php
@@ -16,7 +16,7 @@ class Openlayers extends BaseProvider
 
     public function getMapCore($backpath = '')
     {
-        $path = ($backpath ? $backpath : $GLOBALS['TSFE']->absRefPrefix) . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('ods_osm')) . 'Resources/Public/';
+        $path = ($backpath ? $backpath : Div::RESOURCE_BASE_PATH);
         if ($this->config['local_js']) {
             $this->scripts['Openlayers'] = ['src' => $path . 'OpenLayers/OpenLayers.js'];
         } else {
@@ -145,7 +145,7 @@ protected function getMarker($item, $table)
                 } else {
                     break;
                 }
-                $jsMarker .= "mapGpx(" . $this->config['id'] . ",'/" .  $file->getPublicUrl() . "','" . $item['title'] . "','" . $item['color'] . "'," . $item['width'] . ");\n";
+                $jsMarker .= "mapGpx(" . $this->config['id'] . ",'" .  $file->getPublicUrl() . "','" . $item['title'] . "','" . $item['color'] . "'," . $item['width'] . ");\n";
                 break;
             case 'tx_odsosm_vector':
                 $fileRepository = GeneralUtility::makeInstance(FileRepository::class);
@@ -164,17 +164,16 @@ protected function getMarker($item, $table)
                     $marker = $item['tx_odsosm_marker'];
                 } else {
                     $marker = array(
-                        'icon' => PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('ods_osm')) . 'Resources/Public/OpenLayers/img/marker.png',
+                        'icon' => PathUtility::getAbsoluteWebPath(
+                            GeneralUtility::getFileAbsFileName(Div::RESOURCE_BASE_PATH . 'OpenLayers/img/marker.png')
+                        ),
                         'type' => 'image',
                         'size_x' => 21,
                         'size_y' => 25,
                         'offset_x' => -11,
                         'offset_y' => -25
                     );
                 }
-                if ($marker['type'] != 'html') {
-                    $marker['icon'] = $GLOBALS['TSFE']->absRefPrefix . $marker['icon'];
-                }
 
                 // Add group to layer switch
                 if (!in_array($item['group_title'], $this->group_titles)) {

diff --git a/Classes/Provider/Openlayers3.php b/Classes/Provider/Openlayers3.php
@@ -2,7 +2,9 @@
 
 namespace Bobosch\OdsOsm\Provider;
 
+use Bobosch\OdsOsm\Div;
 use TYPO3\CMS\Core\Page\PageRenderer;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
@@ -12,7 +14,11 @@ class Openlayers3 extends BaseProvider
 
     public function getMapCore($backpath = '')
     {
-        $path = ($backpath ? $backpath : $GLOBALS['TSFE']->absRefPrefix) . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('ods_osm')) . 'Resources/Public/';
+        $path = ($backpath ? $backpath :
+            PathUtility::getAbsoluteWebPath(
+                GeneralUtility::getFileAbsFileName(Div::RESOURCE_BASE_PATH)
+            )
+        );
         $path = ($this->config['local_js'] ? $path . 'OpenLayers3/' : 'https://cdnjs.cloudflare.com/ajax/libs/openlayers/3.20.1/');
         $pageRenderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(PageRenderer::class);
         $pageRenderer->addCssFile($path . 'ol.css');

diff --git a/Classes/Wizard/CoordinatepickerWizard.php b/Classes/Wizard/CoordinatepickerWizard.php
@@ -45,6 +45,7 @@ public function render(): array
         $nameLatitude = str_replace('lon', 'lat', $nameLongitude);
         $nameLatitudeActive = str_replace('data', 'control[active]', $nameLatitude);
         $geoCodeUrl = '';
+        $geoCodeUrlShort = '';
 
         if (empty((float)$lat) || empty((float)$lon)) {
             // remove all after first slash in address (top, floor ...)

diff --git a/Configuration/Icons.php b/Configuration/Icons.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider;
+
+$iconPath = 'EXT:ods_osm/Resources/Public/Icons/';
+return [
+    'coordinate-picker-wizard' => [
+        'provider' => BitmapIconProvider::class,
+        'source' => $iconPath . 'ce_wiz.png',
+    ],
+    'vectordraw-wizard' => [
+        'provider' => BitmapIconProvider::class,
+        'source' => $iconPath . 'vector.png',
+    ],
+    'ods_osm' => [
+        'provider' => BitmapIconProvider::class,
+        'source' => $iconPath . 'osm.png',
+    ],
+];
diff --git a/Configuration/TCA/Overrides/fe_groups.php b/Configuration/TCA/Overrides/fe_groups.php
@@ -1,5 +1,6 @@
 <?php
-if (!defined('TYPO3_MODE')) die('Access denied.');
+
+defined('TYPO3') || die();
 
 /* --------------------------------------------------
 	Extend existing tables

diff --git a/Configuration/TCA/Overrides/fe_users.php b/Configuration/TCA/Overrides/fe_users.php
@@ -1,5 +1,6 @@
 <?php
-if (!defined('TYPO3_MODE')) die('Access denied.');
+
+defined('TYPO3') || die();
 
 $tempColumns = array(
     'tx_odsosm_lon' => array( // DECIMAL(9,6)

diff --git a/Configuration/TCA/Overrides/sys_category.php b/Configuration/TCA/Overrides/sys_category.php
@@ -1,5 +1,6 @@
 <?php
-if (!defined('TYPO3_MODE')) die('Access denied.');
+
+defined('TYPO3') || die();
 
 /* --------------------------------------------------
 	Extend existing tables

diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php
@@ -1,5 +1,6 @@
 <?php
-defined('TYPO3_MODE') or die();
+
+defined('TYPO3') || die();
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
     'ods_osm',

diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -1,8 +1,6 @@
 <?php
 
-if ( ! defined( 'TYPO3_MODE' ) ) {
-	die( 'Access denied.' );
-}
+defined('TYPO3') || die();
 
 /* --------------------------------------------------
 	Plugin

diff --git a/Documentation/Index.rst b/Documentation/Index.rst
@@ -22,3 +22,4 @@ EXT: OpenStreetMap
    Editors/Index
    Administrators/Index
    Tutorial/Index
+   Conribution/Index
diff --git a/ext_icon.gif → Resources/Public/Icons/Extension.gif b/ext_icon.gif → Resources/Public/Icons/Extension.gif
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
   ],
   "license": "GPL-2.0-or-later",
   "require": {
-    "typo3/cms-core": "~9.5.26|~10.4.14",
+    "typo3/cms-core": "^10.4 || ^11.5",
     "phayes/geophp": "^1.2"
   },
   "suggest": {
@@ -38,7 +38,32 @@
   },
   "extra": {
     "typo3/cms": {
-      "extension-key": "ods_osm"
+      "extension-key": "ods_osm",
+      "web-dir": ".Build/public"
+    }
+  },
+  "require-dev": {
+    "friendsoftypo3/tt-address": "^6.0",
+    "helhum/typo3-console": "^7.0",
+    "typo3/cms-backend": "^11.5.6",
+    "typo3/cms-extbase": "^11.5.6",
+    "typo3/cms-extensionmanager": "^11.5.6",
+    "typo3/cms-filelist": "^11.5.6",
+    "typo3/cms-fluid": "dev-master",
+    "typo3/cms-fluid-styled-content": "^11.5.6",
+    "typo3/cms-frontend": "^11.5.6",
+    "typo3/cms-install": "^11.5.6",
+    "typo3/cms-recordlist": "^11.5.6",
+    "typo3/cms-setup": "^11.5.6",
+    "typo3/cms-tstemplate": "^11.5.6",
+    "typo3/cms-lowlevel": "^11.5.6"
+  },
+  "config": {
+    "vendor-dir": ".Build/vendor",
+    "bin-dir": ".Build/bin",
+    "allow-plugins": {
+      "typo3/cms-composer-installers": true,
+      "typo3/class-alias-loader": true
     }
   }
 }
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -7,13 +7,13 @@
     'category' => 'plugin',
     'constraints' => [
         'depends' => [
-            'typo3' => '9.5.0-10.4.99',
+            'typo3' => '10.4.0-11.5.99',
         ],
         'conflicts' => [],
         'suggests' =>  [],
     ],
     'createDirs' => 'uploads/tx_odsosm/map',
     'state' => 'stable',
     'uploadfolder' => 1,
-    'version' => '3.2.0',
+    'version' => '4.0.0-dev',
 ];
diff --git a/ext_localconf.php b/ext_localconf.php
@@ -11,8 +11,8 @@
 );
 
 if (TYPO3_MODE === 'BE') {
-
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
+        '
     mod.wizards.newContentElement.wizardItems.plugins.elements.odsosm {
         iconIdentifier = ods_osm_wizard
         title = LLL:EXT:ods_osm/Resources/Private/Language/locallang.xlf:pi1_title
@@ -24,11 +24,14 @@
     }
 
     mod.wizards.newContentElement.wizardItems.plugins.show := addToList(odsosm)
-    ');
+    '
+    );
 
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig(
+        '
         options.saveDocNew.tx_odsosm_track=1
-    ');
+    '
+    );
 
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = \Bobosch\OdsOsm\TceMain::class;
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tce']['formevals'][\Bobosch\OdsOsm\Evaluation\LonLat::class] = '';
@@ -63,6 +66,5 @@
     }
 
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['odsOsmFileLocationUpdater']
-            = \Bobosch\OdsOsm\Updates\FileLocationUpdater::class;
-
+        = \Bobosch\OdsOsm\Updates\FileLocationUpdater::class;
 }
diff --git a/ext_tables.php b/ext_tables.php
@@ -1,8 +1,6 @@
 <?php
 
-if ( ! defined( 'TYPO3_MODE' ) ) {
-	die( 'Access denied.' );
-}
+defined('TYPO3') || die();
 
 /* --------------------------------------------------
 	New tables