[Uid] make Uuid::equals() accept any types of argument for more flexibility

hhamon · nicolas-grekas · commit 46721c19f959 · 2020-03-13T15:19:40.000+01:00
diff --git a/src/Symfony/Component/Uid/Tests/UuidTest.php b/src/Symfony/Component/Uid/Tests/UuidTest.php
@@ -94,6 +94,22 @@ public function testEquals()
         $this->assertFalse($uuid1->equals($uuid2));
     }
 
+    /**
+     * @dataProvider provideInvalidEqualType
+     */
+    public function testEqualsAgainstOtherType($other)
+    {
+        $this->assertFalse((new Uuid(self::A_UUID_V4))->equals($other));
+    }
+
+    public function provideInvalidEqualType()
+    {
+        yield [null];
+        yield [self::A_UUID_V1];
+        yield [self::A_UUID_V4];
+        yield [new \stdClass()];
+    }
+
     public function testCompare()
     {
         $uuids = [];
diff --git a/src/Symfony/Component/Uid/Uuid.php b/src/Symfony/Component/Uid/Uuid.php
@@ -42,7 +42,7 @@ public function __construct(string $uuid = null)
             throw new \InvalidArgumentException(sprintf('Invalid UUID: "%s".', $uuid));
         }
 
-        $this->uuid = $uuid;
+        $this->uuid = strtr($uuid, 'ABCDEF', 'abcdef');
     }
 
     public static function v1(): self
@@ -85,8 +85,15 @@ public function isNull(): bool
         return uuid_is_null($this->uuid);
     }
 
-    public function equals(self $other): bool
+    /**
+     * Returns whether the argument is of class Uuid and contains the same value as the current instance.
+     */
+    public function equals($other): bool
     {
+        if (!$other instanceof self) {
+            return false;
+        }
+
         return 0 === uuid_compare($this->uuid, $other->uuid);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function __construct(string $uuid = null)`
`42`	`42`	`throw new \InvalidArgumentException(sprintf('Invalid UUID: "%s".', $uuid));`
`43`	`43`	`}`
`44`	`44`
`45`		`- $this->uuid = $uuid;`
	`45`	`+ $this->uuid = strtr($uuid, 'ABCDEF', 'abcdef');`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public static function v1(): self`
`@@ -85,8 +85,15 @@ public function isNull(): bool`
`85`	`85`	`return uuid_is_null($this->uuid);`
`86`	`86`	`}`
`87`	`87`
`88`		`- public function equals(self $other): bool`
	`88`	`+ /**`
	`89`	`+ * Returns whether the argument is of class Uuid and contains the same value as the current instance.`
	`90`	`+ */`
	`91`	`+ public function equals($other): bool`
`89`	`92`	`{`
	`93`	`+ if (!$other instanceof self) {`
	`94`	`+ return false;`
	`95`	`+ }`
	`96`	`+`
`90`	`97`	`return 0 === uuid_compare($this->uuid, $other->uuid);`
`91`	`98`	`}`
`92`	`99`