HexMakina / Marker

src/WCAGElement.php

Spacing +15 added lines, -15 removed lines

@@ -65,7 +65,7 @@ 
      * @param array  $attributes Additional attributes
      * @return string
      */
-    public static function img(string $src, string $alt='', $attributes = [])
+    public static function img(string $src, string $alt = '', $attributes = [])
     {
         $attributes['src'] = $src;
         $attributes['alt'] = $alt;
@@ -88,7 +88,7 @@ 
 
         $content .= parent::figcaption($caption);
         $attributes['role'] = 'figure';
-        return parent::figure($content, $attributes, function ($value) {
+        return parent::figure($content, $attributes, function($value) {
             return $value;
         });
     }
@@ -118,7 +118,7 @@ 
      */
     public static function audio(string $src, $attributes = [])
     {
-        if(empty($src)) {
+        if (empty($src)) {
             throw new \InvalidArgumentException("Source attribute is required");
         }
 
@@ -150,7 +150,7 @@ 
      */
     public static function iframe(string $src, string $title, $attributes = [])
     {
-        if(empty($title)) {
+        if (empty($title)) {
             throw new \InvalidArgumentException("Iframe title is required");
         }
 
@@ -166,7 +166,7 @@ 
      */
     public static function a(string $href, string $content, $attributes = [])
     {
-        if(empty($href)) {
+        if (empty($href)) {
             throw new \InvalidArgumentException("Anchor href is required");
         }
 
@@ -181,7 +181,7 @@ 
      */
     public static function area(string $alt, $attributes = [])
     {
-        if(empty($alt)) {
+        if (empty($alt)) {
             throw new \InvalidArgumentException("Area alt is required");
         }
         $attributes['alt'] = $alt;
@@ -195,18 +195,18 @@ 
      */
     public static function input(string $type, string $name, $attributes = [])
     {
-        if(empty($type)) {
+        if (empty($type)) {
             throw new \InvalidArgumentException("Input type is required");
         }
 
-        if(empty($name)) {
+        if (empty($name)) {
             throw new \InvalidArgumentException("Input name is required");
         }
 
         $attributes['name'] = $name;
         $attributes['type'] = $type;
 
-        if(self::inputIsRequired($attributes)) {
+        if (self::inputIsRequired($attributes)) {
             $attributes['aria-required'] = 'true';
         }
 
@@ -230,10 +230,10 @@ 
         }
         $attributes['name'] = $name;
         $string_options = '';
-        foreach($options as $value => $label) {
-            $string_options.= parent::option($label, ['value' => $value]);
+        foreach ($options as $value => $label) {
+            $string_options .= parent::option($label, ['value' => $value]);
         }
-        return parent::select($string_options, $attributes, function ($value) {
+        return parent::select($string_options, $attributes, function($value) {
             return $value;
         });
     }
@@ -271,11 +271,11 @@ 
      */
     public static function html(string $content, $attributes = [])
     {
-        if(empty($content)) {
+        if (empty($content)) {
             throw new \InvalidArgumentException("HTML content is required");
         }
 
-        if(empty($attributes['lang'])) {
+        if (empty($attributes['lang'])) {
             throw new \InvalidArgumentException("Language attribute is required");
         }
         return parent::html($content, $attributes);
@@ -288,7 +288,7 @@ 
      */
     public static function th(string $scope, string $content, $attributes = [])
     {
-        if(empty($scope)) {
+        if (empty($scope)) {
             throw new \InvalidArgumentException("Scope attribute is required");
         }
 

src/Form.php

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
         foreach ($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);
@@ -125,7 +125,7 @@ 
      */
     public static function legend(string $label, array $attributes = []): string
     {
-        return '' . (new Element('legend', $label, $attributes));
+        return ''.(new Element('legend', $label, $attributes));
     }
 
     /**
@@ -146,7 +146,7 @@ 
 
     public static function button(string $label, array $attributes = []): string
     {
-        return  '' . (new Element('button', $label, $attributes));
+        return  ''.(new Element('button', $label, $attributes));
     }
 
     /**
@@ -200,7 +200,7 @@ 
         unset($attributes['label']);
         $input = new Element($tag, $content, $attributes);
 
-        if($label_text){
+        if ($label_text) {
             if (!empty($attributes['label-wrap']))
                 $ret = self::label(null, $label_text.$input);
             else

Braces +7 added lines, -6 removed lines

@@ -201,13 +201,14 @@
         $input = new Element($tag, $content, $attributes);
 
         if($label_text){
-            if (!empty($attributes['label-wrap']))
-                $ret = self::label(null, $label_text.$input);
-            else
-                $ret = self::label($attributes['id'], $label_text).$input;
+            if (!empty($attributes['label-wrap'])) {
+                            $ret = self::label(null, $label_text.$input);
+            } else {
+                            $ret = self::label($attributes['id'], $label_text).$input;
+            }
+        } else {
+                    $ret = $input;
         }
-        else
-            $ret = $input;
 
         return (string)$ret;
     }

src/Element.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 
         foreach ($this->attributes as $name => $value) {
             $name = ($this->formatter)($name);
-            $attributes .= ' ' . ($value === true ? $name : sprintf('%s="%s"', $name, ($this->formatter)((string)$value)));
+            $attributes .= ' '.($value === true ? $name : sprintf('%s="%s"', $name, ($this->formatter)((string)$value)));
         }
 
         return $this->inner === null

tests/ElementTest.php

Spacing +4 added lines, -4 removed lines

@@ -140,7 +140,7 @@ 
         $element = new Element('div', $content, ['class' => ['foo', 'bar'], 'id' => 'test'], false);
 
         $this->assertEquals(
-            '<div class="foo bar" id="test">' . $content . '</div>',
+            '<div class="foo bar" id="test">'.$content.'</div>',
             $element->__toString()
         );
         $content = 'Hello, World! & < > " \' ';
@@ -150,7 +150,7 @@ 
         ], 'id' => 'test', 'data-attr' => $content], false);
 
         $this->assertEquals(
-            '<div class="foo bar" id="test" data-attr="' . $content . '">' . $content . '</div>',
+            '<div class="foo bar" id="test" data-attr="'.$content.'">'.$content.'</div>',
             $element->__toString()
         );
 
@@ -159,8 +159,8 @@ 
         $element = new Element('div', $content, ['class' => ['foo', 'bar'], 'id' => 'test', 'data-attr' => $content, 'data-attr2' => $content], false);
 
         $this->assertEquals(
-            '<div class="foo bar" id="test" data-attr="' . $content . '" data-attr2="' . $content .
-                '">' . $content . '</div>',
+            '<div class="foo bar" id="test" data-attr="'.$content.'" data-attr2="'.$content.
+                '">'.$content.'</div>',
             $element->__toString()
         );
     }

src/Marker.php

Indentation +13 added lines, -13 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
 /**
-  * HTML generator
-  * Marker, hommage to Christian François Bouche-Villeneuve aka Chris Marker
-  */
+ * HTML generator
+ * Marker, hommage to Christian François Bouche-Villeneuve aka Chris Marker
+ */
 
 declare(strict_types=1);
 
@@ -12,11 +12,11 @@ 
 class Marker extends Element
 {
     /**
-      * ? smoother write
-      * Marker::img('path/to/img.jpg', 'An alternative text', ['width' => 34, 'height' => 34])
-      * than
-      * Element::img(null, ['src' => 'path/to/img.jpg', 'alt' => 'An alternative text', 'width' => 34, 'height' => 34])
-      */
+     * ? smoother write
+     * Marker::img('path/to/img.jpg', 'An alternative text', ['width' => 34, 'height' => 34])
+     * than
+     * Element::img(null, ['src' => 'path/to/img.jpg', 'alt' => 'An alternative text', 'width' => 34, 'height' => 34])
+     */
     public static function img(string $src, string $alt, array $attributes = [], $formatter=null): Element
     {
         $attributes['src'] ??= $src;
@@ -27,11 +27,11 @@ 
     }
 
     /**
-      * ? makes more sense to write
-      * Marker::a('controller/task/id', 'Click here', ['class' => 'nav'])
-      * than
-      * Marker::a('Click here', ['href' => controller/task/id', 'class' => 'nav'])
-      */
+     * ? makes more sense to write
+     * Marker::a('controller/task/id', 'Click here', ['class' => 'nav'])
+     * than
+     * Marker::a('Click here', ['href' => controller/task/id', 'class' => 'nav'])
+     */
     public static function a(string $href, string $label, array $attributes = [], $formatter = null): Element
     {
         $attributes['href'] = $href;

Spacing +3 added lines, -3 removed lines

@@ -17,13 +17,13 @@ 
       * than
       * Element::img(null, ['src' => 'path/to/img.jpg', 'alt' => 'An alternative text', 'width' => 34, 'height' => 34])
       */
-    public static function img(string $src, string $alt, array $attributes = [], $formatter=null): Element
+    public static function img(string $src, string $alt, array $attributes = [], $formatter = null): Element
     {
         $attributes['src'] ??= $src;
         $attributes['alt'] ??= $alt;
         $attributes['title'] ??= $alt;
 
-        return new Element('img', null,$attributes, $formatter);
+        return new Element('img', null, $attributes, $formatter);
     }
 
     /**
@@ -36,6 +36,6 @@ 
     {
         $attributes['href'] = $href;
 
-        return new Element('a', $label,$attributes, $formatter);
+        return new Element('a', $label, $attributes, $formatter);
     }
 }