add more tests; add countable interface

ludicruz · bobthecow · commit 4d35578cb0a7 · 2022-06-26T14:31:17.000-04:00
diff --git a/src/Ruler/Set.php b/src/Ruler/Set.php
@@ -19,7 +19,7 @@
  *
  * @author Justin Hileman <justin@justinhileman.info>
  */
-class Set extends Value
+class Set extends Value implements \Countable
 {
     /**
      * Set constructor.
@@ -43,14 +43,18 @@ public function __construct($set)
             if (is_array($value)) {
                 $value = new Set($value);
             } elseif (is_object($value)) {
-                $reflect = new \ReflectionObject($value);
-                if (!$reflect->hasMethod('__toString')) {
+                if (!method_exists($value, '__toString')) {
                     $value = new Value($value);
                 }
             }
         }
 
         $this->value = array_unique($this->value);
+        foreach ($this->value as &$value) {
+            if ($value instanceof Value && !$value instanceof Set) {
+                $value = $value->getValue();
+            }
+        }
     }
 
     /**
@@ -243,4 +247,12 @@ protected function isValidNumericSet()
     {
         return count($this->value) == array_sum(array_map('is_numeric', $this->value));
     }
+
+    /**
+     * @return integer
+     */
+    public function count()
+    {
+        return count($this->value);
+    }
 }
diff --git a/tests/Ruler/Test/Fixtures/toStringable.php b/tests/Ruler/Test/Fixtures/toStringable.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Ruler\Test\Fixtures;
+
+class toStringable
+{
+    private $thingy = fail;
+
+    public function __construct($foo = null)
+    {
+        $this->thingy = $foo;
+    }
+
+    public function __toString()
+    {
+        return (string) $this->thingy;
+    }
+}
diff --git a/tests/Ruler/Test/SetTest.php b/tests/Ruler/Test/SetTest.php
@@ -3,6 +3,8 @@
 namespace Ruler\Test;
 
 use Ruler\Set;
+use Ruler\Value;
+use Ruler\Test\Fixtures\toStringable;
 
 class SetTest extends \PHPUnit_Framework_TestCase
 {
@@ -13,6 +15,39 @@ public function testNonStringableObject()
             new \stdClass()
         );
         $set = new Set($setExpected);
-        $this->assertEquals(1, count($set));
+        $this->assertEquals(2, count($set));
+    }
+
+    public function testObjectUniqueness()
+    {
+        $objectA = new \stdClass();
+        $objectA->something = 'else';
+        $objectB = new \stdClass();
+        $objectB->foo = 'bar';
+
+        $set = new Set(array(
+            $objectA,
+            $objectB
+        ));
+
+        $this->assertEquals(2, count($set));
+        $this->assertTrue($set->setContains(new Value($objectA)));
+        $this->assertTrue($set->setContains(new Value($objectB)));
+        $this->assertFalse($set->setContains(new Value(false)));
+    }
+
+    public function testStringable()
+    {
+        $set = new Set(array(
+            $one = new toStringable(1),
+            $two = new toStringable(2),
+            $too = new toStringable(2)
+        ));
+
+        $this->assertEquals(2, count($set));
+        $this->assertTrue($set->setContains(new Value($one)));
+        $this->assertTrue($set->setContains(new Value($two)));
+        $this->assertTrue($set->setContains(new Value($too)));
+        $this->assertFalse($set->setContains(new Value(2)));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*`
`20`	`20`	`* @author Justin Hileman <justin@justinhileman.info>`
`21`	`21`	`*/`
`22`		`-class Set extends Value`
	`22`	`+class Set extends Value implements \Countable`
`23`	`23`	`{`
`24`	`24`	`/**`
`25`	`25`	`* Set constructor.`
`@@ -43,14 +43,18 @@ public function __construct($set)`
`43`	`43`	`if (is_array($value)) {`
`44`	`44`	`$value = new Set($value);`
`45`	`45`	`} elseif (is_object($value)) {`
`46`		`- $reflect = new \ReflectionObject($value);`
`47`		`- if (!$reflect->hasMethod('__toString')) {`
	`46`	`+ if (!method_exists($value, '__toString')) {`
`48`	`47`	`$value = new Value($value);`
`49`	`48`	`}`
`50`	`49`	`}`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`$this->value = array_unique($this->value);`
	`53`	`+ foreach ($this->value as &$value) {`
	`54`	`+ if ($value instanceof Value && !$value instanceof Set) {`
	`55`	`+ $value = $value->getValue();`
	`56`	`+ }`
	`57`	`+ }`
`54`	`58`	`}`
`55`	`59`
`56`	`60`	`/**`
`@@ -243,4 +247,12 @@ protected function isValidNumericSet()`
`243`	`247`	`{`
`244`	`248`	`return count($this->value) == array_sum(array_map('is_numeric', $this->value));`
`245`	`249`	`}`
	`250`	`+`
	`251`	`+ /**`
	`252`	`+ * @return integer`
	`253`	`+ */`
	`254`	`+ public function count()`
	`255`	`+ {`
	`256`	`+ return count($this->value);`
	`257`	`+ }`
`246`	`258`	`}`