Merge pull request #36 from ahi/patch-1

Fix wrong error message.
appserver-io · Jul 10, 2015 · 2666634 · 2666634
2 parents f46ab0a + 67d3901
commit 2666634
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# Version 1.4.8
+
+## Bugfixes
+
+* Fix wrong classname in InstanceAssertion error message
+
+## Features
+
+* None
 
 # Version 1.4.7
 

diff --git a/build.default.properties b/build.default.properties
@@ -8,7 +8,7 @@
 #--------------------------------------------------------------------------------
 
 # ---- Module Release Settings --------------------------------------------------
-release.version = 1.4.7
+release.version = 1.4.8
 
 # ---- PHPCPD Settings ----------------------------------------------------------
 # Directories

diff --git a/src/Entities/Assertions/InstanceAssertion.php b/src/Entities/Assertions/InstanceAssertion.php
@@ -109,7 +109,7 @@ public function toCode()
                         \'%s must be an instance of %s, %s found instead.\',
                         \'' . str_replace(ReservedKeywords::RESULT, 'The returned object', $this->operand) . '\',
                         \'' . $this->class . '\',
-                        get_class(' . $this->operand . ')
+                        ' . $this->operand . ' === null ? \'null\' : get_class(' . $this->operand . ')
                     );
                 }';
     }