Merge pull request #10654 from mpdude/join-column-does-not-make-it-own

Deprecate usage of `@JoinColumn` on the inverse side of one-to-one associations

Author: greg0ire

UPGRADE.md

@@ -1,5 +1,12 @@
 # Upgrade to 2.15
 
+## Deprecated configuring `JoinColumn` on the inverse side of one-to-one associations
+
+For one-to-one associations, the side using the `mappedBy` attribute is the inverse side.
+The owning side is the entity with the table containing the foreign key. Using `JoinColumn`
+configuration on the _inverse_ side now triggers a deprecation notice and will be an error
+in 3.0.
+
 ## Deprecated overriding fields or associations not declared in mapped superclasses
 
 As stated in the documentation, fields and associations may only be overridden when being inherited

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

@@ -1864,6 +1864,14 @@ protected function _validateAndCompleteOneToOneMapping(array $mapping)
     {
         $mapping = $this->_validateAndCompleteAssociationMapping($mapping);
 
+        if (isset($mapping['joinColumns']) && $mapping['joinColumns'] && ! $mapping['isOwningSide']) {
+            Deprecation::trigger(
+                'doctrine/orm',
+                'https://github.com/doctrine/orm/pull/10654',
+                'JoinColumn configuration is not allowed on the inverse side of one-to-one associations, and will throw a MappingException in Doctrine ORM 3.0'
+            );
+        }
+
         if (isset($mapping['joinColumns']) && $mapping['joinColumns']) {
             $mapping['isOwningSide'] = true;
         }