[FEATURE] Mark pMA compatible with TYPO3 10.x

mehrwert · Aug 3, 2019 · 3a13ab0 · 3a13ab0
1 parent e5f408d
commit 3a13ab0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/Classes/Backend/PmaModule.php b/Classes/Backend/PmaModule.php
@@ -17,6 +17,8 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\HttpUtility;
+use TYPO3\CMS\Core\Utility\PathUtility;
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 
 /**
  * Utilities for the phpMyAdmin third party database administration Tool
@@ -111,8 +113,11 @@ public function main()
         @set_include_path($this->MCONF['PMA_absolute_path'] . PATH_SEPARATOR . get_include_path());
 
         // Path to web dir
-        $this->MCONF['PMA_relative_path'] = ExtensionManagementUtility::siteRelPath('phpmyadmin') . $this->MCONF['PMA_subdir'];
-
+        if (VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 9000000) {
+            $this->MCONF['PMA_relative_path'] = PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('phpmyadmin')) . $this->MCONF['PMA_subdir'];
+        } else {
+            $this->MCONF['PMA_relative_path'] = ExtensionManagementUtility::siteRelPath('phpmyadmin') . $this->MCONF['PMA_subdir'];
+        }
         // If phpMyAdmin is configured in the conf.php script, we continue to load it...
         if ($this->MCONF['PMA_absolute_path'] && @is_dir($this->MCONF['PMA_absolute_path'])) {
 

diff --git a/Documentation/Changelog/Index.rst b/Documentation/Changelog/Index.rst
@@ -8,6 +8,10 @@ Change Log
 
 The following is an overview of the changes in this extension. For more details `read the online log <https://github.com/mehrwert/TYPO3-phpMyAdmin>`_.
 
+2019-08-03 Andreas Beutel - Version 5.4.0
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- [FEATURE] Mark pMA compatible with TYPO3 10.x
+
 2019-06-09 Andreas Beutel - Version 5.3.0
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 - [CHANGE] Rename js/vendor/ to js/pma-vendor

diff --git a/Documentation/Index.rst b/Documentation/Index.rst
@@ -11,7 +11,7 @@ phpMyAdmin Extension for TYPO3
       2002-11-01
 
 :Changed:
-      2019-06-09
+      2019-08-03
 
 :Changed by:
       Andreas Beutel

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
   ],
   "license": ["GPL-2.0-or-later"],
   "require": {
-    "typo3/cms-core": ">=8.7.0,<10.0"
+    "typo3/cms-core": ">=8.7.0,<11.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -5,7 +5,7 @@
     'description' => 'Third party \'phpMyAdmin\' administration module. Access to admin-users only.',
     'category' => 'module',
     'shy' => 0,
-    'version' => '5.3.0',
+    'version' => '5.4.0',
     'dependencies' => '',
     'conflicts' => '',
     'priority' => '',
@@ -25,8 +25,8 @@
     'CGLcompliance_note' => '',
     'constraints' => [
         'depends' => [
-            'php' => '7.0.0-7.2.99',
-            'typo3' => '8.7.0-9.5.99'
+            'php' => '7.0.0-7.3.99',
+            'typo3' => '8.7.0-10.99.99'
         ]
     ]
 ];