EZP-30570: Upgrade ezsystems/ezplatform-user to use Symfony 4 components (#37)

* EZP-30570: Upgrade `ezsystems/ezplatform-user` to use Symfony 4
components

* EZP-30570: Renamed all *.yml files to *.yaml

* Added required tags to Controller service definitions

* Aligned unit tests to PHPUnit 8

* Bumped PHPUnit version to 8.2

Author: webhdx

composer.json

@@ -18,16 +18,28 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.1",
-        "symfony/symfony": "^3.4",
-        "jms/translation-bundle": "^1.3.2",
+        "php": "^7.3",
         "ezsystems/ezpublish-kernel": "^8.0@dev",
         "ezsystems/ezplatform-admin-ui": "^2.0@dev",
-        "symfony/swiftmailer-bundle": "^3.0"
+        "jms/translation-bundle": "^1.4",
+        "symfony/dependency-injection": "^4.3",
+        "symfony/http-kernel": "^4.3",
+        "symfony/translation": "^4.3",
+        "symfony/security": "^4.3",
+        "symfony/http-foundation": "^4.3",
+        "symfony/config": "^4.3",
+        "symfony/options-resolver": "^4.3",
+        "symfony/event-dispatcher": "^4.3",
+        "symfony/intl": "^4.3",
+        "symfony/validator": "^4.3",
+        "symfony/form": "^4.3",
+        "symfony/routing": "^4.3",
+        "symfony/swiftmailer-bundle": "^3.2",
+        "twig/twig": "^2.11"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0",
-        "friendsofphp/php-cs-fixer": "~2.7.1"
+        "friendsofphp/php-cs-fixer": "^2.15",
+        "phpunit/phpunit": "^8.2"
     },
     "scripts": {
         "fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating"

src/bundle/Controller/PasswordResetController.php

@@ -25,10 +25,10 @@
 use eZ\Publish\API\Repository\UserService;
 use eZ\Publish\API\Repository\Values\User\UserTokenUpdateStruct;
 use Swift_Mailer;
-use Twig_Environment;
 use DateTime;
 use DateInterval;
 use Swift_Message;
+use Twig\Environment;
 
 class PasswordResetController extends Controller
 {
@@ -41,7 +41,7 @@ class PasswordResetController extends Controller
     /** @var Swift_Mailer */
     private $mailer;
 
-    /** @var Twig_Environment */
+    /** @var \Twig\Environment */
     private $twig;
 
     /** @var string */
@@ -60,7 +60,7 @@ class PasswordResetController extends Controller
      * @param \EzSystems\EzPlatformUser\Form\Factory\FormFactory $formFactory
      * @param \eZ\Publish\API\Repository\UserService $userService
      * @param Swift_Mailer $mailer
-     * @param Twig_Environment $twig
+     * @param \Twig\Environment $twig
      * @param \EzSystems\EzPlatformAdminUi\Notification\TranslatableNotificationHandlerInterface $notificationHandler
      * @param \eZ\Publish\API\Repository\PermissionResolver $permissionResolver
      * @param string $tokenIntervalSpec
@@ -70,7 +70,7 @@ public function __construct(
         FormFactory $formFactory,
         UserService $userService,
         Swift_Mailer $mailer,
-        Twig_Environment $twig,
+        Environment $twig,
         TranslatableNotificationHandlerInterface $notificationHandler,
         PermissionResolver $permissionResolver,
         string $tokenIntervalSpec,

src/bundle/DependencyInjection/EzPlatformUserExtension.php

@@ -26,7 +26,7 @@ public function load(array $configs, ContainerBuilder $container): void
             new FileLocator(__DIR__ . '/../Resources/config')
         );
 
-        $loader->load('services.yml');
+        $loader->load('services.yaml');
     }
 
     /**

src/bundle/EzPlatformUserBundle.php

@@ -36,6 +36,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new UserSetting\FormMapperPass());
         $container->addCompilerPass(new UserSetting\ViewBuilderRegistryPass());
 
-        $core->addDefaultSettings(__DIR__ . '/Resources/config', ['ezplatform_default_settings.yml']);
+        $core->addDefaultSettings(__DIR__ . '/Resources/config', ['ezplatform_default_settings.yaml']);
     }
 }

…s/config/ezplatform_default_settings.yml …/config/ezplatform_default_settings.yamlsrc/bundle/Resources/config/ezplatform_default_settings.yml renamed to src/bundle/Resources/config/ezplatform_default_settings.yaml src/bundle/Resources/config/ezplatform_default_settings.yml renamed to src/bundle/Resources/config/ezplatform_default_settings.yaml

@@ -1,8 +1,8 @@
 imports:
-    - { resource: services/controllers.yml }
-    - { resource: services/validators.yml }
-    - { resource: services/user_settings.yml }
-    - { resource: services/forms.yml }
+    - { resource: services/controllers.yaml }
+    - { resource: services/validators.yaml }
+    - { resource: services/user_settings.yaml }
+    - { resource: services/forms.yaml }
 
 services:
     _defaults:
@@ -41,6 +41,10 @@ services:
         calls:
             - [setParam, ["contentTypeIdentifier", "%ezrepoforms.user_content_type_identifier%"]]
 
+    # Default implementations
+    EzSystems\EzPlatformUser\ConfigResolver\RegistrationGroupLoader: '@EzSystems\EzPlatformUser\ConfigResolver\ConfigurableRegistrationGroupLoader'
+    EzSystems\EzPlatformUser\ConfigResolver\RegistrationContentTypeLoader: '@EzSystems\EzPlatformUser\ConfigResolver\ConfigurableRegistrationContentTypeLoader'
+
     EzSystems\EzPlatformUser\Form\DataMapper\UserRegisterMapper:
         calls:
             - [setParam, ["language", "@=service('ezpublish.config.resolver').getParameter('languages', null, null)[0]"]]

src/bundle/Resources/config/routing.yml src/bundle/Resources/config/routing.yamlsrc/bundle/Resources/config/routing.yml renamed to src/bundle/Resources/config/routing.yaml

@@ -6,19 +6,19 @@ services:
         parent: EzSystems\EzPlatformUserBundle\Controller\Controller
 
     EzSystems\EzPlatformUserBundle\Controller\Controller:
-        tags: [controller.service_arguments]
         calls:
             - [setContainer, ["@service_container"]]
             - [performAccessCheck, []]
+        tags: [controller.service_arguments]
 
     EzSystems\EzPlatformUserBundle\Controller\PasswordResetController:
-        tags: [controller.service_arguments]
         autowire: true
         calls:
             - [setContainer, ['@service_container']]
         arguments:
             $tokenIntervalSpec: '$security.token_interval_spec$'
             $forgotPasswordMail: '$user_forgot_password.templates.mail$'
+        tags: [controller.service_arguments]
 
     EzSystems\EzPlatformUserBundle\Controller\PasswordChangeController:
         autowire: true
@@ -27,13 +27,16 @@ services:
         calls:
             - [setContainer, ['@service_container']]
             - [performAccessCheck, []]
+        tags: [controller.service_arguments]
 
     EzSystems\EzPlatformUserBundle\Controller\UserRegisterController:
         autowire: true
         arguments:
             $userActionDispatcher: '@ezrepoforms.action_dispatcher.user'
+        tags: [controller.service_arguments]
 
     EzSystems\EzPlatformUserBundle\Controller\UserSettingsController:
         parent: EzSystems\EzPlatformAdminUiBundle\Controller\Controller
         arguments:
             $defaultPaginationLimit: '$pagination.user_settings_limit$'
+        tags: [controller.service_arguments]

src/bundle/Resources/config/services.yml src/bundle/Resources/config/services.yamlsrc/bundle/Resources/config/services.yml renamed to src/bundle/Resources/config/services.yaml

@@ -7,6 +7,8 @@ services:
     EzSystems\EzPlatformUser\Form\Type\:
         resource: "../../../lib/Form/Type/*"
 
+    EzSystems\EzPlatformUser\Form\Factory\FormFactory: ~
+
     EzSystems\EzPlatformUser\Form\ChoiceList\Loader\AvailableLocaleChoiceLoader:
         arguments:
             $availableTranslations: '%available_translations%'