From cbdc912cf14a51b52a42bb13585bf5b98820eea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Mon, 9 May 2022 22:59:17 +0200
Subject: [PATCH 1/2] fix headings

---
 UPGRADE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 9cd5b56ee78..d9f3081994a 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,6 +1,6 @@
 # Upgrade to 2.13
 
-# Deprecated methods related to named queries
+## Deprecated methods related to named queries
 
 The following methods have been deprecated:
 
@@ -9,7 +9,7 @@ The following methods have been deprecated:
 - `Doctrine\ORM\Query\ResultSetMappingBuilder::addNamedNativQueryResultSetMapping()`
 - `Doctrine\ORM\Query\ResultSetMappingBuilder::addNamedNativQueryEntityResultMapping()`
 
-# Deprecated classes related to Doctrine 1 and reverse engineering
+## Deprecated classes related to Doctrine 1 and reverse engineering
 
 The following classes have been deprecated:
 

From 37e664d1bc5954deca913e225cdd2635b4e27ddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Mon, 9 May 2022 22:51:11 +0200
Subject: [PATCH 2/2] Deprecate omitting second argument to joinColumnName()

---
 UPGRADE.md                                    | 41 +++++++++++++++++++
 .../ORM/Mapping/DefaultNamingStrategy.php     |  3 ++
 lib/Doctrine/ORM/Mapping/NamingStrategy.php   |  2 +-
 .../ORM/Mapping/UnderscoreNamingStrategy.php  |  3 ++
 4 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index d9f3081994a..856c6a8709e 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,5 +1,46 @@
 # Upgrade to 2.13
 
+## Deprecated omitting second argument to `NamingStrategy::joinColumnName`
+
+When implementing `NamingStrategy`, it is deprecated to implement
+`joinColumnName()` with only one argument.
+
+### Before
+
+```php
+<?php
+class MyStrategy implements NamingStrategy
+{
+    /**
+     * @param string $propertyName A property name.
+     */
+    public function joinColumnName($propertyName): string
+    {
+        // …
+    }
+}
+```
+
+### After
+
+For backward-compatibility reasons, the parameter has to be optional, but can
+be documented as guaranteed to be a `class-string`.
+
+```php
+<?php
+class MyStrategy implements NamingStrategy
+{
+    /**
+     * @param string       $propertyName A property name.
+     * @param class-string $className
+     */
+    public function joinColumnName($propertyName, $className = null): string
+    {
+        // …
+    }
+}
+```
+
 ## Deprecated methods related to named queries
 
 The following methods have been deprecated:
diff --git a/lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php b/lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php
index 65bb72092c7..a0f17f83028 100644
--- a/lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php
+++ b/lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php
@@ -54,6 +54,9 @@ public function referenceColumnName()
 
     /**
      * {@inheritdoc}
+     *
+     * @param string       $propertyName
+     * @param class-string $className
      */
     public function joinColumnName($propertyName, $className = null)
     {
diff --git a/lib/Doctrine/ORM/Mapping/NamingStrategy.php b/lib/Doctrine/ORM/Mapping/NamingStrategy.php
index bdc79c6be59..3fce7e2c12e 100644
--- a/lib/Doctrine/ORM/Mapping/NamingStrategy.php
+++ b/lib/Doctrine/ORM/Mapping/NamingStrategy.php
@@ -56,7 +56,7 @@ public function referenceColumnName();
      *
      * @return string A join column name.
      */
-    public function joinColumnName($propertyName);
+    public function joinColumnName($propertyName/*, $className = null */);
 
     /**
      * Returns a join table name.
diff --git a/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php b/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
index 83473aa329b..83ffa5ff9ad 100644
--- a/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
+++ b/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
@@ -112,6 +112,9 @@ public function referenceColumnName()
 
     /**
      * {@inheritdoc}
+     *
+     * @param string       $propertyName
+     * @param class-string $className
      */
     public function joinColumnName($propertyName, $className = null)
     {