[Task] Remove adminer as Database Explorer (pimcore#13921)

* Task: remove adminer * Update doc/Development_Documentation/23_Installation_and_Upgrade/03_System_Setup_and_Hosting/02_Nginx_Configuration.md Co-authored-by: Sebastian Blank <[email protected]> * Update doc/Development_Documentation/23_Installation_and_Upgrade/03_System_Setup_and_Hosting/02_Nginx_Configuration.md Co-authored-by: Sebastian Blank <[email protected]> Co-authored-by: Sebastian Blank <[email protected]>
michalananapps · Jan 3, 2023 · 4e55d6e · 4e55d6e
1 parent 006b3c0
commit 4e55d6e
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 306 deletions.
diff --git a/bundles/AdminBundle/public/js/pimcore/layout/toolbar.js b/bundles/AdminBundle/public/js/pimcore/layout/toolbar.js
@@ -442,18 +442,7 @@
                              }
                          );
                      }
-
-                     if (perspectiveCfg.inToolbar("extras.systemtools.database")) {
-                         systemItems.push(
-                             {
-                                 text: t("database_administration"),
-                                 iconCls: "pimcore_nav_icon_mysql",
-                                 itemId: 'pimcore_menu_extras_system_info_database_administration',
-                                 handler: this.showAdminer
-                             }
-                         );
-                     }
-
+
                      if (perspectiveCfg.inToolbar("extras.systemtools.fileexplorer")) {
                          systemItems.push(
                              {
@@ -1654,11 +1643,7 @@
      showSystemRequirementsCheck: function () {
          pimcore.helpers.openGenericIframeWindow("systemrequirementscheck", Routing.generate('pimcore_admin_install_check'), "pimcore_icon_systemrequirements", "System-Requirements Check");
      },
-
-     showAdminer: function () {
-         pimcore.helpers.openGenericIframeWindow("adminer", Routing.generate('pimcore_admin_external_adminer_adminer'), "pimcore_icon_mysql", "Database Admin");
-     },
-
+
      showElementHistory: function() {
          try {
              pimcore.globalmanager.get("element_history").activate();

diff --git a/bundles/AdminBundle/src/Controller/Admin/External/AdminerController.php b/bundles/AdminBundle/src/Controller/Admin/External/AdminerController.php
diff --git a/bundles/AdminBundle/src/EventListener/CsrfProtectionListener.php b/bundles/AdminBundle/src/EventListener/CsrfProtectionListener.php
@@ -72,8 +72,6 @@ public function handleRequest(RequestEvent $event)
 
             // external applications
             'pimcore_admin_external_opcache_index',
-            'pimcore_admin_external_adminer_adminer', 'pimcore_admin_external_adminer_proxy',
-            'pimcore_admin_external_adminer_proxy_1', 'pimcore_admin_external_adminer_proxy_2',
         ];
 
         $route = $request->attributes->get('_route');

diff --git a/composer.json b/composer.json
@@ -131,7 +131,6 @@
     "twig/string-extra": "^3.0.4",
     "rybakit/twig-deferred-extension": "^3.0",
     "umpirsky/country-list": "^2.0.6",
-    "vrana/adminer": "^4.8.0",
     "vrana/jush": "~2.0.2",
     "scheb/2fa-bundle": "^6.0",
     "scheb/2fa-google-authenticator": "^6.0",

diff --git a/..._Installation_and_Upgrade/03_System_Setup_and_Hosting/02_Nginx_Configuration.md b/..._Installation_and_Upgrade/03_System_Setup_and_Hosting/02_Nginx_Configuration.md
@@ -108,8 +108,8 @@ server {
     }
 
     # Some Admin Modules need this:
-    # Database Admin, Server Info
-    location ~* ^/admin/(adminer|external) {
+    # Server Info, Opcache
+    location ~* ^/admin/external {
         rewrite .* /index.php$is_args$args last;
     }
     
@@ -392,8 +392,8 @@ server {
     }
 
     # Some Admin Modules need this:
-    # Database Admin, Server Info
-    location ~* ^/admin/(adminer|external) {
+    # Server Info, Opcache
+    location ~* ^/admin/external {
         rewrite .* /index.php$is_args$args last;
     }
     

diff --git a/...evelopment_Documentation/23_Installation_and_Upgrade/09_Upgrade_Notes/README.md b/...evelopment_Documentation/23_Installation_and_Upgrade/09_Upgrade_Notes/README.md
@@ -120,7 +120,8 @@ Please make sure to set your preferred storage location ***before*** migration.
 - [Ecommerce] Elasticsearch 7 support was removed
 - [Ecommerce] Config option `es_client_params` in `index_service` was removed 
 - [ClassSavedInterface] Removed `method_exists` bc layer. Please add the corresponding `ClassSavedInterface` interface to your custom field definitions. For more details check the 10.6.0 patch notes.
-
+- [Admin] Removed `adminer` as built-in database management tool.
+
 ## 10.6.0
 - [Session] The `getHandler`, `setHandler`, `useSession`, `getSessionId`, `getSessionName`, `invalidate`, `regenerateId`, `requestHasSessionId`, `getSessionIdFromRequest`, `get`, `getReadOnly` and `writeClose` methods of `Pimcore\Tool\Session` and class `PreAuthenticatedAdminSessionFactory` are deprecated and get removed with Pimcore 11. Session Management will be handled by Symfony in Pimcore 11.
 - [AreabrickManagerInterface] The `enable`, `disable`, `isEnabled` and `getState` methods of `Pimcore\Extension\Document\Areabrick\AreabrickManagerInterface` are deprecated as maintaining state of extensions is deprecated. This impacts `\Pimcore\Document\Editable\EditableHandler::isBrickEnabled()` method which is also deprecated.

diff --git a/phpstan-parameters.neon b/phpstan-parameters.neon
@@ -13,7 +13,6 @@ parameters:
         container_xml_path: var/cache/test/App_KernelTestDebugContainer.xml
 
     excludePaths:
-        - '**/External/AdminerController.php'
         - '**/Processor/PdfReactor.php'
         - '**/PDFreactor.class.php'