Merge branch '2.18.x' into 3.0.x

* 2.18.x: Add compatibility with the Symfony 4.4 VarExporter (#10948) PHPStan 5.16.0, Symfony 7.0 (#11095)
doctrine · Dec 1, 2023 · 28d03e4 · 28d03e4
2 parents f8ced51 + 23d36c0
commit 28d03e4
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -42,8 +42,8 @@
         "phpunit/phpunit": "^10.4.0",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.2",
-        "symfony/cache": "^5.4 || ^6.2",
-        "vimeo/psalm": "5.15.0"
+        "symfony/cache": "^5.4 || ^6.2 || ^7.0",
+        "vimeo/psalm": "5.16.0"
     },
     "minimum-stability": "RC",
     "suggest": {

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
   <file src="lib/Doctrine/ORM/AbstractQuery.php">
     <FalsableReturnStatement>
       <code><![CDATA[! $filteredParameters->isEmpty() ? $filteredParameters->first() : null]]></code>
@@ -723,15 +723,6 @@
       <code><![CDATA[$this->currentPersisterContext->sqlTableAliases]]></code>
     </PropertyTypeCoercion>
   </file>
-  <file src="lib/Doctrine/ORM/Proxy/DefaultProxyClassNameResolver.php">
-    <LessSpecificReturnStatement>
-      <code>$className</code>
-      <code>substr($className, $pos + Proxy::MARKER_LENGTH + 2)</code>
-    </LessSpecificReturnStatement>
-    <MoreSpecificReturnType>
-      <code>string</code>
-    </MoreSpecificReturnType>
-  </file>
   <file src="lib/Doctrine/ORM/Proxy/Autoloader.php">
     <ArgumentTypeCoercion>
       <code>$autoloader</code>
@@ -746,6 +737,15 @@
       <code>require $file</code>
     </UnresolvableInclude>
   </file>
+  <file src="lib/Doctrine/ORM/Proxy/DefaultProxyClassNameResolver.php">
+    <LessSpecificReturnStatement>
+      <code>$className</code>
+      <code>substr($className, $pos + Proxy::MARKER_LENGTH + 2)</code>
+    </LessSpecificReturnStatement>
+    <MoreSpecificReturnType>
+      <code>string</code>
+    </MoreSpecificReturnType>
+  </file>
   <file src="lib/Doctrine/ORM/Proxy/ProxyFactory.php">
     <ArgumentTypeCoercion>
       <code>$classMetadata</code>

diff --git a/tests/Doctrine/Tests/ORM/Functional/ParserResultSerializationTest.php b/tests/Doctrine/Tests/ORM/Functional/ParserResultSerializationTest.php
@@ -85,6 +85,25 @@ public static function provideSerializedSingleSelectResults(): Generator
         yield '2.17.0' => [rtrim(file_get_contents(__DIR__ . '/ParserResults/single_select_2_17_0.txt'), "\n")];
     }
 
+    public function testSymfony44ProvidedData(): void
+    {
+        $sqlExecutor      = $this->createMock(SingleSelectExecutor::class);
+        $resultSetMapping = $this->createMock(ResultSetMapping::class);
+
+        $parserResult = new ParserResult();
+        $parserResult->setSqlExecutor($sqlExecutor);
+        $parserResult->setResultSetMapping($resultSetMapping);
+        $parserResult->addParameterMapping('name', 0);
+
+        $exported     = VarExporter::export($parserResult);
+        $unserialized = eval('return ' . $exported . ';');
+
+        $this->assertInstanceOf(ParserResult::class, $unserialized);
+        $this->assertInstanceOf(ResultSetMapping::class, $unserialized->getResultSetMapping());
+        $this->assertEquals(['name' => [0]], $unserialized->getParameterMappings());
+        $this->assertInstanceOf(SingleSelectExecutor::class, $unserialized->getSqlExecutor());
+    }
+
     private static function parseQuery(Query $query): ParserResult
     {
         $r = new ReflectionMethod($query, 'parse');