Merge branch '2.x' into update-test-matrix

Author: mpdude

.github/workflows/dependencies.yml

@@ -0,0 +1,36 @@
+name: AllDependenciesDeclared
+
+on:
+    push:
+        branches:
+            - master
+    pull_request:
+
+env:
+    PHP_VERSION: 8.4
+
+jobs:
+    composer-require-checker:
+        name: Check missing composer requirements
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Configure PHP version
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ env.PHP_VERSION }}
+                    coverage: none
+                    tools: composer:v2
+            -   uses: actions/checkout@v4
+            -   name: Cache Composer Dependencies
+                uses: actions/cache@v4
+                with:
+                    path: vendor/
+                    key: composer-${{ env.PHP_VERSION }}-${{ hashFiles('composer.*') }}
+                    restore-keys: |
+                        composer-${{ env.PHP_VERSION }}-${{ github.ref }}
+                        composer-${{ env.PHP_VERSION }}-
+            -   run: |
+                    composer update --no-interaction --no-scripts --no-progress
+                    composer show
+            -   name: ComposerRequireChecker
+                uses: docker://ghcr.io/webfactory/composer-require-checker:4.12.0

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 This changelog tracks deprecations and changes breaking backwards compatibility. For more details on particular releases, consult the [GitHub releases page](https://github.com/webfactory/doctrine-orm-test-infrastructure/releases).
 
+# Version 2.0
+
+- The `ORMInfrastructure::create*()` methods by default read ORM mapping configuration through PHP attributes; annotations support has been removed in https://github.com/webfactory/doctrine-orm-test-infrastructure/pull/55/. You can, however, still create an instance of the `AnnotationDriver` mapping driver yourself (when using ORM 2.0) and pass it into these methods.
+- `\Webfactory\Doctrine\ORMTestInfrastructure\ORMInfrastructure::__construct()` is now a private method. Use the `::create*` methods to instantiate the `ORMInfrastructure`.
+- The `\Webfactory\Doctrine\ORMTestInfrastructure\Query::getExecutionTimeInSeconds()` method has been removed.
+- The `DetachingObjectManagerDecorator` and `MemorizingObjectManagerDecorator` classes have been removed.
+
 # Version 1.16
 
 - The `\Webfactory\Doctrine\ORMTestInfrastructure\Query::getExecutionTimeInSeconds()` method has been deprecated without replacement in https://github.com/webfactory/doctrine-orm-test-infrastructure/pull/52, to prepare for the removal of the `DebugStack` class in Doctrine DBAL 4.0.

README.md

@@ -89,12 +89,11 @@ class MyEntityRepositoryTest extends TestCase
 }
 ```
 
-Migrating to attribute-based mapping configuration
---------------------------------------------------
+Migrating to attribute-based mapping configuration (with version 1.x)
+---------------------------------------------------------------------
 
-The `ORMInfrastructure::createWithDependenciesFor()` and `ORMInfrastructure::createOnlyFor()` methods by default
-assume that the Doctrine ORM mapping is provided through annotations. This has been deprecated in Doctrine ORM 2.x
-and is no longer be supported in ORM 3.0.
+In versions 1.x of this library, the `ORMInfrastructure::createWithDependenciesFor()` and `ORMInfrastructure::createOnlyFor()` methods
+by default assume that the Doctrine ORM mapping is provided through annotations. Annotations-based configuration is no supported anymore in ORM 3.0.
 
 To allow for a seamless transition towards attribute-based or other types of mapping, a mapping driver can be passed
 when creating instances of the `ORMInfrastructure`.
@@ -106,6 +105,8 @@ For hybrid (annotations and attributes) mapping configurations, you can use `\Do
 Multiple mapping drivers can be registered on the driver chain by providing namespace prefixes. For every namespace prefix,
 only one mapping driver can be used.
 
+Starting in version 2.0.0, attributes-based mapping will be the default.
+
 Testing the library itself
 --------------------------
 

composer.json

@@ -16,20 +16,20 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
-        "doctrine/annotations": "^1.8|^2.0",
+        "php": "^8.0",
         "doctrine/common": "^2.11|^3.0",
-        "doctrine/dbal": "^2.12|^3.0",
+        "doctrine/dbal": "^3.2",
+        "doctrine/deprecations": "^1.1",
         "doctrine/event-manager": "^1.1|^2.0",
         "doctrine/orm": "^2.14|^3.0",
         "doctrine/persistence": "^2.0|^3.0",
-        "symfony/cache": "^5.0|^6.0|^7.0",
-        "symfony/deprecation-contracts": "^2.0|^3.0"
+        "psr/log": "^2.0|^3.0",
+        "symfony/cache": "^5.0|^6.0|^7.0"
     },
     "require-dev": {
         "doctrine/collections": "^1.6.8|^2.2.1",
-        "phpunit/phpunit": "^9.6.19",
-        "symfony/phpunit-bridge": "^6.0|^7.0"
+        "phpunit/phpunit": "^10.5",
+        "symfony/error-handler": "^5.4|^6.0|^7.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd" bootstrap="vendor/autoload.php">
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    bootstrap="tests/bootstrap.php"
+    colors="true"
+    displayDetailsOnAllIssues="true"
+>
+    <source ignoreSuppressionOfDeprecations="true">
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
     <testsuites>
         <testsuite name="Library Test Suite">
             <directory>tests/</directory>
@@ -8,11 +19,7 @@
     <php>
         <server name="KERNEL_CLASS" value="Webfactory\Bundle\PolyglotBundle\Tests\Fixtures\TestKernel" />
         <server name="KERNEL_DIR" value="tests/Fixtures/" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
         <env name="DOCTRINE_DEPRECATIONS" value="trigger" />
         <server name="SHELL_VERBOSITY" value="-1" />
     </php>
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
 </phpunit>

src/ORMTestInfrastructure/ConfigurationFactory.php

@@ -9,11 +9,7 @@
 
 namespace Webfactory\Doctrine\ORMTestInfrastructure;
 
-use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\PsrCachedReader;
-use Doctrine\Common\Annotations\Reader;
 use Doctrine\Deprecations\Deprecation;
-use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use Doctrine\ORM\ORMSetup;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
@@ -27,16 +23,6 @@
  */
 class ConfigurationFactory
 {
-    /**
-     * Shared annotation reader or null, if not created yet.
-     *
-     * A shared reader is used for performance reasons. As annotations cannot
-     * change during a test run, it is save to use a shared reader.
-     *
-     * @var Reader|null
-     */
-    protected static $defaultAnnotationReader = null;
-
     /** @var ?CacheItemPoolInterface */
     private static $metadataCache = null;
 
@@ -78,15 +64,6 @@ private function createDefaultMappingDriver(array $entityClasses)
     {
         $paths = $this->getDirectoryPathsForClassNames($entityClasses);
 
-        if (class_exists(AnnotationDriver::class)) {
-            Deprecation::trigger(
-                'webfactory/doctrine-orm-test-infrastructure',
-                'https://github.com/webfactory/doctrine-orm-test-infrastructure/pull/54',
-                'Since the AnnotationDriver has been removed in ORM 3.0, using annotation-based mapping as the default has been deprecated in 1.16. In 2.0, attribute-based configuration will be the new default. Either upgrade doctrine/orm to >=3.0 or pass a mapping driver when calling `ORMInfrastructure::create*()` methods to make this notice go away.'
-            );
-            return new AnnotationDriver($this->getAnnotationReader(), $paths);
-        }
-
         return new AttributeDriver($paths);
     }
 
@@ -116,18 +93,4 @@ protected function getDirectoryPathForClassName($className)
         $info = new \ReflectionClass($className);
         return dirname($info->getFileName());
     }
-
-    /**
-     * Returns the default annotation reader and creates it if necessary.
-     *
-     * @return Reader|AnnotationReader
-     */
-    protected function getAnnotationReader()
-    {
-        if (static::$defaultAnnotationReader === null) {
-            static::$defaultAnnotationReader = new PsrCachedReader(new AnnotationReader(), new ArrayAdapter());
-        }
-
-        return static::$defaultAnnotationReader;
-    }
 }

src/ORMTestInfrastructure/DetachingObjectManagerDecorator.php

@@ -160,12 +160,10 @@ protected function importFromFile($path)
      */
     protected function importFromCallback($callback)
     {
-        $import = function (ObjectManager $objectManager) use ($callback) {
-            $decorator = new MemorizingObjectManagerDecorator($objectManager);
-            call_user_func($callback, $decorator);
-            return $decorator->getSeenEntities();
-        };
-        $this->entityManager->wrapInTransaction($import);
+        $this->entityManager->wrapInTransaction(function (ObjectManager $objectManager) use ($callback) {
+            call_user_func($callback, $objectManager);
+        });
+
         // Clear the entity manager to ensure that there are no leftovers in the identity map.
         $this->entityManager->clear();
     }