diff --git a/UPGRADE-4.x.md b/UPGRADE-4.x.md index 59ee24ed0..0ea13c961 100644 --- a/UPGRADE-4.x.md +++ b/UPGRADE-4.x.md @@ -1,6 +1,14 @@ UPGRADE 4.x =========== +UPGRADE FROM 4.x to 4.x +======================= + +### Mark classes as final + +A lot of classes were marked as final with the phpdoc annotation, make sure you avoid +extending them because on next major they will become final. + UPGRADE FROM 4.13 to 4.14 ========================= diff --git a/src/Admin/Document/UserAdmin.php b/src/Admin/Document/UserAdmin.php index adca51a76..4a0c6c026 100644 --- a/src/Admin/Document/UserAdmin.php +++ b/src/Admin/Document/UserAdmin.php @@ -15,6 +15,9 @@ use Sonata\UserBundle\Admin\Model\UserAdmin as BaseUserAdmin; +/** + * @final since sonata-project/user-bundle 4.x + */ class UserAdmin extends BaseUserAdmin { } diff --git a/src/Admin/Entity/UserAdmin.php b/src/Admin/Entity/UserAdmin.php index 2a138c40e..a9fe58c3e 100644 --- a/src/Admin/Entity/UserAdmin.php +++ b/src/Admin/Entity/UserAdmin.php @@ -15,6 +15,9 @@ use Sonata\UserBundle\Admin\Model\UserAdmin as BaseUserAdmin; +/** + * @final since sonata-project/user-bundle 4.x + */ class UserAdmin extends BaseUserAdmin { } diff --git a/src/DependencyInjection/Compiler/GlobalVariablesCompilerPass.php b/src/DependencyInjection/Compiler/GlobalVariablesCompilerPass.php index 1a36f4872..1be3e6dca 100644 --- a/src/DependencyInjection/Compiler/GlobalVariablesCompilerPass.php +++ b/src/DependencyInjection/Compiler/GlobalVariablesCompilerPass.php @@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\Reference; /** - * GlobalVariablesCompilerPass. + * @final since sonata-project/user-bundle 4.x * * @author Thomas Rabaix */ diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index f0e752521..ad15f3292 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -22,6 +22,8 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; /** + * @final since sonata-project/user-bundle 4.x + * * This is the class that validates and merges configuration from your app/config files. * * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class} diff --git a/src/DependencyInjection/SonataUserExtension.php b/src/DependencyInjection/SonataUserExtension.php index 91dd7a405..1eb108d28 100644 --- a/src/DependencyInjection/SonataUserExtension.php +++ b/src/DependencyInjection/SonataUserExtension.php @@ -30,6 +30,8 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** + * @final since sonata-project/user-bundle 4.x + * * @author Thomas Rabaix */ class SonataUserExtension extends Extension implements PrependExtensionInterface diff --git a/src/Document/GroupManager.php b/src/Document/GroupManager.php index 96e0590e1..d7ba2bc31 100644 --- a/src/Document/GroupManager.php +++ b/src/Document/GroupManager.php @@ -18,6 +18,8 @@ use Sonata\UserBundle\Model\GroupManagerInterface; /** + * @final since sonata-project/user-bundle 4.x + * * @author Hugo Briand */ class GroupManager extends BaseGroupManager implements GroupManagerInterface diff --git a/src/Document/UserManager.php b/src/Document/UserManager.php index 4e359e046..381ed9289 100644 --- a/src/Document/UserManager.php +++ b/src/Document/UserManager.php @@ -18,6 +18,8 @@ use Sonata\UserBundle\Model\UserManagerInterface; /** + * @final since sonata-project/user-bundle 4.x + * * @author Hugo Briand */ class UserManager extends BaseUserManager implements UserManagerInterface diff --git a/src/Entity/GroupManager.php b/src/Entity/GroupManager.php index 4ef9d662a..d609950a4 100644 --- a/src/Entity/GroupManager.php +++ b/src/Entity/GroupManager.php @@ -19,6 +19,8 @@ use Sonata\UserBundle\Model\GroupManagerInterface; /** + * @final since sonata-project/user-bundle 4.x + * * @author Hugo Briand */ class GroupManager extends BaseGroupManager implements GroupManagerInterface diff --git a/src/Entity/UserManager.php b/src/Entity/UserManager.php index 727668dd4..6132a2e23 100644 --- a/src/Entity/UserManager.php +++ b/src/Entity/UserManager.php @@ -21,6 +21,8 @@ use Sonata\UserBundle\Model\UserManagerInterface; /** + * @final since sonata-project/user-bundle 4.x + * * @author Hugo Briand */ class UserManager extends BaseUserManager implements UserManagerInterface, ManagerInterface diff --git a/src/Form/Transformer/RestoreRolesTransformer.php b/src/Form/Transformer/RestoreRolesTransformer.php index 0f80495ee..330c42f8c 100644 --- a/src/Form/Transformer/RestoreRolesTransformer.php +++ b/src/Form/Transformer/RestoreRolesTransformer.php @@ -16,6 +16,9 @@ use Sonata\UserBundle\Security\EditableRolesBuilder; use Symfony\Component\Form\DataTransformerInterface; +/** + * @final since sonata-project/user-bundle 4.x + */ class RestoreRolesTransformer implements DataTransformerInterface { /** diff --git a/src/Form/Type/SecurityRolesType.php b/src/Form/Type/SecurityRolesType.php index c4cee8321..3e14045bf 100644 --- a/src/Form/Type/SecurityRolesType.php +++ b/src/Form/Type/SecurityRolesType.php @@ -25,6 +25,9 @@ use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\OptionsResolver; +/** + * @final since sonata-project/user-bundle 4.x + */ class SecurityRolesType extends AbstractType { /** diff --git a/src/Security/Authorization/Voter/UserAclVoter.php b/src/Security/Authorization/Voter/UserAclVoter.php index c71274697..7e7a23876 100644 --- a/src/Security/Authorization/Voter/UserAclVoter.php +++ b/src/Security/Authorization/Voter/UserAclVoter.php @@ -17,6 +17,9 @@ use Symfony\Component\Security\Acl\Voter\AclVoter; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; +/** + * @final since sonata-project/user-bundle 4.x + */ class UserAclVoter extends AclVoter { public function supportsClass($class) diff --git a/src/Security/EditableRolesBuilder.php b/src/Security/EditableRolesBuilder.php index 7d15f4842..c6ef5a09e 100644 --- a/src/Security/EditableRolesBuilder.php +++ b/src/Security/EditableRolesBuilder.php @@ -18,6 +18,9 @@ use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; use Symfony\Component\Translation\TranslatorInterface; +/** + * @final since sonata-project/user-bundle 4.x + */ class EditableRolesBuilder { /** diff --git a/src/SonataUserBundle.php b/src/SonataUserBundle.php index 04a054a92..c64d987f1 100644 --- a/src/SonataUserBundle.php +++ b/src/SonataUserBundle.php @@ -19,6 +19,9 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; +/** + * @final since sonata-project/user-bundle 4.x + */ class SonataUserBundle extends Bundle { public function build(ContainerBuilder $container): void diff --git a/src/Twig/GlobalVariables.php b/src/Twig/GlobalVariables.php index aac2bad18..6d1c95658 100644 --- a/src/Twig/GlobalVariables.php +++ b/src/Twig/GlobalVariables.php @@ -17,6 +17,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface; /** + * @final since sonata-project/user-bundle 4.x + * * @author Thomas Rabaix */ class GlobalVariables diff --git a/tests/Admin/Document/UserAdmin.php b/tests/Admin/Document/UserAdmin.php index b4554cec0..bc5351bb7 100644 --- a/tests/Admin/Document/UserAdmin.php +++ b/tests/Admin/Document/UserAdmin.php @@ -13,7 +13,7 @@ namespace Sonata\UserBundle\Tests\Admin\Document; -use Sonata\UserBundle\Admin\Document\UserAdmin as BaseUserAdmin; +use Sonata\UserBundle\Admin\Model\UserAdmin as BaseUserAdmin; /** * @author Anton Dyshkant diff --git a/tests/Admin/Entity/UserAdmin.php b/tests/Admin/Entity/UserAdmin.php index c2ddc0d38..a212644fe 100644 --- a/tests/Admin/Entity/UserAdmin.php +++ b/tests/Admin/Entity/UserAdmin.php @@ -13,7 +13,7 @@ namespace Sonata\UserBundle\Tests\Admin\Entity; -use Sonata\UserBundle\Admin\Entity\UserAdmin as BaseUserAdmin; +use Sonata\UserBundle\Admin\Model\UserAdmin as BaseUserAdmin; /** * @author Anton Dyshkant