Simplify PrimaryKeyTypes

Author: janedbal

tests/Fixtures/Blog/Type/PrimaryKeyBinaryType.php

@@ -8,6 +8,8 @@
 use LogicException;
 use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Blog\PrimaryKey;
 use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Compat\CompatibilityType;
+use function get_debug_type;
+use function is_string;
 use function pack;
 use function unpack;
 
@@ -25,11 +27,11 @@ public function convertToPHPValue(
             return null;
         }
 
-        if ($value instanceof PrimaryKey) {
-            return $value;
+        if (is_string($value)) {
+            return new PrimaryKey(unpack('N', $value)[1]); // @phpstan-ignore offsetAccess.nonOffsetAccessible
         }
 
-        return new PrimaryKey(unpack('N', $value)[1]); // @phpstan-ignore offsetAccess.nonOffsetAccessible
+        throw new LogicException('Unexpected value: ' . get_debug_type($value));
     }
 
     public function convertToDatabaseValue(

tests/Fixtures/Blog/Type/PrimaryKeyIntegerType.php

@@ -8,6 +8,8 @@
 use LogicException;
 use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Blog\PrimaryKey;
 use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Compat\CompatibilityType;
+use function get_debug_type;
+use function is_int;
 
 final class PrimaryKeyIntegerType extends Type
 {
@@ -23,11 +25,11 @@ public function convertToPHPValue(
             return null;
         }
 
-        if ($value instanceof PrimaryKey) {
-            return $value;
+        if (is_int($value)) {
+            return new PrimaryKey($value);
         }
 
-        return new PrimaryKey($value);
+        throw new LogicException('Unexpected value: ' . get_debug_type($value));
     }
 
     public function convertToDatabaseValue(

tests/Fixtures/Blog/Type/PrimaryKeyStringType.php

@@ -8,6 +8,8 @@
 use LogicException;
 use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Blog\PrimaryKey;
 use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Compat\CompatibilityType;
+use function get_debug_type;
+use function is_string;
 
 final class PrimaryKeyStringType extends Type
 {
@@ -23,11 +25,11 @@ public function convertToPHPValue(
             return null;
         }
 
-        if ($value instanceof PrimaryKey) {
-            return $value;
+        if (is_string($value)) {
+            return new PrimaryKey((int) $value);
         }
 
-        return new PrimaryKey((int) $value);
+        throw new LogicException('Unexpected value: ' . get_debug_type($value));
     }
 
     public function convertToDatabaseValue(