Run tests with MongoDB ODM using native laxy objects, fix other deprecations

Author: mbabker

.php-cs-fixer.dist.php

@@ -31,9 +31,9 @@
     ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRules([
         '@DoctrineAnnotation' => true,
-        '@PHP74Migration' => true,
-        '@PHP74Migration:risky' => true,
-        '@PHPUnit91Migration:risky' => true,
+        '@PHP7x4Migration' => true,
+        '@PHP7x4Migration:risky' => true,
+        '@PHPUnit9x1Migration:risky' => true,
         '@PSR2' => true,
         '@Symfony' => true,
         'array_syntax' => ['syntax' => 'short'],

composer.json

@@ -56,16 +56,16 @@
         "doctrine/cache": "^1.11 || ^2.0",
         "doctrine/common": "^2.13 || ^3.0",
         "doctrine/dbal": "^3.7 || ^4.0",
-        "doctrine/doctrine-bundle": "^2.3",
+        "doctrine/doctrine-bundle": "^2.3 || ^3.0",
         "doctrine/mongodb-odm": "^2.3",
         "doctrine/orm": "^2.20 || ^3.3",
-        "friendsofphp/php-cs-fixer": "^3.70",
+        "friendsofphp/php-cs-fixer": "^3.89",
         "nesbot/carbon": "^2.71 || ^3.0",
-        "phpstan/phpstan": "^2.1.1",
+        "phpstan/phpstan": "^2.1.31",
         "phpstan/phpstan-doctrine": "^2.0.1",
         "phpstan/phpstan-phpunit": "^2.0.3",
         "phpunit/phpunit": "^9.6",
-        "rector/rector": "^2.0.6",
+        "rector/rector": "^2.2.6",
         "symfony/console": "^5.4 || ^6.0 || ^7.0",
         "symfony/doctrine-bridge": "^5.4 || ^6.0 || ^7.0",
         "symfony/phpunit-bridge": "^6.4 || ^7.0",

phpstan.neon.dist

@@ -17,6 +17,7 @@ parameters:
         - '#^Property Gedmo\\Tests\\.+\\Fixture\\[^:]+::\$\w+ is never written, only read\.$#'
         - '#^Property Gedmo\\Tests\\.+\\Fixture\\[^:]+::\$\w+ is never read, only written\.$#'
         - '#^Property Gedmo\\Tests\\.+\\Fixture\\[^:]+::\$\w+ is unused\.$#'
+        - '#^Property Gedmo\\Tests\\.+\\Fixture\\[^:]+::\$\w+ (.*) is never assigned (.*) so it can be removed from the property type\.$#'
         - '#^Method Gedmo\\(?:[^\\]+\\)*Mapping\\Driver[^:]+::readExtendedMetadata\(\) with return type void returns [\w\|<>\s,]+ but should not return anything\.$#'
         - '#^Result of method Gedmo\\Mapping\\Driver::readExtendedMetadata\(\) \(void\) is used\.$#'
     excludePaths:

tests/Gedmo/Sortable/Fixture/Node.php

@@ -15,7 +15,7 @@
 use Gedmo\Sortable\Entity\Repository\SortableRepository;
 
 /**
- * @author Charles J. C. Elling, 2017-07-31
+ * @author
  *
  * @ORM\Entity(repositoryClass="Gedmo\Sortable\Entity\Repository\SortableRepository")
  */

tests/Gedmo/Sortable/Fixture/NotifyNode.php

@@ -17,7 +17,7 @@
 use Gedmo\Sortable\Entity\Repository\SortableRepository;
 
 /**
- * @author Charles J. C. Elling, 2017-07-31
+ * @author
  *
  * @ORM\Entity(repositoryClass="Gedmo\Sortable\Entity\Repository\SortableRepository")
  * @ORM\ChangeTrackingPolicy("NOTIFY")

tests/Gedmo/Tool/BaseTestCaseMongoODM.php

@@ -112,6 +112,12 @@ protected function getMetadataDriverImplementation(): MappingDriver
     protected function getMockAnnotatedConfig(): Configuration
     {
         $config = new Configuration();
+
+        /** @phpstan-ignore-next-line function.alreadyNarrowedType */
+        if (PHP_VERSION_ID >= 80400 && method_exists($config, 'setUseNativeLazyObject')) {
+            $config->setUseNativeLazyObject(true);
+        }
+
         $config->addFilter('softdeleteable', SoftDeleteableFilter::class);
         $config->setProxyDir(TESTS_TEMP_DIR);
         $config->setHydratorDir(TESTS_TEMP_DIR);
@@ -129,6 +135,12 @@ protected function getMockAnnotatedConfig(): Configuration
     protected function getDefaultConfiguration(): Configuration
     {
         $config = new Configuration();
+
+        /** @phpstan-ignore-next-line function.alreadyNarrowedType */
+        if (PHP_VERSION_ID >= 80400 && method_exists($config, 'setUseNativeLazyObject')) {
+            $config->setUseNativeLazyObject(true);
+        }
+
         $config->addFilter('softdeleteable', SoftDeleteableFilter::class);
         $config->setProxyDir(TESTS_TEMP_DIR);
         $config->setHydratorDir(TESTS_TEMP_DIR);

tests/Gedmo/Tool/BaseTestCaseOM.php

@@ -170,7 +170,14 @@ private function getMockODMMongoDBConfig(string $dbName, ?MappingDriver $mapping
         if (null === $mappingDriver) {
             $mappingDriver = $this->getMongoDBDriver();
         }
+
         $config = new Configuration();
+
+        /** @phpstan-ignore-next-line function.alreadyNarrowedType */
+        if (PHP_VERSION_ID >= 80400 && method_exists($config, 'setUseNativeLazyObject')) {
+            $config->setUseNativeLazyObject(true);
+        }
+
         $config->addFilter('softdeleteable', SoftDeleteableFilter::class);
         $config->setProxyDir(TESTS_TEMP_DIR);
         $config->setHydratorDir(TESTS_TEMP_DIR);
@@ -191,10 +198,17 @@ private function getMockODMMongoDBConfig(string $dbName, ?MappingDriver $mapping
     private function getMockORMConfig(?MappingDriver $mappingDriver = null): \Doctrine\ORM\Configuration
     {
         $config = new \Doctrine\ORM\Configuration();
-        $config->setProxyDir(TESTS_TEMP_DIR);
-        $config->setProxyNamespace('Proxy');
+
+        /** @phpstan-ignore-next-line function.alreadyNarrowedType */
+        if (PHP_VERSION_ID >= 80400 && method_exists($config, 'enableNativeLazyObjects')) {
+            $config->enableNativeLazyObjects(true);
+        } else {
+            $config->setProxyDir(TESTS_TEMP_DIR);
+            $config->setProxyNamespace('Proxy');
+            $config->setAutoGenerateProxyClasses(true);
+        }
+
         $config->setDefaultQueryHints([]);
-        $config->setAutoGenerateProxyClasses(true);
         $config->setClassMetadataFactoryName(ClassMetadataFactory::class);
         $config->setDefaultRepositoryClassName(EntityRepository::class);
         $config->setQuoteStrategy(new DefaultQuoteStrategy());

tests/Gedmo/Wrapper/MongoDocumentWrapperTest.php

@@ -50,7 +50,11 @@ public function testProxy(): void
     {
         $this->dm->clear();
         $test = $this->dm->getReference(Article::class, $this->articleId);
-        static::assertStringStartsWith('Proxy', get_class($test));
+
+        if (method_exists($this->dm, 'isUninitializedObject')) {
+            static::assertTrue($this->dm->isUninitializedObject($test));
+        }
+
         static::assertInstanceOf(Article::class, $test);
         $wrapped = new MongoDocumentWrapper($test, $this->dm);
 

tests/bootstrap.php

@@ -12,6 +12,7 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\Deprecations\Deprecation;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -45,3 +46,8 @@
 }
 
 Type::addType('uuid', UuidType::class);
+
+// Ignore unfixable deprecations
+Deprecation::ignoreDeprecations(
+    'https://github.com/doctrine-extensions/DoctrineExtensions/pull/2772', // Ignore annotations deprecations from self
+);