Pimcore 11 Support

.github/workflows/codeception.yml

@@ -40,9 +40,9 @@ jobs:
             matrix:
                 php: [ 8.2 ]
                 symfony: [ ^6.2 ]
-                pimcore: [ 11.0.8 ]
+                pimcore: [ ~11.0.0 ]
                 include:
-                    -   pimcore: 11.0.8
+                    -   pimcore: ~11.0.0
                         template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2

.github/workflows/ecs.yml

@@ -39,9 +39,9 @@ jobs:
             matrix:
                 php: [ 8.2 ]
                 symfony: [ ^6.2 ]
-                pimcore: [ 11.0.8 ]
+                pimcore: [ ~11.0.0 ]
                 include:
-                    -   pimcore: 11.0.8
+                    -   pimcore: ~11.0.0
                         template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2

.github/workflows/php-stan.yml

@@ -39,9 +39,9 @@ jobs:
             matrix:
                 php: [ 8.2 ]
                 symfony: [ ^6.2 ]
-                pimcore: [ 11.0.8 ]
+                pimcore: [ ~11.0.0 ]
                 include:
-                    -   pimcore: 11.0.8
+                    -   pimcore: ~11.0.0
                         template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2

README.md

@@ -11,9 +11,10 @@ Add frontend user authentication and document restriction to pimcore.
 
 | Release | Supported Pimcore Versions        | Supported Symfony Versions | Release Date | Maintained     | Branch   |
 |---------|-----------------------------------|----------------------------|--------------|----------------|----------|
-| **4.x** | `10.5 - 10.6`                     | `5.4`                      | 22.11.2021   | Feature Branch | master   |
-| **3.x** | `6.0` - `6.8`                     | `3.4`, `^4.4`              | 21.07.2019   | Feature Branch | 3.x      |
-| **2.5** | `5.4`, `5.5`, `5.6`, `5.7`, `5.8` | `3.4`                      | 18.07.2019   | Bugfix only    | 2.5      |
+| **5.x** | `11.0`                            | `6.2`                      | --           | Feature Branch | master   |
+| **4.x** | `10.5 - 10.6`                     | `5.4`                      | 22.11.2021   | Unsupported    | 4.x      |
+| **3.x** | `6.0` - `6.8`                     | `3.4`, `^4.4`              | 21.07.2019   | Unsupported    | 3.x      |
+| **2.5** | `5.4`, `5.5`, `5.6`, `5.7`, `5.8` | `3.4`                      | 18.07.2019   | Unsupported    | 2.5      |
 | **1.5** | `4.0`                             | --                         | 07.07.2017   | Unsupported    | pimcore4 |
 
 ## Features
@@ -31,11 +32,17 @@ Please read the installation instructions before going deep with Members!
 
 ```json
 "require" : {
-    "dachcom-digital/members" : "~4.1.0"
+    "dachcom-digital/members" : "~5.0.0"
 }
 ```
 
-- Execute: `$ bin/console pimcore:bundle:enable MembersBundle`
+Add Bundle to `bundles.php`:
+```php
+return [
+    MembersBundle\MembersBundle::class => ['all' => true],
+];
+```
+
 - Execute: `$ bin/console pimcore:bundle:install MembersBundle`
 
 ## Upgrading
@@ -50,13 +57,9 @@ bin/console members:install:class
 
 ### Security Installation
 It is not possible to merge security configurations from multiple locations, including bundles. Instead, you have to move them to
-one single config file, e.g. `config/packages/security.yaml`. Please adopt [security_auth_manager.yaml](./src/MembersBundle/Resources/config/packages/security_auth_manager.yaml)
+one single config file, e.g. `config/packages/security.yaml`. Please adopt [security_auth_manager.yaml](./config/packages/security_auth_manager.yaml)
 and merge your own firewall configuration into one single file.
 
-#### Legacy Security Configuration
-⚠️ If you still want to use the legacy authenticator, adopt [security_legacy.yaml](./src/MembersBundle/Resources/config/packages/security_legacy.yaml)
-Keep in mind, that this configuration will be removed in Members 5.0.
-
 ### Route Installation
 MembersBundle does not include any routes per default. Otherwise, it would be hard for you to change or override included routes. 
 

UPGRADE.md

@@ -7,6 +7,10 @@
 - [ROUTE] Route include changed from `@MembersBundle/Resources/pimcore/routing/all.yml` to `@MembersBundle/config/pimcore/routing/all.yaml`
 - All template folder are lowercase/underscore now (`templates/change_password`, `templates/delete_account`)
 
+### Deprecations
+- Constant `MembersBundle\Security\RestrictionUri::PROTECTED_ASSET_FOLDER` has been removed
+- Constant `MembersBundle\Security\RestrictionUri::MEMBERS_REQUEST_URL` has been removed
+
 ***
 
 Members 4.x Upgrade Notes: https://github.com/dachcom-digital/pimcore-members/blob/4.x/UPGRADE.md

composer.json

@@ -42,6 +42,9 @@
         "phpstan/phpstan-symfony": "^1.0",
         "symplify/easy-coding-standard": "^9.0"
     },
+    "conflict": {
+        "league/csv": "9.11.0"
+    },
     "suggest": {
         "knpuniversity/oauth2-client-bundle": "^2.0"
     }

config/packages/security_auth_manager.yaml

@@ -1,7 +1,5 @@
 security:
 
-    enable_authenticator_manager: true
-
     # symfony default is set to "true".
     # you may want to keep it "true" but keep in mind that this hide meaningful exceptions like "acount is disabled"
     # instead the BadCredentialsException will be thrown

src/Command/OAuthSetupCommand.php

@@ -20,14 +20,11 @@ class OAuthSetupCommand extends Command
     protected static $defaultName = 'members:oauth:setup';
     protected static $defaultDescription = 'This command helps you the enhance Members with oauth2 connectors.';
 
-    protected bool $oauthEnabled;
     protected ClassManagerInterface $classManager;
     protected ClassInstaller $classInstaller;
 
-    public function __construct(bool $oauthEnabled)
+    public function __construct(protected bool $oauthEnabled)
     {
-        $this->oauthEnabled = $oauthEnabled;
-
         parent::__construct();
     }
 

src/Controller/Admin/RestrictionController.php

@@ -15,18 +15,11 @@
 
 class RestrictionController extends AdminAbstractController
 {
-    protected Configuration $configuration;
-    protected ClassManagerInterface $classManager;
-    protected RestrictionService $restrictionService;
-
     public function __construct(
-        Configuration $configuration,
-        ClassManagerInterface $classManager,
-        RestrictionService $restrictionService
+        protected Configuration $configuration,
+        protected ClassManagerInterface $classManager,
+        protected RestrictionService $restrictionService
     ) {
-        $this->configuration = $configuration;
-        $this->classManager = $classManager;
-        $this->restrictionService = $restrictionService;
     }
 
     public function getGlobalSettingsAction(): JsonResponse

src/Controller/AuthController.php

@@ -6,15 +6,12 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 class AuthController extends AbstractController
 {
-    protected FactoryInterface $formFactory;
-
-    public function __construct(FactoryInterface $formFactory)
+    public function __construct(protected FactoryInterface $formFactory)
     {
-        $this->formFactory = $formFactory;
     }
 
     public function loginAction(Request $request): Response

src/Controller/ChangePasswordController.php

@@ -17,18 +17,11 @@
 
 class ChangePasswordController extends AbstractController
 {
-    protected FactoryInterface $formFactory;
-    protected EventDispatcherInterface $eventDispatcher;
-    protected UserManagerInterface $userManager;
-
     public function __construct(
-        FactoryInterface $formFactory,
-        EventDispatcherInterface $eventDispatcher,
-        UserManagerInterface $userManager
+        protected FactoryInterface $formFactory,
+        protected EventDispatcherInterface $eventDispatcher,
+        protected UserManagerInterface $userManager
     ) {
-        $this->formFactory = $formFactory;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->userManager = $userManager;
     }
 
     public function changePasswordAction(Request $request): Response

src/Controller/DeleteAccountController.php

@@ -16,18 +16,11 @@
 
 class DeleteAccountController extends AbstractController
 {
-    protected FactoryInterface $formFactory;
-    protected EventDispatcherInterface $eventDispatcher;
-    protected UserManagerInterface $userManager;
-
     public function __construct(
-        FactoryInterface $formFactory,
-        EventDispatcherInterface $eventDispatcher,
-        UserManagerInterface $userManager
+        protected FactoryInterface $formFactory,
+        protected EventDispatcherInterface $eventDispatcher,
+        protected UserManagerInterface $userManager
     ) {
-        $this->formFactory = $formFactory;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->userManager = $userManager;
     }
 
     public function deleteAccountAction(Request $request): Response

src/Controller/ProfileController.php

@@ -18,21 +18,12 @@
 
 class ProfileController extends AbstractController
 {
-    protected FactoryInterface $formFactory;
-    protected EventDispatcherInterface $eventDispatcher;
-    protected UserManagerInterface $userManager;
-    protected RequestHelper $requestHelper;
-
     public function __construct(
-        FactoryInterface $formFactory,
-        EventDispatcherInterface $eventDispatcher,
-        UserManagerInterface $userManager,
-        RequestHelper $requestHelper
+        protected FactoryInterface $formFactory,
+        protected EventDispatcherInterface $eventDispatcher,
+        protected UserManagerInterface $userManager,
+        protected RequestHelper $requestHelper
     ) {
-        $this->formFactory = $formFactory;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->userManager = $userManager;
-        $this->requestHelper = $requestHelper;
     }
 
     public function showAction(Request $request): Response

src/Controller/ResettingController.php

@@ -21,30 +21,15 @@
 
 class ResettingController extends AbstractController
 {
-    protected FactoryInterface $requestResettingFormFactory;
-    protected FactoryInterface $resettingFormFactory;
-    protected EventDispatcherInterface $eventDispatcher;
-    protected UserManagerInterface $userManager;
-    protected TokenGeneratorInterface $tokenGenerator;
-    protected MailerInterface $mailer;
-    protected RequestHelper $requestHelper;
-
     public function __construct(
-        FactoryInterface $requestResettingFormFactory,
-        FactoryInterface $resettingFormFactory,
-        EventDispatcherInterface $eventDispatcher,
-        UserManagerInterface $userManager,
-        TokenGeneratorInterface $tokenGenerator,
-        MailerInterface $mailer,
-        RequestHelper $requestHelper
+        protected FactoryInterface $requestResettingFormFactory,
+        protected FactoryInterface $resettingFormFactory,
+        protected EventDispatcherInterface $eventDispatcher,
+        protected UserManagerInterface $userManager,
+        protected TokenGeneratorInterface $tokenGenerator,
+        protected MailerInterface $mailer,
+        protected RequestHelper $requestHelper
     ) {
-        $this->requestResettingFormFactory = $requestResettingFormFactory;
-        $this->resettingFormFactory = $resettingFormFactory;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->userManager = $userManager;
-        $this->tokenGenerator = $tokenGenerator;
-        $this->mailer = $mailer;
-        $this->requestHelper = $requestHelper;
     }
 
     public function requestAction(Request $request): Response

src/Document/Builder/BrickBuilder.php

@@ -9,16 +9,12 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 use Twig\Environment;
 
 class BrickBuilder
 {
     protected string $sourceType = 'area';
-    protected TokenStorageInterface $tokenStorage;
-    protected IncludeRenderer $includeRenderer;
-    protected Environment $templateRenderer;
-    protected UrlGeneratorInterface $urlGenerator;
     protected ?string $logoutUri = null;
     protected bool $hideAfterLogin = false;
     protected ?Document $redirectPage = null;
@@ -35,15 +31,11 @@ class BrickBuilder
     ];
 
     public function __construct(
-        TokenStorageInterface $tokenStorage,
-        IncludeRenderer $includeRenderer,
-        Environment $templateRenderer,
-        UrlGeneratorInterface $urlGenerator
+        protected TokenStorageInterface $tokenStorage,
+        protected IncludeRenderer $includeRenderer,
+        protected Environment $templateRenderer,
+        protected UrlGeneratorInterface $urlGenerator
     ) {
-        $this->tokenStorage = $tokenStorage;
-        $this->includeRenderer = $includeRenderer;
-        $this->templateRenderer = $templateRenderer;
-        $this->urlGenerator = $urlGenerator;
     }
 
     public function setup(string $sourceType): self

src/Event/FormEvent.php

@@ -9,14 +9,12 @@
 
 class FormEvent extends Event
 {
-    private FormInterface $form;
-    private Request $request;
     private ?Response $response = null;
 
-    public function __construct(FormInterface $form, Request $request)
-    {
-        $this->form = $form;
-        $this->request = $request;
+    public function __construct(
+        private FormInterface $form,
+        private Request $request
+    ) {
     }
 
     public function getForm(): FormInterface

src/Event/OAuth/OAuthResourceEvent.php

@@ -8,13 +8,10 @@
 
 class OAuthResourceEvent extends Event
 {
-    protected UserInterface $user;
-    protected ResourceOwnerInterface $resourceOwner;
-
-    public function __construct(UserInterface $user, ResourceOwnerInterface $resourceOwner)
-    {
-        $this->resourceOwner = $resourceOwner;
-        $this->user = $user;
+    public function __construct(
+        protected UserInterface $user,
+        protected ResourceOwnerInterface $resourceOwner
+    ) {
     }
 
     public function getUser(): UserInterface