Removed development leftovers and updated DefaultLayoutMergeStrategy …

…description

src/StructurizrPHP/Core/Model/Component.php

@@ -64,22 +64,15 @@ public function setParent(Element $parent) : void
         $this->parent = $parent;
     }
 
-//    public function getCanonicalName() : string
-//    {
-//        return $this->parent->getCanonicalName() . self::CANONICAL_NAME_SEPARATOR . $this->formatForCanonicalName($this->getName());
-//    }
-
     public function toArray() : array
     {
-        $data = \array_merge(
+        return \array_merge(
             [
                 'type' => $this->type,
                 'technology' => $this->technology,
             ],
             parent::toArray()
         );
-
-        return $data;
     }
 
     public static function hydrate(array $componentData, Model $model, ?Element $parent) : self

src/StructurizrPHP/Core/View/DefaultLayoutMergeStrategy.php

@@ -20,10 +20,9 @@
  *
  * - Sets the paper size (if not set).
  * - Copies element x,y positions.
- * - Copies relationship vertices. - TODO
+ * - Copies relationship vertices.
  *
- * Elements are matched by the full canonical name. The downside of this approach is that if an element is renamed
- * between versions of a workspace, it won't be possible to find/copy the layout information associated with an element.
+ * Elements are matched by id.
  */
 final class DefaultLayoutMergeStrategy implements LayoutMergeStrategy
 {