From 04e494060750a4792e1797f41ba8a42f00d46c51 Mon Sep 17 00:00:00 2001
From: flip111 <flip101@gmail.com>
Date: Tue, 13 Jan 2015 19:59:07 +0100
Subject: [PATCH] Update ORMInvalidArgumentException.php

`@return self` trend break with `@return ORMInvalidArgumentException`
---
 .../ORM/ORMInvalidArgumentException.php       | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/lib/Doctrine/ORM/ORMInvalidArgumentException.php b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
index ffd85ef0a..526efdc5b 100644
--- a/lib/Doctrine/ORM/ORMInvalidArgumentException.php
+++ b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
@@ -187,6 +187,28 @@ class ORMInvalidArgumentException extends \InvalidArgumentException
         return new self("Binding entities to query parameters only allowed for entities that have an identifier.");
     }
 
+    /**
+     * @param object $relation
+     * @param string $fieldname
+     * @param mixed $value
+     * @return self
+     */
+    public static function invalidAssociation($relation, $fieldname, $value)
+    {
+        return new self(sprintf('Expected an Object for relation %s::%s got %s instead.', get_class($relation), $fieldname, gettype($value)));
+    }
+
+    /**
+     * @param mixed $entry
+     * @return self
+     */
+    public static function invalidAssociation($entry)
+    {
+        $ex = new self(gettype($entry) . (is_scalar($entry) ? ' "'.$entry.'"': '') . ' is not an Object.');
+        $ex->value = $entry;
+        return $ex;
+    }
+
     /**
      * Helper method to show an object as string.
      *
@@ -198,20 +220,4 @@ class ORMInvalidArgumentException extends \InvalidArgumentException
     {
         return method_exists($obj, '__toString') ? (string)$obj : get_class($obj).'@'.spl_object_hash($obj);
     }
-
-    /**
-     * @return ORMInvalidArgumentException
-     */
-    public static function invalidAssociation($relation, $fieldname, $value) {
-        return new self('Expected an Object for relation '.get_class($relation).'::'.$fieldname.' got '.gettype($value).' instead.');
-    }
-
-    /**
-     * @return ORMInvalidArgumentException
-     */
-    public static function invalidAssociation($entry) {
-        $ex = new self(gettype($entry) . ' is not an Object.');
-        $ex->value = $entry;
-        return $ex;
-    }
 }