Merge branch '2.14.x' into 3.0.x

* 2.14.x:
  Fix changeset computation for enum arrays (doctrine#10277)
  Psalm 5.2.0 (doctrine#10291)
  Run tools on PHP 8.2 (doctrine#10287)

.github/workflows/coding-standards.yml

@@ -24,4 +24,4 @@ on:
 
 jobs:
  coding-standards:
- uses: "doctrine/.github/.github/workflows/coding-standards.yml@2.1.0"
+ uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0"

.github/workflows/release-on-milestone-closed.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
  release:
- uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@2.1.0"
+ uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.0.0"
  secrets:
  GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
  GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -1,4 +1,4 @@
-name: Static Analysis
+name: "Static Analysis"
 
 on:
  pull_request:
@@ -43,7 +43,7 @@ jobs:
  uses: shivammathur/setup-php@v2
  with:
  coverage: none
- php-version: "8.1"
+ php-version: "8.2"
  tools: cs2pr
 
  - name: Require specific DBAL version
@@ -74,7 +74,7 @@ jobs:
  uses: shivammathur/setup-php@v2
  with:
  coverage: none
- php-version: "8.1"
+ php-version: "8.2"
  tools: cs2pr
 
  - name: Require specific DBAL version

composer.json

@@ -44,7 +44,7 @@
  "squizlabs/php_codesniffer": "3.7.1",
  "symfony/cache": "^5.4 || ^6.0",
  "symfony/var-exporter": "^5.4 || ^6.2",
- "vimeo/psalm": "5.1.0"
+ "vimeo/psalm": "5.2.0"
  },
  "suggest": {
  "ext-dom": "Provides support for XSD validation for XML mapping files",

lib/Doctrine/ORM/UnitOfWork.php

@@ -638,8 +638,18 @@ public function computeChangeSet(ClassMetadata $class, object $entity): void
 
  $orgValue = $originalData[$propName];
 
- if ($orgValue instanceof BackedEnum) {
- $orgValue = $orgValue->value;
+ if (! empty($class->fieldMappings[$propName]['enumType'])) {
+ if (is_array($orgValue)) {
+ foreach ($orgValue as $id => $val) {
+ if ($val instanceof BackedEnum) {
+ $orgValue[$id] = $val->value;
+ }
+ }
+ } else {
+ if ($orgValue instanceof BackedEnum) {
+ $orgValue = $orgValue->value;
+ }
+ }
  }
 
  // skip if value haven't changed
@@ -698,6 +708,7 @@ public function computeChangeSet(ClassMetadata $class, object $entity): void
  }
 
  if ($orgValue !== null && $assoc['orphanRemoval']) {
+ assert(is_object($orgValue));
  $this->scheduleOrphanRemoval($orgValue);
  }
  }

phpstan-baseline.neon

@@ -300,6 +300,11 @@ parameters:
  count: 3
  path: lib/Doctrine/ORM/Query/Parser.php
 
+ -
+ message: "#^Access to an undefined property Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node\\:\\:\\$pathExpression\\.$#"
+ count: 1
+ path: lib/Doctrine/ORM/Query/SqlWalker.php
+
  -
  message: "#^Call to function is_string\\(\\) with Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node will always evaluate to false\\.$#"
  count: 1

phpstan-params.neon

@@ -8,4 +8,4 @@ parameters:
  earlyTerminatingMethodCalls:
  Doctrine\ORM\Query\Parser:
  - syntaxError
- phpVersion: 80100
+ phpVersion: 80200

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.1.0@4defa177c89397c5e14737a80fe4896584130674">
+<files psalm-version="5.2.0@fb685a16df3050d4c18d8a4100fe83abe6458cba">
  <file src="lib/Doctrine/ORM/AbstractQuery.php">
  <FalsableReturnStatement occurrences="1">
  <code>! $filteredParameters-&gt;isEmpty() ? $filteredParameters-&gt;first() : null</code>

psalm.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <psalm
  errorLevel="2"
- phpVersion="8.1"
+ phpVersion="8.2"
  resolveFromConfigFile="true"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xmlns="https://getpsalm.org/schema/config"

tests/Doctrine/Tests/ORM/Functional/EnumTest.php

@@ -298,6 +298,28 @@ public function testEnumChangeSetsObjectHydrator(): void
  self::assertFalse($this->_em->getUnitOfWork()->isScheduledForUpdate($result[0]));
  }
 
+ public function testEnumArrayChangeSets(): void
+ {
+ $this->setUpEntitySchema([Scale::class]);
+
+ $scale = new Scale();
+ $scale->supportedUnits = [Unit::Gram];
+
+ $this->_em->persist($scale);
+ $this->_em->flush();
+ $this->_em->clear();
+
+ $result = $this->_em->createQueryBuilder()
+ ->from(Scale::class, 's')
+ ->select('s')
+ ->getQuery()
+ ->getResult();
+
+ $this->_em->getUnitOfWork()->computeChangeSets();
+
+ self::assertFalse($this->_em->getUnitOfWork()->isScheduledForUpdate($result[0]));
+ }
+
  public function testFindByEnum(): void
  {
  $this->setUpEntitySchema([Card::class]);