Replace xp::typeOf() with typeof()

xp-framework · May 20, 2017 · 7a51006 · 7a51006
1 parent 1b869de
commit 7a51006
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,8 @@ language: php
 
 sudo: false
 
+dist: trusty
+
 services:
   - mysql
   - postgresql

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -3,6 +3,12 @@ RDBMS support for the XP Framework: MySQL, Sybase, MSSQL, PostgreSQL, SQLite3, I
 
 ## ?.?.? / ????-??-??
 
+## 9.0.8 / 2017-05-20
+
+* Refactored code to use `typeof()` instead of `xp::typeOf()`, see
+  https://github.com/xp-framework/rfc/issues/323
+  (@thekid)
+
 ## 9.0.7 / 2017-03-23
 
 * Merged PR #38: Catch null value (PostgreSQL) - @treuter

diff --git a/src/main/php/rdbms/ProfilingObserver.class.php b/src/main/php/rdbms/ProfilingObserver.class.php
@@ -4,7 +4,7 @@
 use util\log\Logger;
 use util\log\Traceable;
 use util\profiling\Timer;
-
+use lang\IllegalArgumentException;
 
 /**
  * Profiling database observer
@@ -69,7 +69,7 @@ public function typeOf($sql) {
    */
   public function update($obs, $arg= null) {
     if (!$obs instanceof DBConnection) {
-      throw new \lang\IllegalArgumentException('Argument 1 must be instanceof "rdbms.DBConnection", "'.\xp::typeOf($obs).'" given.');
+      throw new IllegalArgumentException('Argument 1 must be instanceof "rdbms.DBConnection", "'.typeof($obs)->getName().'" given.');
     }
     if (!$arg instanceof DBEvent) return;