Adapt admin bundle refactoring (#454)

* Adapt admin bundle refactorings - related to pimcore/pimcore#14971

* Apply php-cs-fixer changes

* remove unavailable config

* add conflict

* [Action] register admin bundle

* add conflict for admin bundle beta

* add beta conflict for other dependencies

---------

Co-authored-by: dvesh3 <[email protected]>

Author: dvesh3

.github/ci/files/config/bundles.php

@@ -3,4 +3,5 @@
 return [
     Pimcore\Bundle\EcommerceFrameworkBundle\PimcoreEcommerceFrameworkBundle::class => ['all' => false],
     CustomerManagementFrameworkBundle\PimcoreCustomerManagementFrameworkBundle::class => ['all' => true],
+    Pimcore\Bundle\AdminBundle\PimcoreAdminBundle::class => ['all' => true],
 ];

.github/ci/files/config/packages/security.yaml

@@ -3,47 +3,21 @@ security:
 
     providers:
         pimcore_admin:
-            id: Pimcore\Bundle\AdminBundle\Security\User\UserProvider
+            id: Pimcore\Security\User\UserProvider
 
     firewalls:
         dev:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
 
         # Pimcore WebDAV HTTP basic // DO NOT CHANGE!
-        pimcore_admin_webdav:
-            pattern: ^/admin/asset/webdav
+        pimcore_webdav:
+            pattern: ^/asset/webdav
             provider: pimcore_admin
             http_basic: ~
 
-        # Pimcore admin form login // DO NOT CHANGE!
-        pimcore_admin:
-            pattern: ^/admin(/.*)?$
-            user_checker: Pimcore\Bundle\AdminBundle\Security\User\UserChecker
-            provider: pimcore_admin
-            login_throttling:
-                max_attempts: 3
-                interval: '5 minutes'
-            logout:
-                path: pimcore_admin_logout
-                target: pimcore_admin_login
-            form_login:
-                default_target_path: pimcore_admin_index
-                always_use_default_target_path: true
-                login_path: pimcore_admin_login
-                check_path: pimcore_admin_login_check
-                username_parameter: username
-                password_parameter: password
-            custom_authenticators:
-                - Pimcore\Bundle\AdminBundle\Security\Authenticator\AdminTokenAuthenticator
-            two_factor:
-                auth_form_path: /admin/login/2fa                   # Path or route name of the two-factor form
-                check_path: /admin/login/2fa-verify                # Path or route name of the two-factor code check
-                default_target_path: /admin            # Where to redirect by default after successful authentication
-                always_use_default_target_path: false  # If it should always redirect to default_target_path
-                auth_code_parameter_name: _auth_code   # Name of the parameter for the two-factor authentication code
-                trusted_parameter_name: _trusted       # Name of the parameter for the trusted device option
-                multi_factor: false                    # If ALL active two-factor methods need to be fulfilled (multi-factor authentication)
+        # Pimcore Admin Bundle firewall
+        pimcore_admin: '%pimcore_admin_bundle.firewall_settings%'
 
     access_control:
         # Pimcore admin ACl  // DO NOT CHANGE!
@@ -54,6 +28,7 @@ security:
         - { path: ^/admin/login$, roles: PUBLIC_ACCESS }
         - { path: ^/admin/login/(login|lostpassword|deeplink|csrf-token)$, roles: PUBLIC_ACCESS }
         - { path: ^/admin, roles: ROLE_PIMCORE_USER }
+        - { path: ^/asset/webdav, roles: ROLE_PIMCORE_USER }
 
     role_hierarchy:
         # Pimcore admin  // DO NOT CHANGE!

.github/ci/files/config/system.yml

@@ -29,8 +29,6 @@ pimcore:
             steps: 10
         icc_rgb_profile: ''
         icc_cmyk_profile: ''
-        hide_edit_image: false
-        disable_tree_preview: false
     full_page_cache:
         enabled: false
         lifetime: null

composer.json

@@ -29,6 +29,7 @@
     "pimcore/admin-ui-classic-bundle": "^1.0",
     "pimcore/object-merger": "^4.0",
     "pimcore/pimcore": "^11.0",
+    "pimcore/admin-ui-classic-bundle": "^1.0",
     "pimcore/search-query-parser": "^1.3",
     "pimcore/personalization-bundle": "^1.0",
     "symfony/asset": "^6.2",
@@ -45,6 +46,12 @@
     "symfony/security-http": "^6.2",
     "symfony/stopwatch": "^6.2"
   },
+  "conflict": {
+    "pimcore/pimcore": "v11.0.0-ALPHA1 || v11.0.0-ALPHA2 || v11.0.0-ALPHA3 || v11.0.0-ALPHA4 || v11.0.0-ALPHA5 || v11.0.0-ALPHA6 || v11.0.0-ALPHA7 || v11.0.0-ALPHA8 || v11.0.0-BETA1",
+    "pimcore/admin-ui-classic-bundle": "v1.0.0-BETA1",
+    "pimcore/personalization-bundle": "v1.0.0-BETA1",
+    "pimcore/newsletter-bundle": "v1.0.0-BETA1"
+  },
   "require-dev": {
     "phpunit/phpunit": "^9.5",
     "codeception/codeception": "^5.0.3",

src/Controller/Admin.php

@@ -18,13 +18,16 @@
 use CustomerManagementFrameworkBundle\Helper\JsConfigService;
 use Knp\Component\Pager\Pagination\PaginationInterface;
 use Knp\Component\Pager\PaginatorInterface;
-use Pimcore\Bundle\AdminBundle\Controller\AdminController;
 use Pimcore\Controller\KernelControllerEventInterface;
+use Pimcore\Controller\Traits\JsonHelperTrait;
+use Pimcore\Controller\UserAwareController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\ControllerEvent;
 
-class Admin extends AdminController implements KernelControllerEventInterface
+class Admin extends UserAwareController implements KernelControllerEventInterface
 {
+    use JsonHelperTrait;
+
     /**
      * @var JsConfigService
      */
@@ -70,7 +73,7 @@ protected function initJsConfig()
     /**
      * @return JsConfigService
      */
-    protected function getJsConfigService()
+    protected function getJsConfigService(): JsConfigService
     {
         return $this->jsConfigService;
     }
@@ -80,7 +83,7 @@ protected function getJsConfigService()
      *
      * @return array
      */
-    protected function getJsConfigFeatures()
+    protected function getJsConfigFeatures(): array
     {
         return [
             '_init',
@@ -101,23 +104,16 @@ protected function getJsConfigFeatures()
 
     /**
      * Build object paginator for filtered list
-     *
-     * @param Request $request
-     * @param mixed $data
-     * @param int $defaultPageSize
-     *
-     * @return PaginationInterface
      */
-    protected function buildPaginator(Request $request, $data, $defaultPageSize = null)
+    protected function buildPaginator(Request $request, mixed $data, int $defaultPageSize = null): PaginationInterface
     {
         if (is_null($defaultPageSize)) {
             $defaultPageSize = $this->defaultPageSize;
         }
 
         $page = (int)$request->get('page', 1);
         $pageSize = (int)$request->get('perPage', $defaultPageSize);
-        $paginator = $this->paginator->paginate($data, $page, $pageSize);
 
-        return $paginator;
+        return $this->paginator->paginate($data, $page, $pageSize);
     }
 }

src/Controller/Admin/ActivitiesController.php

@@ -19,14 +19,16 @@
 use CustomerManagementFrameworkBundle\CustomerProvider\CustomerProviderInterface;
 use Knp\Component\Pager\PaginatorInterface;
 use Pimcore\Controller\KernelControllerEventInterface;
+use Pimcore\Controller\UserAwareController;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * @Route("/activities")
  */
-class ActivitiesController extends \Pimcore\Bundle\AdminBundle\Controller\AdminController implements KernelControllerEventInterface
+class ActivitiesController extends UserAwareController implements KernelControllerEventInterface
 {
     /**
      * @var PaginatorInterface
@@ -44,10 +46,9 @@ public function onKernelControllerEvent(ControllerEvent $event): void
     }
 
     /**
-     * @param Request $request
      * @Route("/list")
      */
-    public function listAction(Request $request, CustomerProviderInterface $customerProvider)
+    public function listAction(Request $request, CustomerProviderInterface $customerProvider): Response
     {
         if ($customer = $customerProvider->getById($request->get('customerId'))) {
             $list = \Pimcore::getContainer()->get('cmf.activity_store')->getActivityList();
@@ -88,10 +89,9 @@ public function listAction(Request $request, CustomerProviderInterface $customer
     }
 
     /**
-     * @param Request $request
      * @Route("/detail")
      */
-    public function detailAction(Request $request)
+    public function detailAction(Request $request): Response
     {
         $activity = \Pimcore::getContainer()->get('cmf.activity_store')->getEntryById($request->get('activityId'));