Merge pull request #38 from mehrwert/bugfix-37-and-cleanup

[BUGFIX] Start vendor name with capital letter
mehrwert · Feb 10, 2020 · c43e741 · c43e741
2 parents 822549c + 5eb9008
commit c43e741
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 10 deletions.
diff --git a/Classes/Backend/PmaModule.php b/Classes/Backend/PmaModule.php
@@ -1,5 +1,5 @@
 <?php
-namespace mehrwert\Phpmyadmin\Backend;
+namespace Mehrwert\Phpmyadmin\Backend;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -75,7 +75,10 @@ public function main()
         $this->MCONF = $MCONF;
 
         // Get config
-        $extensionConfiguration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['phpmyadmin']);
+        $extensionConfiguration = unserialize(
+            $GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['phpmyadmin'],
+            ['allowed_classes' => false]
+        );
 
         // IP-based Access restrictions
         $devIPmask = trim($GLOBALS['TYPO3_CONF_VARS']['SYS']['devIPmask']);

diff --git a/Classes/Controller/PhpmyadminController.php b/Classes/Controller/PhpmyadminController.php
@@ -1,5 +1,5 @@
 <?php
-namespace mehrwert\Phpmyadmin\Controller;
+namespace Mehrwert\Phpmyadmin\Controller;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -27,6 +27,6 @@ class PhpmyadminController extends ActionController
      */
     public function indexAction()
     {
-        return GeneralUtility::makeInstance(\mehrwert\Phpmyadmin\Backend\PmaModule::class);
+        return GeneralUtility::makeInstance(\Mehrwert\Phpmyadmin\Backend\PmaModule::class);
     }
 }
diff --git a/Classes/Hooks/BeUserAuthLogOffHook.php b/Classes/Hooks/BeUserAuthLogOffHook.php
@@ -1,5 +1,5 @@
 <?php
-namespace mehrwert\Phpmyadmin\Hooks;
+namespace Mehrwert\Phpmyadmin\Hooks;
 
 /*
  * This file is part of the TYPO3 CMS project.

diff --git a/Documentation/Changelog/Index.rst b/Documentation/Changelog/Index.rst
@@ -8,12 +8,17 @@ 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>`_.
 
+2020-02-10 Andreas Beutel - Version 5.6.0
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- [BUGFIX] Vendor name must begin with Capital letter - GH#37 (thanks to ashupatel1990 for reporting this)
+- [TASK] Update release notes of 5.5.0 release to include reference to PMASA-2019-5 fixed in 4.9.2
+
 2020-02-08 Andreas Beutel - Version 5.5.0
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 - [FEATURE] Updated pMA to the latest stable 4.9.x release (4.9.4)
 - [SECURITY] Includes serious vendor security fix
 - `PMASA-2020-1 <https://www.phpmyadmin.net/security/PMASA-2020-1/>`_: SQL injection in user accounts page
-
+- `PMASA-2019-5 <https://www.phpmyadmin.net/security/PMASA-2019-5/>`_: SQL injection in Designer feature
 
 2019-08-03 Andreas Beutel - Version 5.4.0
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -4,7 +4,7 @@
 
 project     = phpMyAdmin for TYPO3
 version     = 5.5
-release     = 5.5.0
+release     = 5.6.0
 t3author    = mehrwert intermediale kommunikation GmbH
 copyright   = since 2002 by the authors
 

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
   },
   "autoload": {
     "psr-4": {
-      "mehrwert\\Phpmyadmin\\": "Classes"
+      "Mehrwert\\Phpmyadmin\\": "Classes"
     }
   }
 }
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.5.0',
+    'version' => '5.6.0',
     'dependencies' => '',
     'conflicts' => '',
     'priority' => '',

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -20,5 +20,5 @@
 // Do not load post processing class if TYPO3 is in CLI mode
 if (!defined('TYPO3_cliMode') || TYPO3_cliMode !== true) {
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauth.php']['logoff_post_processing'][] =
-        'mehrwert\\Phpmyadmin\\Hooks\\BeUserAuthLogOffHook->pmaLogOff';
+        'Mehrwert\\Phpmyadmin\\Hooks\\BeUserAuthLogOffHook->pmaLogOff';
 }