Move "toId" logic to builder

Author: ByScripts

src/StaticEntity.php

@@ -107,13 +107,7 @@ static public function getIds()
      */
     static public function toId($idOrEntity)
     {
-        if ($idOrEntity instanceof StaticEntity) {
-            return $idOrEntity->getId();
-        } elseif (self::exists($idOrEntity)) {
-            return $idOrEntity;
-        }
-
-        throw new \Exception(sprintf('%s => Invalid parameter: %s', __METHOD__, $idOrEntity));
+        return self::getBuilder()->convertToId($idOrEntity);
     }
 
 

src/StaticEntityBuilder.php

@@ -160,4 +160,21 @@ private function createInstance($id)
 
         $this->instances[$id] = $instance;
     }
+
+    /**
+     * @param mixed|StaticEntity $staticEntity
+     *
+     * @return mixed
+     * @throws \Exception
+     */
+    public function convertToId($staticEntity)
+    {
+        if ($staticEntity instanceof StaticEntity) {
+            return $staticEntity->getId();
+        } elseif (!$this->hasId($staticEntity)) {
+            throw new \Exception(sprintf('Unable to convert "%s" to a valid id for class %s', $staticEntity, $this->class));
+        }
+
+        return $staticEntity;
+    }
 }