Use nameof() instead of the deprecated getClassName()

See xp-framework/core#120

Author: thekid

ChangeLog.md

@@ -3,6 +3,12 @@ Data sequences change log
 
 ## ?.?.? / ????-??-??
 
+## 4.1.2 / 2016-01-23
+
+* Fix code to use `nameof()` instead of the deprecated `getClassName()`
+  method from lang.Generic. See xp-framework/core#120
+  (@thekid)
+
 ## 4.1.1 / 2015-12-20
 
 * Added dependencies on collections and unittest libraries which have

src/main/php/util/data/Optional.class.php

@@ -158,9 +158,9 @@ public function equals($cmp) {
    */
   public function toString() {
     if ($this->present) {
-      return $this->getClassName().'@'.Objects::stringOf($this->value);
+      return nameof($this).'@'.Objects::stringOf($this->value);
     } else {
-      return $this->getClassName().'<EMPTY>';
+      return nameof($this).'<EMPTY>';
     }
   }
 }

src/main/php/util/data/Sequence.class.php

@@ -552,9 +552,9 @@ public function equals($cmp) {
    */
   public function toString() {
     if ([] === $this->elements) {
-      return $this->getClassName().'<EMPTY>';
+      return nameof($this).'<EMPTY>';
     } else {
-      return $this->getClassName().'@'.Objects::stringOf($this->elements);
+      return nameof($this).'@'.Objects::stringOf($this->elements);
     }
   }
 }

src/test/php/util/data/unittest/EachTest.class.php

@@ -55,7 +55,7 @@ public function writing_to_console_out() {
     $out= new MemoryOutputStream();
     Console::$out->setStream($out);
 
-    Sequence::of([1, 2, 3, 4])->each('util.cmd.Console::write');
+    Sequence::of([1, 2, 3, 4])->each('util.cmd.Console::write', []);
 
     Console::$out->setStream($orig);    
     $this->assertEquals('1234', $out->getBytes());

src/test/php/util/data/unittest/Employee.class.php

@@ -42,7 +42,7 @@ public function isDinosaur() { return $this->years > 10; }
    * @return string
    */
   public function toString() {
-    return $this->getClassName().'('.
+    return nameof($this).'('.
       'id= '.$this->id.', name= '.$this->name.', department= '.$this->department.', years= '.$this->years.
     ')';
   }

src/test/php/util/data/unittest/Name.class.php

@@ -34,6 +34,6 @@ public function equals($cmp) {
    * @return string
    */
   public function toString() {
-    return $this->getClassName().'('.$this->value.')';
+    return nameof($this).'('.$this->value.')';
   }
 }

src/test/php/util/data/unittest/PeekTest.class.php

@@ -40,7 +40,7 @@ public function writing_to_console_out() {
     $out= new MemoryOutputStream();
     Console::$out->setStream($out);
 
-    Sequence::of([1, 2, 3, 4])->peek('util.cmd.Console::write')->each();
+    Sequence::of([1, 2, 3, 4])->peek('util.cmd.Console::write', [])->each();
 
     Console::$out->setStream($orig);    
     $this->assertEquals('1234', $out->getBytes());