HexMakina / Marker

src/Marker.php

Spacing +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
         return
         Marker::div(
             Marker::label(
-                Form::input($field_name, $field_value, $attributes) . Marker::span($field_label),
+                Form::input($field_name, $field_value, $attributes).Marker::span($field_label),
                 ['for' => $attributes['id']]
             ),
             ['class' => 'checkbutton']

Indentation +210 added lines, -210 removed lines

@@ -1,253 +1,253 @@
 <?php
 
 /**
-  * HTML generator
-  * Marker, hommage to Christian François Bouche-Villeneuve aka Chris Marker
-  *
-  * show off @method
-  *
-  * @method string abbr(string $content, array $attr)
-  *                creates an abbreviation or an acronym
-  * @method string acronym(string $content, array $attr)
-  *                creates an acronym (not supported in HTML5. use abbr() instead)
-  * @method string address(string $content, array $attr)
-  *                creates contact information for the author/owner of a document
-  * @method string applet(string $content, array $attr)
-  *                creates an embedded applet
-  *                (not supported in HTML5. use embed() or <object> instead)
-  * @method string area(string $content, array $attr)
-  *                creates an area inside an image map
-  * @method string article(string $content, array $attr)
-  *                creates an article
-  * @method string aside(string $content, array $attr)
-  *                creates content aside from the page content
-  * @method string audio(string $content, array $attr)
-  *                creates embedded sound content
-  * @method string b(string $content, array $attr)
-  *                creates bold text
-  * @method string base(string $content, array $attr)
-  *                creates an element that specifies the base url/target for all relative urls in a document
-  * @method string basefont(string $content, array $attr)
-  *                creates an element that specifies a default color, size, and font for all text in a document
-  *                (not supported in HTML5. use CSS instead)
-  * @method string bdi(string $content, array $attr)
-  *                creates an element that isolates a part of text that might be formatted
-  *                in a different direction from other text outside it
-  * @method string bdo(string $content, array $attr)
-  *                creates an element that overrides the current text direction
-  * @method string big(string $content, array $attr)
-  *                creates an element that defines big text (not supported in HTML5. use CSS instead)
-  * @method string blockquote(string $content, array $attr)
-  *                creates a section that is quoted from another source
-  * @method string body(string $content, array $attr)
-  *                creates the document's body
-  * @method string br(string $content, array $attr)
-  *                creates a single line break
-  * @method string button(string $content, array $attr)
-  *                creates a clickable button
-  * @method string canvas(string $content, array $attr)
-  *                used to draw graphics, on the fly, via scripting (usually javascript)
-  * @method string caption(string $content, array $attr)
-  *                creates a table caption
-  * @method string center(string $content, array $attr)
-  *                defines centered text (not supported in HTML5. use CSS instead)
-  * @method string cite(string $content, array $attr)
-  *                creates the title of a work
-  * @method string code(string $content, array $attr)
-  *                creates a piece of computer code
-  * @method string col(string $content, array $attr)
-  *                specifies column properties for each column within a <colgroup> element
-  * @method string colgroup(string $content, array $attr)
-  *                specifies a group of one or more columns in a table for formatting
-  * @method string data(string $content, array $attr)
-  *                adds a machine-readable translation of a given content
-  * @method string datalist(string $content, array $attr)
-  *                specifies a list of pre-defined options for input controls
-  * @method string dd(string $content, array $attr)
-  *                creates a description/value of a term in a description list
-  * @method string del(string $content, array $attr)
-  *                creates text that has been deleted from a document
-  * @method string details(string $content, array $attr)
-  *                creates additional details that the user can view or hide
-  * @method string dfn(string $content, array $attr)
-  *                specifies a term that is going to be defined within the content
-  * @method string dialog(string $content, array $attr)
-  *                creates a dialog box or window
-  * @method string dir(string $content, array $attr)
-  *                defines a directory list (not supported in HTML5. use ul() instead)
-  * @method string div(string $content, array $attr)
-  *                creates a section in a document
-  * @method string dl(string $content, array $attr)
-  *                creates a description list
-  * @method string dt(string $content, array $attr)
-  *                creates a term/name in a description list
-  * @method string em(string $content, array $attr)
-  *                creates emphasized text
-  * @method string embed(string $content, array $attr)
-  *                creates a container for an external application
-  * @method string fieldset(string $content, array $attr)
-  *                groups related elements in a form
-  * @method string figcaption(string $content, array $attr)
-  *                creates a caption for a <figure> element
-  * @method string figure(string $content, array $attr)
-  *                specifies self-contained content
-  * @method string font(string $content, array $attr)
-  *                defines font, color, and size for text    (not supported in HTML5. use CSS instead)
-  * @method string footer(string $content, array $attr)
-  *                creates a footer for a document or section
-  * @method string form(string $content, array $attr)
-  *                creates an HTML form for user input
-  * @method string frame(string $content, array $attr)
-  *                defines a window (a frame) in a frameset (not supported in HTML5)
-  * @method string frameset(string $content, array $attr)
-  *                defines a set of frames   (not supported in HTML5)
-  * @method string h1(string $content, array $attr)
-  *                creates HTML headings 1
-  * @method string h2(string $content, array $attr)
-  *                creates HTML headings 2
-  * @method string h3(string $content, array $attr)
-  *                creates HTML headings 3
-  * @method string h4(string $content, array $attr)
-  *                creates HTML headings 4
-  * @method string h5(string $content, array $attr)
-  *                creates HTML headings 5
-  * @method string h6(string $content, array $attr)
-  *                creates HTML headings 6
-  * @method string head(string $content, array $attr)
-  *                contains metadata/information for the document
-  * @method string header(string $content, array $attr)
-  *                creates a header for a document or section
-  * @method string hr(string $content, array $attr)
-  *                creates a thematic change in the content
-  * @method string html(string $content, array $attr)
-  *                creates the root of an HTML document
-  * @method string i(string $content, array $attr)
-  *                creates a part of text in an alternate voice or mood
-  * @method string iframe(string $content, array $attr)
-  *                creates an inline frame
-  * @method string input(string $content, array $attr)
-  *                creates an input control
-  * @method string ins(string $content, array $attr)
-  *                creates a text that has been inserted into a document
-  * @method string kbd(string $content, array $attr)
-  *                creates keyboard input
-  * @method string label(string $content, array $attr)
-  *                creates a label for an <input> element
-  * @method string legend(string $content, array $attr)
-  *                creates a caption for a <fieldset> element
-  * @method string li(string $content, array $attr)
-  *                creates a list item
-  * @method string link(string $content, array $attr)
-  *                creates the relationship between a document and an external resource
-  *                (most used to link to style sheets)
-  * @method string main(string $content, array $attr)
-  *                specifies the main content of a document
-  * @method string map(string $content, array $attr)
-  *                creates an image map
-  * @method string mark(string $content, array $attr)
-  *                creates marked/highlighted text
-  * @method string meta(string $content, array $attr)
-  *                creates metadata about an HTML document
-  * @method string meter(string $content, array $attr)
-  *                creates a scalar measurement within a known range (a gauge)
-  * @method string nav(string $content, array $attr)
-  *                creates navigation links
-  * @method string noframes(string $content, array $attr)
-  *                defines an alternate content for users that do not support frames
-  *                (not supported in HTML5)
-  * @method string noscript(string $content, array $attr)
-  *                creates an alternate content for users that do not support client-side scripts
-  * @method string object(string $content, array $attr)
-  *                creates a container for an external application
-  * @method string ol(string $content, array $attr)
-  *                creates an ordered list
-  * @method string optgroup(string $content, array $attr)
-  *                creates a group of related options in a drop-down list
-  * @method string option(string $content, array $attr)
-  *                creates an option in a drop-down list
-  * @method string output(string $content, array $attr)
-  *                creates the result of a calculation
-  * @method string p(string $content, array $attr)
+ * HTML generator
+ * Marker, hommage to Christian François Bouche-Villeneuve aka Chris Marker
+ *
+ * show off @method
+ *
+ * @method string abbr(string $content, array $attr)
+ *                creates an abbreviation or an acronym
+ * @method string acronym(string $content, array $attr)
+ *                creates an acronym (not supported in HTML5. use abbr() instead)
+ * @method string address(string $content, array $attr)
+ *                creates contact information for the author/owner of a document
+ * @method string applet(string $content, array $attr)
+ *                creates an embedded applet
+ *                (not supported in HTML5. use embed() or <object> instead)
+ * @method string area(string $content, array $attr)
+ *                creates an area inside an image map
+ * @method string article(string $content, array $attr)
+ *                creates an article
+ * @method string aside(string $content, array $attr)
+ *                creates content aside from the page content
+ * @method string audio(string $content, array $attr)
+ *                creates embedded sound content
+ * @method string b(string $content, array $attr)
+ *                creates bold text
+ * @method string base(string $content, array $attr)
+ *                creates an element that specifies the base url/target for all relative urls in a document
+ * @method string basefont(string $content, array $attr)
+ *                creates an element that specifies a default color, size, and font for all text in a document
+ *                (not supported in HTML5. use CSS instead)
+ * @method string bdi(string $content, array $attr)
+ *                creates an element that isolates a part of text that might be formatted
+ *                in a different direction from other text outside it
+ * @method string bdo(string $content, array $attr)
+ *                creates an element that overrides the current text direction
+ * @method string big(string $content, array $attr)
+ *                creates an element that defines big text (not supported in HTML5. use CSS instead)
+ * @method string blockquote(string $content, array $attr)
+ *                creates a section that is quoted from another source
+ * @method string body(string $content, array $attr)
+ *                creates the document's body
+ * @method string br(string $content, array $attr)
+ *                creates a single line break
+ * @method string button(string $content, array $attr)
+ *                creates a clickable button
+ * @method string canvas(string $content, array $attr)
+ *                used to draw graphics, on the fly, via scripting (usually javascript)
+ * @method string caption(string $content, array $attr)
+ *                creates a table caption
+ * @method string center(string $content, array $attr)
+ *                defines centered text (not supported in HTML5. use CSS instead)
+ * @method string cite(string $content, array $attr)
+ *                creates the title of a work
+ * @method string code(string $content, array $attr)
+ *                creates a piece of computer code
+ * @method string col(string $content, array $attr)
+ *                specifies column properties for each column within a <colgroup> element
+ * @method string colgroup(string $content, array $attr)
+ *                specifies a group of one or more columns in a table for formatting
+ * @method string data(string $content, array $attr)
+ *                adds a machine-readable translation of a given content
+ * @method string datalist(string $content, array $attr)
+ *                specifies a list of pre-defined options for input controls
+ * @method string dd(string $content, array $attr)
+ *                creates a description/value of a term in a description list
+ * @method string del(string $content, array $attr)
+ *                creates text that has been deleted from a document
+ * @method string details(string $content, array $attr)
+ *                creates additional details that the user can view or hide
+ * @method string dfn(string $content, array $attr)
+ *                specifies a term that is going to be defined within the content
+ * @method string dialog(string $content, array $attr)
+ *                creates a dialog box or window
+ * @method string dir(string $content, array $attr)
+ *                defines a directory list (not supported in HTML5. use ul() instead)
+ * @method string div(string $content, array $attr)
+ *                creates a section in a document
+ * @method string dl(string $content, array $attr)
+ *                creates a description list
+ * @method string dt(string $content, array $attr)
+ *                creates a term/name in a description list
+ * @method string em(string $content, array $attr)
+ *                creates emphasized text
+ * @method string embed(string $content, array $attr)
+ *                creates a container for an external application
+ * @method string fieldset(string $content, array $attr)
+ *                groups related elements in a form
+ * @method string figcaption(string $content, array $attr)
+ *                creates a caption for a <figure> element
+ * @method string figure(string $content, array $attr)
+ *                specifies self-contained content
+ * @method string font(string $content, array $attr)
+ *                defines font, color, and size for text    (not supported in HTML5. use CSS instead)
+ * @method string footer(string $content, array $attr)
+ *                creates a footer for a document or section
+ * @method string form(string $content, array $attr)
+ *                creates an HTML form for user input
+ * @method string frame(string $content, array $attr)
+ *                defines a window (a frame) in a frameset (not supported in HTML5)
+ * @method string frameset(string $content, array $attr)
+ *                defines a set of frames   (not supported in HTML5)
+ * @method string h1(string $content, array $attr)
+ *                creates HTML headings 1
+ * @method string h2(string $content, array $attr)
+ *                creates HTML headings 2
+ * @method string h3(string $content, array $attr)
+ *                creates HTML headings 3
+ * @method string h4(string $content, array $attr)
+ *                creates HTML headings 4
+ * @method string h5(string $content, array $attr)
+ *                creates HTML headings 5
+ * @method string h6(string $content, array $attr)
+ *                creates HTML headings 6
+ * @method string head(string $content, array $attr)
+ *                contains metadata/information for the document
+ * @method string header(string $content, array $attr)
+ *                creates a header for a document or section
+ * @method string hr(string $content, array $attr)
+ *                creates a thematic change in the content
+ * @method string html(string $content, array $attr)
+ *                creates the root of an HTML document
+ * @method string i(string $content, array $attr)
+ *                creates a part of text in an alternate voice or mood
+ * @method string iframe(string $content, array $attr)
+ *                creates an inline frame
+ * @method string input(string $content, array $attr)
+ *                creates an input control
+ * @method string ins(string $content, array $attr)
+ *                creates a text that has been inserted into a document
+ * @method string kbd(string $content, array $attr)
+ *                creates keyboard input
+ * @method string label(string $content, array $attr)
+ *                creates a label for an <input> element
+ * @method string legend(string $content, array $attr)
+ *                creates a caption for a <fieldset> element
+ * @method string li(string $content, array $attr)
+ *                creates a list item
+ * @method string link(string $content, array $attr)
+ *                creates the relationship between a document and an external resource
+ *                (most used to link to style sheets)
+ * @method string main(string $content, array $attr)
+ *                specifies the main content of a document
+ * @method string map(string $content, array $attr)
+ *                creates an image map
+ * @method string mark(string $content, array $attr)
+ *                creates marked/highlighted text
+ * @method string meta(string $content, array $attr)
+ *                creates metadata about an HTML document
+ * @method string meter(string $content, array $attr)
+ *                creates a scalar measurement within a known range (a gauge)
+ * @method string nav(string $content, array $attr)
+ *                creates navigation links
+ * @method string noframes(string $content, array $attr)
+ *                defines an alternate content for users that do not support frames
+ *                (not supported in HTML5)
+ * @method string noscript(string $content, array $attr)
+ *                creates an alternate content for users that do not support client-side scripts
+ * @method string object(string $content, array $attr)
+ *                creates a container for an external application
+ * @method string ol(string $content, array $attr)
+ *                creates an ordered list
+ * @method string optgroup(string $content, array $attr)
+ *                creates a group of related options in a drop-down list
+ * @method string option(string $content, array $attr)
+ *                creates an option in a drop-down list
+ * @method string output(string $content, array $attr)
+ *                creates the result of a calculation
+ * @method string p(string $content, array $attr)
  *                 creates a paragraph
-  * @method string param(string $content, array $attr)
+ * @method string param(string $content, array $attr)
  *                 creates a parameter for an object
-  * @method string picture(string $content, array $attr)
+ * @method string picture(string $content, array $attr)
  *                 creates a container for multiple image resources
-  * @method string pre(string $content, array $attr)
+ * @method string pre(string $content, array $attr)
  *                 creates preformatted text
-  * @method string progress(string $content, array $attr) represents the progress of a task
-  * @method string q(string $content, array $attr)
+ * @method string progress(string $content, array $attr) represents the progress of a task
+ * @method string q(string $content, array $attr)
  *                 creates a short quotation
-  * @method string rp(string $content, array $attr)
+ * @method string rp(string $content, array $attr)
  *                 creates what to show in browsers that do not support ruby annotations
-  * @method string rt(string $content, array $attr)
+ * @method string rt(string $content, array $attr)
  *                 creates an explanation/pronunciation of characters (for east asian typography)
-  * @method string ruby(string $content, array $attr)
+ * @method string ruby(string $content, array $attr)
  *                 creates a ruby annotation (for east asian typography)
-  * @method string s(string $content, array $attr)
+ * @method string s(string $content, array $attr)
  *                 creates text that is no longer correct
-  * @method string samp(string $content, array $attr)
+ * @method string samp(string $content, array $attr)
  *                 creates sample output from a computer program
-  * @method string script(string $content, array $attr)
+ * @method string script(string $content, array $attr)
  *                 creates a client-side script
-  * @method string section(string $content, array $attr)
+ * @method string section(string $content, array $attr)
  *                 creates a section in a document
-  * @method string select(string $content, array $attr)
+ * @method string select(string $content, array $attr)
  *                 creates a drop-down list
-  * @method string small(string $content, array $attr)
+ * @method string small(string $content, array $attr)
  *                 creates smaller text
-  * @method string source(string $content, array $attr)
+ * @method string source(string $content, array $attr)
  *                 creates multiple media resources for media elements (<video> and <audio>)
-  * @method string span(string $content, array $attr)
+ * @method string span(string $content, array $attr)
  *                 creates a section in a document
-  * @method string strike(string $content, array $attr) defines strikethrough text
-  *                (not supported in HTML5. use del() or s() instead)
-  * @method string strong(string $content, array $attr)
+ * @method string strike(string $content, array $attr) defines strikethrough text
+ *                (not supported in HTML5. use del() or s() instead)
+ * @method string strong(string $content, array $attr)
  *                 creates important text
-  * @method string style(string $content, array $attr)
+ * @method string style(string $content, array $attr)
  *                 creates style information for a document
-  * @method string sub(string $content, array $attr)
+ * @method string sub(string $content, array $attr)
  *                 creates subscripted text
-  * @method string summary(string $content, array $attr)
+ * @method string summary(string $content, array $attr)
  *                 creates a visible heading for a <details> element
-  * @method string sup(string $content, array $attr)
+ * @method string sup(string $content, array $attr)
  *                 creates superscripted text
-  * @method string svg(string $content, array $attr)
+ * @method string svg(string $content, array $attr)
  *                 creates a container for svg graphics
-  * @method string table(string $content, array $attr)
+ * @method string table(string $content, array $attr)
  *                 creates a table
-  * @method string tbody(string $content, array $attr) groups the body content in a table
-  * @method string td(string $content, array $attr)
+ * @method string tbody(string $content, array $attr) groups the body content in a table
+ * @method string td(string $content, array $attr)
  *                 creates a cell in a table
-  * @method string template(string $content, array $attr)
+ * @method string template(string $content, array $attr)
  *                 creates a container for content that should be hidden when the page loads
-  * @method string textarea(string $content, array $attr)
+ * @method string textarea(string $content, array $attr)
  *                 creates a multiline input control (text area)
-  * @method string tfoot(string $content, array $attr) groups the footer content in a table
-  * @method string th(string $content, array $attr)
+ * @method string tfoot(string $content, array $attr) groups the footer content in a table
+ * @method string th(string $content, array $attr)
  *                 creates a header cell in a table
-  * @method string thead(string $content, array $attr) groups the header content in a table
-  * @method string time(string $content, array $attr)
+ * @method string thead(string $content, array $attr) groups the header content in a table
+ * @method string time(string $content, array $attr)
  *                 creates a specific time (or datetime)
-  * @method string title(string $content, array $attr)
+ * @method string title(string $content, array $attr)
  *                 creates a title for the document
-  * @method string tr(string $content, array $attr)
+ * @method string tr(string $content, array $attr)
  *                 creates a row in a table
-  * @method string track(string $content, array $attr)
+ * @method string track(string $content, array $attr)
  *                 creates text tracks for media elements (<video> and <audio>)
-  * @method string tt(string $content, array $attr)
+ * @method string tt(string $content, array $attr)
  *                 creates an element that defines teletype text (not supported in HTML5. use CSS instead)
-  * @method string u(string $content, array $attr)
+ * @method string u(string $content, array $attr)
  *                 creates some text that is unarticulated and styled differently from normal text
-  * @method string ul(string $content, array $attr)
+ * @method string ul(string $content, array $attr)
  *                 creates an unordered list
-  * @method string var(string $content, array $attr)
+ * @method string var(string $content, array $attr)
  *                 creates a variable
-  * @method string video(string $content, array $attr)
+ * @method string video(string $content, array $attr)
  *                 creates embedded video content
-  * @method string wbr(string $content, array $attr)
+ * @method string wbr(string $content, array $attr)
  *                 creates a possible line-break
-  */
+ */
 
 namespace HexMakina\Marker;
 

src/Element.php

Spacing +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
         $ret = '';
         foreach ($attributes as $k => $v) {
             if (self::isValidValue($v)) {
-                $ret .=  ' ' . (self::isBooleanAttribute($k) ? $v : sprintf(self::FORMAT_ATTRIBUTES, $k, $v));
+                $ret .= ' '.(self::isBooleanAttribute($k) ? $v : sprintf(self::FORMAT_ATTRIBUTES, $k, $v));
             }
         }
         return $ret;

src/Form.php

Indentation +5 added lines, -5 removed lines

@@ -3,11 +3,11 @@
 namespace HexMakina\Marker;
 
 /**
-  * @method static string hidden(string $name, $value=null)
-  * @method static string date()
-  * @method static string time()
-  * @method static string datetime()
-  */
+ * @method static string hidden(string $name, $value=null)
+ * @method static string date()
+ * @method static string time()
+ * @method static string datetime()
+ */
 
 class Form
 {

Spacing +6 added lines, -6 removed lines

@@ -17,10 +17,10 @@ 
     {
       // arguments [name, value, [attributes], [errors]]
         $i = 0;
-        $field_name =  $arguments[$i++] ?? null;
+        $field_name = $arguments[$i++] ?? null;
         $field_value = $arguments[$i++] ?? null;
-        $attributes =  (array)($arguments[$i++] ?? []);
-        $errors =      (array)($arguments[$i++] ?? []);
+        $attributes = (array)($arguments[$i++] ?? []);
+        $errors = (array)($arguments[$i++] ?? []);
 
         $attributes['type'] = $element_type;
         $attributes['name'] = $attributes['name'] ?? $field_name;
@@ -68,7 +68,7 @@ 
         foreach ($option_list as $value => $label) {
             $option_attributes = ['value' => $value];
             if ($selected == $value) {
-                $option_attributes['selected'] =  'selected';
+                $option_attributes['selected'] = 'selected';
             }
 
             $options .= new Element('option', $label, $option_attributes);
@@ -78,7 +78,7 @@ 
 
     public static function legend(string $label, array $attributes = []): string
     {
-        return '' . (new Element('legend', $label, $attributes));
+        return ''.(new Element('legend', $label, $attributes));
     }
 
     public static function label(string $field_for, string $field_label, array $attributes = [], array $errors = []): string
@@ -128,6 +128,6 @@ 
             unset($attributes['label']);
         }
 
-        return $label . (new Element($tag, $content, $attributes));
+        return $label.(new Element($tag, $content, $attributes));
     }
 }

tests/ElementTest.php

Spacing +9 added lines, -9 removed lines

@@ -24,10 +24,10 @@ 
 
   public function testCreateEmptyElement(): void
   {
-    foreach($this->tags as $tag)
+    foreach ($this->tags as $tag)
     {
       $e = new Element($tag);
-      if(in_array($tag, Element::VOID_ELEMENTS)){
+      if (in_array($tag, Element::VOID_ELEMENTS)) {
         $this->assertEquals('<'.$tag.'/>', $e->__toString());
       }
       else {
@@ -40,12 +40,12 @@ 
   public function testCreateElementWithContent(): void
   {
     $messages = ['lorem ipsum' => 'lorem ipsum', '' => '', null => ''];
-    foreach($messages as $message => $expected){
-      foreach($this->tags as $tag)
+    foreach ($messages as $message => $expected) {
+      foreach ($this->tags as $tag)
       {
         $e = new Element($tag, $message);
 
-        if(in_array($tag, Element::VOID_ELEMENTS)){
+        if (in_array($tag, Element::VOID_ELEMENTS)) {
           $this->assertEquals('<'.$tag.'/>', $e->__toString());
         }
         else {
@@ -96,7 +96,7 @@ 
     $this->assertForAllHTMLTags($message, $attributes, $attributes_expected_string);
 
 
-    $attributes = ['class' => 'test_class', 'style="color:red;"','id' => 'test_id'];
+    $attributes = ['class' => 'test_class', 'style="color:red;"', 'id' => 'test_id'];
     $attributes_expected_string = ' class="test_class" style="color:red;" id="test_id"';
 
     // testing attributes string generator
@@ -109,11 +109,11 @@ 
 
   private function assertForAllHTMLTags($message, $attributes, $attributes_expected_string)
   {
-    foreach($this->tags as $tag){
+    foreach ($this->tags as $tag) {
 
       // testing by instantiation
-      $e = new Element($tag, $message,  $attributes);
-      if(in_array($tag, Element::VOID_ELEMENTS)){
+      $e = new Element($tag, $message, $attributes);
+      if (in_array($tag, Element::VOID_ELEMENTS)) {
         $this->assertEquals(sprintf(Element::FORMAT_VOID, $tag, $attributes_expected_string), $e->__toString());
       }
       else {

Braces +3 added lines, -6 removed lines

@@ -29,8 +29,7 @@ 
       $e = new Element($tag);
       if(in_array($tag, Element::VOID_ELEMENTS)){
         $this->assertEquals('<'.$tag.'/>', $e->__toString());
-      }
-      else {
+      } else {
         $this->assertEquals("<$tag></$tag>", $e->__toString());
       }
     }
@@ -47,8 +46,7 @@ 
 
         if(in_array($tag, Element::VOID_ELEMENTS)){
           $this->assertEquals('<'.$tag.'/>', $e->__toString());
-        }
-        else {
+        } else {
           $this->assertEquals("<$tag>$expected</$tag>", $e->__toString());
         }
       }
@@ -115,8 +113,7 @@ 
       $e = new Element($tag, $message,  $attributes);
       if(in_array($tag, Element::VOID_ELEMENTS)){
         $this->assertEquals(sprintf(Element::FORMAT_VOID, $tag, $attributes_expected_string), $e->__toString());
-      }
-      else {
+      } else {
         $this->assertEquals(sprintf(Element::FORMAT_ELEMENT, $tag, $attributes_expected_string, $message, $tag), $e->__toString());
       }
     }