close API: make classes final

src/Admin/FieldDescription.php

@@ -15,10 +15,7 @@
 
 use Sonata\AdminBundle\Admin\BaseFieldDescription;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class FieldDescription extends BaseFieldDescription
+final class FieldDescription extends BaseFieldDescription
 {
     public function getTargetModel(): ?string
     {

src/Block/AuditBlockService.php

@@ -21,11 +21,9 @@
 use Twig\Environment;
 
 /**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.22
- *
  * @author Thomas Rabaix <[email protected]>
  */
-class AuditBlockService extends AbstractBlockService
+final class AuditBlockService extends AbstractBlockService
 {
     /**
      * @var AuditReader

src/Builder/DatagridBuilder.php

@@ -28,30 +28,27 @@
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormFactoryInterface;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class DatagridBuilder implements DatagridBuilderInterface
+final class DatagridBuilder implements DatagridBuilderInterface
 {
     /**
      * @var FilterFactoryInterface
      */
-    protected $filterFactory;
+    private $filterFactory;
 
     /**
      * @var FormFactoryInterface
      */
-    protected $formFactory;
+    private $formFactory;
 
     /**
      * @var TypeGuesserInterface
      */
-    protected $guesser;
+    private $guesser;
 
     /**
      * @var bool
      */
-    protected $csrfTokenEnabled;
+    private $csrfTokenEnabled;
 
     public function __construct(
         FormFactoryInterface $formFactory,
@@ -164,7 +161,7 @@ public function getBaseDatagrid(AdminInterface $admin, array $values = []): Data
      *
      * @throws \RuntimeException If invalid pager type is set
      */
-    protected function getPager(string $pagerType): PagerInterface
+    private function getPager(string $pagerType): PagerInterface
     {
         switch ($pagerType) {
             case Pager::TYPE_DEFAULT:

src/Builder/ListBuilder.php

@@ -20,20 +20,17 @@
 use Sonata\AdminBundle\Builder\ListBuilderInterface;
 use Sonata\AdminBundle\Guesser\TypeGuesserInterface;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class ListBuilder implements ListBuilderInterface
+final class ListBuilder implements ListBuilderInterface
 {
     /**
      * @var TypeGuesserInterface
      */
-    protected $guesser;
+    private $guesser;
 
     /**
      * @var string[]
      */
-    protected $templates = [];
+    private $templates = [];
 
     /**
      * @param string[] $templates

src/Builder/ShowBuilder.php

@@ -20,20 +20,17 @@
 use Sonata\AdminBundle\Builder\ShowBuilderInterface;
 use Sonata\AdminBundle\Guesser\TypeGuesserInterface;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class ShowBuilder implements ShowBuilderInterface
+final class ShowBuilder implements ShowBuilderInterface
 {
     /**
      * @var TypeGuesserInterface
      */
-    protected $guesser;
+    private $guesser;
 
     /**
      * @var string[]
      */
-    protected $templates;
+    private $templates;
 
     /**
      * @param string[] $templates

src/Datagrid/Pager.php

@@ -21,8 +21,6 @@
  *
  * @author Jonathan H. Wage <[email protected]>
  *
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- *
  * @phpstan-extends BasePager<ProxyQueryInterface>
  */
 final class Pager extends BasePager

src/DependencyInjection/Compiler/AddAuditEntityCompilerPass.php

@@ -17,11 +17,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- *
  * @author Thomas Rabaix <[email protected]>
  */
-class AddAuditEntityCompilerPass implements CompilerPassInterface
+final class AddAuditEntityCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {

src/DependencyInjection/Compiler/AddGuesserCompilerPass.php

@@ -18,11 +18,9 @@
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- *
  * @author Thomas Rabaix <[email protected]>
  */
-class AddGuesserCompilerPass implements CompilerPassInterface
+final class AddGuesserCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {

src/DependencyInjection/Compiler/AddTemplatesCompilerPass.php

@@ -18,11 +18,9 @@
 use Symfony\Component\DependencyInjection\Definition;
 
 /**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- *
  * @author Thomas Rabaix <[email protected]>
  */
-class AddTemplatesCompilerPass implements CompilerPassInterface
+final class AddTemplatesCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {

src/DependencyInjection/Configuration.php

@@ -17,16 +17,14 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- *
  * This class contains the configuration information for the bundle.
  *
  * This information is solely responsible for how the different configuration
  * sections are normalized, and merged.
  *
  * @author Michael Williams <[email protected]>
  */
-class Configuration implements ConfigurationInterface
+final class Configuration implements ConfigurationInterface
 {
     /**
      * Generates the configuration tree.

src/DependencyInjection/SonataDoctrineORMAdminExtension.php

@@ -20,12 +20,10 @@
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
 /**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- *
  * @author Thomas Rabaix <[email protected]>
  * @author Michael Williams <[email protected]>
  */
-class SonataDoctrineORMAdminExtension extends AbstractSonataAdminExtension
+final class SonataDoctrineORMAdminExtension extends AbstractSonataAdminExtension
 {
     public function load(array $configs, ContainerBuilder $container): void
     {

src/Filter/BooleanFilter.php

@@ -18,10 +18,7 @@
 use Sonata\Form\Type\BooleanType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class BooleanFilter extends Filter
+final class BooleanFilter extends Filter
 {
     public function filter(ProxyQueryInterface $query, string $alias, string $field, array $data): void
     {

src/Filter/CallbackFilter.php

@@ -18,10 +18,7 @@
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class CallbackFilter extends Filter
+final class CallbackFilter extends Filter
 {
     public function filter(ProxyQueryInterface $query, string $alias, string $field, array $data): void
     {

src/Filter/ChoiceFilter.php

@@ -17,10 +17,7 @@
 use Sonata\AdminBundle\Form\Type\Operator\EqualOperatorType;
 use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQueryInterface;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class ChoiceFilter extends Filter
+final class ChoiceFilter extends Filter
 {
     public function filter(ProxyQueryInterface $query, string $alias, string $field, array $data): void
     {

src/Filter/ClassFilter.php

@@ -18,10 +18,7 @@
 use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQueryInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class ClassFilter extends Filter
+final class ClassFilter extends Filter
 {
     public const CHOICES = [
         EqualOperatorType::TYPE_EQUAL => 'INSTANCE OF',

src/Filter/DateFilter.php

@@ -15,10 +15,7 @@
 
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class DateFilter extends AbstractDateFilter
+final class DateFilter extends AbstractDateFilter
 {
     /**
      * This filter has no range.

src/Filter/DateRangeFilter.php

@@ -15,10 +15,7 @@
 
 use Sonata\Form\Type\DateRangeType;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class DateRangeFilter extends AbstractDateFilter
+final class DateRangeFilter extends AbstractDateFilter
 {
     /**
      * This is a range filter.

src/Filter/DateTimeFilter.php

@@ -15,10 +15,7 @@
 
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class DateTimeFilter extends AbstractDateFilter
+final class DateTimeFilter extends AbstractDateFilter
 {
     /**
      * This filter has time.

src/Model/ModelManager.php

@@ -43,24 +43,24 @@
 /**
  * @final since sonata-project/doctrine-orm-admin-bundle 3.24
  */
-class ModelManager implements ModelManagerInterface, LockInterface
+final class ModelManager implements ModelManagerInterface, LockInterface
 {
     public const ID_SEPARATOR = '~';
 
     /**
      * @var ManagerRegistry
      */
-    protected $registry;
+    private $registry;
 
     /**
      * @var PropertyAccessorInterface
      */
-    protected $propertyAccessor;
+    private $propertyAccessor;
 
     /**
      * @var EntityManagerInterface[]
      */
-    protected $cache = [];
+    private $cache = [];
 
     /**
      * NEXT_MAJOR: Make $propertyAccessor mandatory.

src/SonataDoctrineORMAdminBundle.php

@@ -19,10 +19,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class SonataDoctrineORMAdminBundle extends Bundle
+final class SonataDoctrineORMAdminBundle extends Bundle
 {
     public function build(ContainerBuilder $container): void
     {

src/Util/ObjectAclManipulator.php

@@ -21,10 +21,7 @@
 use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
 use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
 
-/**
- * @final since sonata-project/doctrine-orm-admin-bundle 3.24
- */
-class ObjectAclManipulator extends BaseObjectAclManipulator
+final class ObjectAclManipulator extends BaseObjectAclManipulator
 {
     public function batchConfigureAcls(OutputInterface $output, AdminInterface $admin, ?UserSecurityIdentity $securityIdentity = null): void
     {

tests/Builder/DatagridBuilderTest.php

@@ -24,11 +24,11 @@
 use Sonata\AdminBundle\Datagrid\SimplePager;
 use Sonata\AdminBundle\Filter\FilterFactoryInterface;
 use Sonata\AdminBundle\Guesser\TypeGuesserInterface;
+use Sonata\AdminBundle\Model\ModelManagerInterface;
 use Sonata\AdminBundle\Translator\FormLabelTranslatorStrategy;
 use Sonata\DoctrineORMAdminBundle\Admin\FieldDescription;
 use Sonata\DoctrineORMAdminBundle\Builder\DatagridBuilder;
 use Sonata\DoctrineORMAdminBundle\Filter\ModelAutocompleteFilter;
-use Sonata\DoctrineORMAdminBundle\Model\ModelManager;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\Guess\TypeGuess;
@@ -62,8 +62,7 @@ protected function setUp(): void
         );
 
         $this->admin = $this->createMock(AdminInterface::class);
-        $this->modelManager = $this->createMock(ModelManager::class);
-
+        $this->modelManager = $this->createMock(ModelManagerInterface::class);
         $this->admin->method('getClass')->willReturn('FakeClass');
         $this->admin->method('getModelManager')->willReturn($this->modelManager);
     }

tests/Builder/ListBuilderTest.php

@@ -17,9 +17,9 @@
 use PHPUnit\Framework\TestCase;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Guesser\TypeGuesserInterface;
+use Sonata\AdminBundle\Model\ModelManagerInterface;
 use Sonata\DoctrineORMAdminBundle\Admin\FieldDescription;
 use Sonata\DoctrineORMAdminBundle\Builder\ListBuilder;
-use Sonata\DoctrineORMAdminBundle\Model\ModelManager;
 use Symfony\Component\Form\Guess\Guess;
 use Symfony\Component\Form\Guess\TypeGuess;
 
@@ -37,7 +37,7 @@ class ListBuilderTest extends TestCase
     protected function setUp(): void
     {
         $this->typeGuesser = $this->createStub(TypeGuesserInterface::class);
-        $this->modelManager = $this->createStub(ModelManager::class);
+        $this->modelManager = $this->createStub(ModelManagerInterface::class);
         $this->admin = $this->createMock(AdminInterface::class);
 
         $this->admin->method('getClass')->willReturn('Foo');

tests/Builder/ShowBuilderTest.php

@@ -19,9 +19,9 @@
 use Sonata\AdminBundle\Admin\FieldDescriptionCollection;
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
 use Sonata\AdminBundle\Guesser\TypeGuesserInterface;
+use Sonata\AdminBundle\Model\ModelManagerInterface;
 use Sonata\DoctrineORMAdminBundle\Admin\FieldDescription;
 use Sonata\DoctrineORMAdminBundle\Builder\ShowBuilder;
-use Sonata\DoctrineORMAdminBundle\Model\ModelManager;
 use Symfony\Component\Form\Guess\TypeGuess;
 
 /**
@@ -50,7 +50,7 @@ protected function setUp(): void
         );
 
         $this->admin = $this->createMock(AdminInterface::class);
-        $this->modelManager = $this->createStub(ModelManager::class);
+        $this->modelManager = $this->createStub(ModelManagerInterface::class);
 
         $this->admin->method('getClass')->willReturn('FakeClass');
         $this->admin->method('getModelManager')->willReturn($this->modelManager);