Merge pull request #90 from jsampedro77/fix-entity-to-string

Fix entities __toString method by making sure they won't return null.
lexik · Jul 10, 2017 · de9b63c · de9b63c
2 parents 4456ffa + 5610b4d
commit de9b63c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Entity/Email.php b/Entity/Email.php
@@ -121,7 +121,7 @@ public function __construct()
      */
     public function __toString()
     {
-        return $this->reference;
+        return $this->reference?:'';
     }
 
     /**

diff --git a/Entity/EmailTranslation.php b/Entity/EmailTranslation.php
@@ -114,7 +114,7 @@ public function __construct($lang = null)
      */
     public function __toString()
     {
-        return $this->lang;
+        return $this->lang?:'';
     }
 
     /**

diff --git a/Entity/Layout.php b/Entity/Layout.php
@@ -199,7 +199,7 @@ public function getTranslation($lang)
      */
     public function __toString()
     {
-        return $this->reference;
+        return $this->reference?:'';
     }
 
     /**

diff --git a/Entity/LayoutTranslation.php b/Entity/LayoutTranslation.php
@@ -81,7 +81,7 @@ public function __construct($lang = null)
      */
     public function __toString()
     {
-        return $this->lang;
+        return $this->lang?:'';
     }
 
     /**