Bump dep

.github/workflows/test.yaml

@@ -33,15 +33,14 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - '7.4'
                     - '8.0'
                     - '8.1'
                 dependencies: [highest]
                 allowed-to-fail: [false]
                 symfony-require: ['']
                 variant: [normal]
                 include:
-                    - php-version: '7.4'
+                    - php-version: '8.0'
                       dependencies: lowest
                       allowed-to-fail: false
                       variant: normal

composer.json

@@ -21,9 +21,9 @@
     ],
     "homepage": "https://github.com/sonata-project/sonata-doctrine-extensions",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "doctrine/dbal": "^2.13 || ^3.1",
-        "doctrine/persistence": "^1.3.6 || ^2.0 || ^3.0"
+        "doctrine/persistence": "^2.0 || ^3.0"
     },
     "require-dev": {
         "doctrine/common": "^2.7 || ^3.0",
@@ -41,9 +41,9 @@
         "phpunit/phpunit": "^9.5.13",
         "psalm/plugin-phpunit": "^0.16",
         "rector/rector": "^0.12",
-        "symfony/dependency-injection": "^4.4 || ^5.3 || ^6.0",
-        "symfony/expression-language": "^4.4 || ^5.3 || ^6.0",
-        "symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0",
+        "symfony/expression-language": "^5.4 || ^6.0",
+        "symfony/framework-bundle": "^5.4 || ^6.0",
         "symfony/phpunit-bridge": "^6.0",
         "vimeo/psalm": "^4.1"
     },
@@ -54,8 +54,8 @@
         "doctrine/orm": "<2.5"
     },
     "suggest": {
+        "doctrine/mongodb-odm": "If you use mongo",
         "doctrine/orm": "If you use doctrine orm",
-        "doctrine/phpcr-odm": "If you use doctrine phpcr",
         "symfony/framework-bundle": "If you want to use symfony"
     },
     "autoload": {

rector.php

@@ -29,7 +29,7 @@
     ]);
 
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_74,
+        LevelSetList::UP_TO_PHP_80,
     ]);
 
     $rectorConfig->importNames();

src/Adapter/AdapterChain.php

@@ -18,7 +18,7 @@ class AdapterChain implements AdapterInterface
     /**
      * @var AdapterInterface[]
      */
-    protected $adapters = [];
+    private $adapters = [];
 
     public function addAdapter(AdapterInterface $adapter): void
     {

src/Adapter/ORM/DoctrineORMAdapter.php

@@ -22,14 +22,8 @@
  */
 class DoctrineORMAdapter implements AdapterInterface
 {
-    /**
-     * @var ManagerRegistry
-     */
-    protected $registry;
-
-    public function __construct(ManagerRegistry $registry)
+    public function __construct(private ManagerRegistry $registry)
     {
-        $this->registry = $registry;
     }
 
     public function getNormalizedIdentifier($model)
@@ -53,7 +47,7 @@ public function getNormalizedIdentifier($model)
             ));
         }
 
-        $manager = $this->registry->getManagerForClass(\get_class($model));
+        $manager = $this->registry->getManagerForClass($model::class);
 
         if (!$manager instanceof EntityManagerInterface) {
             return null;

src/Adapter/PHPCR/DoctrinePHPCRAdapter.php

@@ -31,14 +31,8 @@
  */
 class DoctrinePHPCRAdapter implements AdapterInterface
 {
-    /**
-     * @var ManagerRegistry
-     */
-    protected $registry;
-
-    public function __construct(ManagerRegistry $registry)
+    public function __construct(private ManagerRegistry $registry)
     {
-        $this->registry = $registry;
     }
 
     public function getNormalizedIdentifier($model)
@@ -62,7 +56,7 @@ public function getNormalizedIdentifier($model)
             ));
         }
 
-        $manager = $this->registry->getManagerForClass(\get_class($model));
+        $manager = $this->registry->getManagerForClass($model::class);
 
         if (!$manager instanceof DocumentManager) {
             return null;
@@ -72,7 +66,7 @@ public function getNormalizedIdentifier($model)
             return null;
         }
 
-        $class = $manager->getClassMetadata(\get_class($model));
+        $class = $manager->getClassMetadata($model::class);
 
         \assert($class instanceof ClassMetadata);
 

src/Bridge/Symfony/Resources/config/doctrine_orm.php

@@ -11,16 +11,15 @@
  * file that was distributed with this source code.
  */
 
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
 use Sonata\Doctrine\Adapter\ORM\DoctrineORMAdapter;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
-    // Use "service" function for creating references to services when dropping support for Symfony 4.4
     $containerConfigurator->services()
 
         ->set('sonata.doctrine.adapter.doctrine_orm', DoctrineORMAdapter::class)
             ->args([
-                new ReferenceConfigurator('doctrine'),
+                service('doctrine'),
             ]);
 };

src/Bridge/Symfony/Resources/config/doctrine_phpcr.php

@@ -11,16 +11,15 @@
  * file that was distributed with this source code.
  */
 
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
 use Sonata\Doctrine\Adapter\PHPCR\DoctrinePHPCRAdapter;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
-    // Use "service" function for creating references to services when dropping support for Symfony 4.4
     $containerConfigurator->services()
 
         ->set('sonata.doctrine.adapter.doctrine_phpcr', DoctrinePHPCRAdapter::class)
             ->args([
-                new ReferenceConfigurator('doctrine_phpcr'),
+                service('doctrine_phpcr'),
             ]);
 };

src/Bridge/Symfony/Resources/config/mapper_orm.php

@@ -11,8 +11,9 @@
  * file that was distributed with this source code.
  */
 
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
 use Sonata\Doctrine\Mapper\ORM\DoctrineORMMapper;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $containerConfigurator->services()

src/Bridge/Symfony/Resources/config/services.php

@@ -11,8 +11,9 @@
  * file that was distributed with this source code.
  */
 
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
 use Sonata\Doctrine\Adapter\AdapterChain;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $containerConfigurator->services()

src/Mapper/Builder/OptionsBuilder.php

@@ -25,15 +25,11 @@ final class OptionsBuilder
      */
     private array $options = [];
 
-    private ?string $type;
-
     /**
      * NEXT_MAJOR: Make the arguments mandatory.
      */
-    private function __construct(?string $type = null, ?string $fieldName = null, ?string $targetEntity = null)
+    private function __construct(private ?string $type = null, ?string $fieldName = null, ?string $targetEntity = null)
     {
-        $this->type = $type;
-
         if (null !== $fieldName) {
             $this->options['fieldName'] = $fieldName;
         }

src/Mapper/DoctrineCollector.php

@@ -59,9 +59,6 @@ private function __construct()
     {
     }
 
-    /**
-     * @return DoctrineCollector
-     */
     public static function getInstance(): self
     {
         if (null === self::$instance) {

src/Model/BaseManager.php

@@ -26,25 +26,13 @@
  */
 abstract class BaseManager implements ManagerInterface, ClearableManagerInterface
 {
-    /**
-     * @var ManagerRegistry
-     */
-    protected $registry;
-
-    /**
-     * @var string
-     *
-     * @phpstan-var class-string<T>
-     */
-    protected $class;
-
     /**
      * @phpstan-param class-string<T> $class
      */
-    public function __construct(string $class, ManagerRegistry $registry)
-    {
-        $this->registry = $registry;
-        $this->class = $class;
+    public function __construct(
+        protected string $class,
+        protected ManagerRegistry $registry
+    ) {
     }
 
     /**
@@ -188,7 +176,7 @@ protected function checkObject($object): void
             throw new \InvalidArgumentException(sprintf(
                 'Object must be instance of %s, %s given',
                 $this->class,
-                \is_object($object) ? \get_class($object) : \gettype($object)
+                get_debug_type($object)
             ));
         }
     }

tests/App/Kernel.php

@@ -74,12 +74,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         ]);
     }
 
-    /**
-     * TODO: Add typehint when support for Symfony < 5.1 is dropped.
-     *
-     * @param RoutingConfigurator $routes
-     */
-    protected function configureRoutes($routes): void
+    protected function configureRoutes(RoutingConfigurator $routes): void
     {
     }