Cleanup map call

packaged · Apr 25, 2019 · 9cbedb1 · 9cbedb1
1 parent 83a17d1
commit 9cbedb1
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/src/SafeHtml.php b/src/SafeHtml.php
@@ -23,16 +23,16 @@ public function getContent()
   }
 
   /**
-   * @param ...$toAppend
+   * @param $html
    *
    * @return $this
    * @throws \Exception
    */
-  public function append(...$toAppend)
+  public function append(...$html)
   {
-    foreach($toAppend as $html)
+    foreach($html as $toAppend)
     {
-      $this->content .= self::escape($html);
+      $this->content .= self::escape($toAppend);
     }
     return $this;
   }
@@ -51,19 +51,14 @@ public static function escape($input, $arrayGlue = ' ')
       return $input;
     }
 
-    if(is_array($input))
+    if($input instanceof ISafeHtmlProducer)
     {
-      return new static(
-        implode(
-          $arrayGlue,
-          array_map(function ($input) use ($arrayGlue) { return SafeHtml::escape($input, $arrayGlue); }, $input)
-        )
-      );
+      return $input->produceSafeHTML();
     }
 
-    if($input instanceof ISafeHtmlProducer)
+    if(is_array($input))
     {
-      return $input->produceSafeHTML();
+      return new static(implode($arrayGlue, array_map([SafeHtml::class, 'escape'], $input, [$arrayGlue])));
     }
 
     try
@@ -73,9 +68,8 @@ public static function escape($input, $arrayGlue = ' ')
     }
     catch(\Exception $ex)
     {
-      $class = get_class($input);
       throw new \Exception(
-        "Object (of class '{$class}') implements " .
+        "Object (of class '" . get_class($input) . "') implements " .
         "ISafeHTMLProducer but did not return anything " .
         "renderable from produceSafeHTML()."
       );