Replace xp::stringOf() with util.Objects::stringOf()

Author: thekid

src/main/php/rdbms/Criteria.class.php

@@ -1,9 +1,10 @@
 <?php namespace rdbms;
 
-use rdbms\criterion\SimpleExpression;
-use rdbms\criterion\Projections;
-use rdbms\criterion\ProjectionList;
 use rdbms\criterion\Criterion;
+use rdbms\criterion\ProjectionList;
+use rdbms\criterion\Projections;
+use rdbms\criterion\SimpleExpression;
+use util\Objects;
 
 define('ASCENDING',       'asc');
 define('DESCENDING',      'desc');
@@ -169,7 +170,7 @@ public function setFetchmode(\rdbms\join\Fetchmode $fetchmode) {
   public function toString() {
     $s= nameof($this)."@{\n";
     foreach ($this->conditions as $condition) {
-      $s.= '  '.\xp::stringOf($condition)."\n";
+      $s.= '  '.Objects::stringOf($condition)."\n";
     }
     return $s.'}';
   }

src/main/php/rdbms/DBEvent.class.php

@@ -1,5 +1,7 @@
 <?php namespace rdbms;
 
+use util\Objects;
+
 /**
  * Generic DB event.
  *
@@ -68,6 +70,6 @@ public function getArgument() {
    * @return  string
    */
   public function toString() {
-    return nameof($this).'('.$this->name.') {'.\xp::stringOf($this->arg).'}';
+    return nameof($this).'('.$this->name.') {'.Objects::stringOf($this->arg).'}';
   }
 }

src/main/php/rdbms/DataSet.class.php

@@ -1,7 +1,7 @@
 <?php namespace rdbms;
 
-use rdbms\join\JoinExtractable;
 use lang\Value;
+use rdbms\join\JoinExtractable;
 use util\Objects;
 
 /**
@@ -255,7 +255,7 @@ public function toString() {
         $key,
         (in_array($key, $peer->primary) ? 'PK' : ''), 
         ($key == $peer->identity ? ',I' : ''),
-        \xp::stringOf($this->$key)
+        Objects::stringOf($this->$key)
       )."\n";
     }
     return $s.'}';

src/main/php/rdbms/DriverManager.class.php

@@ -1,5 +1,7 @@
 <?php namespace rdbms;
 
+use util\Objects;
+
 /**
  * Manages database drivers
  *
@@ -155,7 +157,7 @@ public static function getConnection($dsn) {
           throw new DriverNotSupportedException(sprintf(
             'No driver registered for "%s" or provided by any of %s',
             $driver,
-            \xp::stringOf($provider)
+            Objects::stringOf($provider)
           ));
         } while (0);
       }

src/main/php/rdbms/ResultSet.class.php

@@ -1,7 +1,8 @@
 <?php namespace rdbms;
 
-use util\TimeZone;
 use lang\Closeable;
+use util\Objects;
+use util\TimeZone;
 
 /**
  * Result set as returned from the DBConnection::query method
@@ -84,7 +85,7 @@ public function getIterator() {
    * @return  string
    */
   public function toString() {
-    return nameof($this).'('.\xp::stringOf($this->handle).')@'.\xp::stringOf($this->fields);
+    return nameof($this).'('.Objects::stringOf($this->handle).')@'.Objects::stringOf($this->fields);
   }
 
   /**

src/main/php/rdbms/SQLFunction.class.php

@@ -1,5 +1,7 @@
 <?php namespace rdbms;
 
+use util\Objects;
+
 /**
  * Represents an SQL standard procedure
  */
@@ -84,6 +86,6 @@ public function getType() {
    * @return  string
    */
   public function toString() {
-    return nameof($this).'<'.$this->type.' '.$this->func.' ('.\xp::stringOf($this->args).')>';
+    return nameof($this).'<'.$this->type.' '.$this->func.' ('.Objects::stringOf($this->args).')>';
   }
 }

src/main/php/rdbms/criterion/SimpleExpression.class.php

@@ -3,6 +3,7 @@
 use rdbms\DBConnection;
 use rdbms\Peer;
 use rdbms\SQLFragment;
+use util\Objects;
 
 /**
  * Simple expression
@@ -77,9 +78,9 @@ public function toString() {
     return sprintf(
       '%s({%s %s} %% %s)',
       nameof($this),
-      \xp::stringOf($this->lhs),
+      Objects::stringOf($this->lhs),
       $this->op,
-      \xp::stringOf($this->value)
+      Objects::stringOf($this->value)
     );
   }
 

src/main/php/rdbms/mysqlx/MySqlxProtocol.class.php

@@ -3,6 +3,7 @@
 use peer\ProtocolException;
 use peer\Socket;
 use util\Date;
+use util\Objects;
 
 /**
  * MySQL protocol implementation
@@ -488,6 +489,6 @@ public function hashCode() {
    * @return  string
    */
   public function toString() {
-    return nameof($this).'(stream= '.\xp::stringOf($this->sock).', thread= '.$this->thread.', packet= '.$this->pkt.')';
+    return nameof($this).'(stream= '.Objects::stringOf($this->sock).', thread= '.$this->thread.', packet= '.$this->pkt.')';
   }
 }

src/main/php/rdbms/tds/TdsProtocol.class.php

@@ -2,6 +2,7 @@
 
 use peer\ProtocolException;
 use peer\Socket;
+use util\Objects;
 
 /**
  * TDS protocol implementation
@@ -673,6 +674,6 @@ public function close() {
    * @return  string
    */
   public function toString() {
-    return nameof($this).'('.\xp::stringOf($this->stream).')';
+    return nameof($this).'('.Objects::stringOf($this->stream).')';
   }
 }

src/main/php/rdbms/util/DBConstraintXmlGenerator.class.php

@@ -2,9 +2,11 @@
 
 use lang\System;
 use rdbms\DBTable;
+use util\Objects;
 use util\log\Traceable;
 use xml\Tree;
 
+
 /**
  * Generate the relation map of a database
  *
@@ -61,7 +63,7 @@ public function getTree() {
 
       if ($constraint= $t->getFirstForeignKeyConstraint()) do {
         if (isset($constKeyList[$this->constraintKey($constraint)])) {
-          $this->cat && $this->cat->warn($t->name, 'has a double constraint'."\n".\xp::stringOf($constraint));
+          $this->cat && $this->cat->warn($t->name, 'has a double constraint'."\n".Objects::stringOf($constraint));
           continue;
         }
         $constKeyList[$this->constraintKey($constraint)]= true;