Merge pull request #835 from doctrine/prepare-release

test with php 8.2

Author: dbu

.github/workflows/test-application.yaml

@@ -33,6 +33,7 @@ jobs:
                     - '7.4'
                     - '8.0'
                     - '8.1'
+                    - '8.2'
                 dependencies: [highest]
                 symfony-version: ['*']
                 include:

CHANGELOG.md

@@ -4,6 +4,12 @@ Changelog
 1.x
 ===
 
+1.7.1
+-----
+
+* Test with PHP 8.2
+* Allow installation with Doctrine Annotations 2, Collections 2 and EventManager 2.
+
 1.7.0
 -----
 

lib/Doctrine/ODM/PHPCR/DocumentManager.php

@@ -106,6 +106,11 @@ class DocumentManager implements DocumentManagerInterface
      */
     protected $localeChooserStrategy;
 
+    /**
+     * @var ValueConverter
+     */
+    private $valueConverter;
+
     public function __construct(SessionInterface $session, Configuration $config = null, EventManager $evm = null)
     {
         $this->session = $session;

lib/Doctrine/ODM/PHPCR/Query/Builder/ConstraintChild.php

@@ -10,6 +10,16 @@
  */
 class ConstraintChild extends AbstractLeafNode
 {
+    /**
+     * @var string
+     */
+    private $alias;
+
+    /**
+     * @var string
+     */
+    private $parentPath;
+
     public function __construct(AbstractNode $parent, $alias, $parentPath)
     {
         $this->alias = $alias;

tests/Doctrine/Tests/ODM/PHPCR/Functional/CascadePersistTest.php

@@ -21,7 +21,7 @@ class CascadePersistTest extends PHPCRFunctionalTestCase
     public function setUp(): void
     {
         $this->dm = $this->createDocumentManager([__DIR__]);
-        $this->node = $this->resetFunctionalNode($this->dm);
+        $this->resetFunctionalNode($this->dm);
 
         $class = $this->dm->getClassMetadata(CmsUser::class);
         $class->mappings['groups']['cascade'] = ClassMetadata::CASCADE_PERSIST;

tests/Doctrine/Tests/ODM/PHPCR/Functional/CascadeRefreshTest.php

@@ -19,7 +19,7 @@ class CascadeRefreshTest extends PHPCRFunctionalTestCase
     public function setUp(): void
     {
         $this->dm = $this->createDocumentManager([__DIR__]);
-        $this->node = $this->resetFunctionalNode($this->dm);
+        $this->resetFunctionalNode($this->dm);
 
         $class = $this->dm->getClassMetadata(CmsUser::class);
         $class->mappings['groups']['cascade'] = ClassMetadata::CASCADE_REFRESH;

tests/Doctrine/Tests/ODM/PHPCR/Functional/CascadeRemoveTest.php

@@ -19,7 +19,7 @@ class CascadeRemoveTest extends PHPCRFunctionalTestCase
     public function setUp(): void
     {
         $this->dm = $this->createDocumentManager([__DIR__]);
-        $this->node = $this->resetFunctionalNode($this->dm);
+        $this->resetFunctionalNode($this->dm);
 
         $class = $this->dm->getClassMetadata(CmsUser::class);
         $class->mappings['groups']['cascade'] = ClassMetadata::CASCADE_REMOVE;

tests/Doctrine/Tests/ODM/PHPCR/Functional/ChangesetCalculationTest.php

@@ -27,7 +27,7 @@ public function setUp(): void
         $this->listener = new ChangesetListener();
         $this->dm = $this->createDocumentManager();
         $this->dm->setLocaleChooserStrategy(new LocaleChooser(['en' => ['fr'], 'fr' => ['en']], 'en'));
-        $this->node = $this->resetFunctionalNode($this->dm);
+        $this->resetFunctionalNode($this->dm);
     }
 
     public function testComputeChangeset()

tests/Doctrine/Tests/ODM/PHPCR/Functional/EventComputingTest.php

@@ -149,7 +149,7 @@ public function testComputingBetweenEventsWithTranslation(): void
         // name has been changed when translation was updated
         $this->assertEquals('preUpdateTranslation', $user->name);
 
-        $this->dm->name = 'neuer Name';
+        $user->name = 'neuer Name';
         $this->dm->bindTranslation($user, 'de');
 
         $this->dm->flush();

tests/Doctrine/Tests/ODM/PHPCR/Functional/EventObjectUpdateTest.php

@@ -24,7 +24,6 @@ public function setUp(): void
     {
         $this->listener = new TestEventDocumentChanger2();
         $this->dm = $this->createDocumentManager();
-        $this->node = $this->resetFunctionalNode($this->dm);
     }
 
     public function testComputingBetweenEvents(): void