major code clean up

src/Asserts/BaseAssert.php

@@ -2,10 +2,12 @@
 
 namespace Sinnbeck\DomAssertions\Asserts;
 
+use Carbon\Exceptions\UnknownMethodException;
+use Illuminate\Support\Str;
+use Illuminate\Support\Traits\Macroable;
 use Sinnbeck\DomAssertions\Asserts\Traits\CanGatherAttributes;
 use Sinnbeck\DomAssertions\Asserts\Traits\Debugging;
 use Sinnbeck\DomAssertions\Asserts\Traits\InteractsWithParser;
-use Sinnbeck\DomAssertions\Asserts\Traits\NormalizesData;
 use Sinnbeck\DomAssertions\Asserts\Traits\UsesElementAsserts;
 use Sinnbeck\DomAssertions\Parsers\DomParser;
 
@@ -14,8 +16,10 @@ abstract class BaseAssert
     use UsesElementAsserts;
     use CanGatherAttributes;
     use InteractsWithParser;
-    use NormalizesData;
     use Debugging;
+    use Macroable {
+        __call as protected callMacro;
+    }
 
     public function __construct($html, $element = null)
     {
@@ -27,4 +31,41 @@ public function __construct($html, $element = null)
         }
     }
 
-}
+    public function __call($method, $arguments)
+    {
+        if (static::hasMacro($method)) {
+            return $this->macroCall($method, $arguments);
+        }
+        if (Str::startsWith($method, 'has')) {
+            $property = Str::of($method)->after('has')->snake()->slug();
+
+            return $this->has($property, $arguments[0] ?? null);
+        }
+
+        if (Str::startsWith($method, 'is')) {
+            $property = Str::of($method)->after('is')->snake()->slug();
+
+            return $this->is($property);
+        }
+
+        if (Str::startsWith($method, 'find')) {
+            $property = Str::of($method)->after('find')->snake()->slug();
+
+            return $this->find($property, $arguments[0] ?? null);
+        }
+
+        if (Str::startsWith($method, 'contains')) {
+            $elementName = Str::of($method)->after('contains')->camel();
+
+            return $this->contains($elementName, ...$arguments);
+        }
+
+        if (Str::startsWith($method, 'doesntContain')) {
+            $elementName = Str::of($method)->after('doesntContain')->camel();
+
+            return $this->doesntContain($elementName, ...$arguments);
+        }
+
+        throw new UnknownMethodException($method);
+    }
+}

src/Asserts/ElementAssert.php

@@ -2,12 +2,6 @@
 
 namespace Sinnbeck\DomAssertions\Asserts;
 
-use Sinnbeck\DomAssertions\Asserts\Traits\CanGatherAttributes;
-use Sinnbeck\DomAssertions\Asserts\Traits\Debugging;
-use Sinnbeck\DomAssertions\Asserts\Traits\NormalizesData;
-use Sinnbeck\DomAssertions\Asserts\Traits\UsesElementAsserts;
-use Sinnbeck\DomAssertions\Asserts\Traits\InteractsWithParser;
-use Sinnbeck\DomAssertions\Parsers\DomParser;
-
 class ElementAssert extends BaseAssert
-{}
+{
+}

src/Asserts/FormAssert.php

@@ -5,12 +5,6 @@
 use Illuminate\Support\Str;
 use Illuminate\Testing\Assert as PHPUnit;
 use PHPUnit\Framework\Assert;
-use Sinnbeck\DomAssertions\Asserts\Traits\CanGatherAttributes;
-use Sinnbeck\DomAssertions\Asserts\Traits\Debugging;
-use Sinnbeck\DomAssertions\Asserts\Traits\NormalizesData;
-use Sinnbeck\DomAssertions\Asserts\Traits\UsesElementAsserts;
-use Sinnbeck\DomAssertions\Asserts\Traits\InteractsWithParser;
-use Sinnbeck\DomAssertions\Parsers\DomParser;
 
 class FormAssert extends BaseAssert
 {
@@ -89,5 +83,4 @@ public function findSelect($selector = 'select', $callback = null): static
 
         return $this;
     }
-
 }

src/Asserts/SelectAssert.php

@@ -3,12 +3,6 @@
 namespace Sinnbeck\DomAssertions\Asserts;
 
 use PHPUnit\Framework\Assert;
-use Sinnbeck\DomAssertions\Asserts\Traits\CanGatherAttributes;
-use Sinnbeck\DomAssertions\Asserts\Traits\Debugging;
-use Sinnbeck\DomAssertions\Asserts\Traits\NormalizesData;
-use Sinnbeck\DomAssertions\Asserts\Traits\UsesElementAsserts;
-use Sinnbeck\DomAssertions\Asserts\Traits\InteractsWithParser;
-use Sinnbeck\DomAssertions\Parsers\DomParser;
 
 class SelectAssert extends BaseAssert
 {

src/Asserts/Traits/CanGatherAttributes.php

@@ -2,6 +2,8 @@
 
 namespace Sinnbeck\DomAssertions\Asserts\Traits;
 
+use Sinnbeck\DomAssertions\Formatters\Normalize;
+
 trait CanGatherAttributes
 {
     public function gatherAttributes($type): void
@@ -19,21 +21,16 @@ public function gatherAttributes($type): void
         foreach ($elements as $element) {
             $attributes = [];
             foreach ($element->attributes as $attribute) {
-                $attributes[$attribute->nodeName] = $this->extractAttribute($attribute);
+                $attributes[$attribute->nodeName] = Normalize::attributeValue($attribute->nodeName, $attribute->value);
             }
 
+            $extra['text'] = Normalize::attributeValue('text', $element->nodeValue);
+
             if ($type === 'textarea') {
-                $extra['value'] = trim($element->nodeValue);
+                $extra['value'] = $extra['text'];
             }
 
-            $extra['text'] = trim($element->nodeValue);
-
             $this->attributes[$type][] = $attributes + $extra;
         }
     }
-
-    protected function extractAttribute(mixed $attribute): mixed
-    {
-        return $this->normalizeAttributeValue($attribute->nodeName, $attribute->value);
-    }
 }

src/Asserts/Traits/InteractsWithParser.php

@@ -2,6 +2,7 @@
 
 namespace Sinnbeck\DomAssertions\Asserts\Traits;
 
+use Sinnbeck\DomAssertions\Formatters\Normalize;
 use Sinnbeck\DomAssertions\Parsers\DomParser;
 
 trait InteractsWithParser
@@ -22,7 +23,7 @@ protected function getAttribute(string $attribute)
             return $this->getParser()->getText();
         }
 
-        return $this->normalizeAttributeValue($attribute, $this->getParser()->getAttributeForRoot($attribute));
+        return Normalize::attributeValue($attribute, $this->getParser()->getAttributeForRoot($attribute));
     }
 
     protected function hasAttribute(string $attribute)

src/Asserts/Traits/UsesElementAsserts.php

@@ -2,51 +2,13 @@
 
 namespace Sinnbeck\DomAssertions\Asserts\Traits;
 
-use Illuminate\Support\Str;
-use Illuminate\Support\Traits\Macroable;
 use Illuminate\Testing\Assert as PHPUnit;
 use PHPUnit\Framework\Assert;
 use Sinnbeck\DomAssertions\Asserts\ElementAssert;
+use Sinnbeck\DomAssertions\Formatters\Normalize;
 
 trait UsesElementAsserts
 {
-    use Macroable {
-        __call as protected callMacro;
-    }
-
-    public function __call(string $method, array $arguments)
-    {
-        if (static::hasMacro($method)) {
-            return $this->macroCall($method, $arguments);
-        }
-        if (Str::startsWith($method, 'has')) {
-            $property = Str::of($method)->after('has')->snake()->slug();
-            $this->has($property, $arguments[0] ?? null);
-        }
-
-        if (Str::startsWith($method, 'is')) {
-            $property = Str::of($method)->after('is')->snake()->slug();
-            $this->is($property);
-        }
-
-        if (Str::startsWith($method, 'find')) {
-            $property = Str::of($method)->after('find')->snake()->slug();
-            $this->find($property, $arguments[0] ?? null);
-        }
-
-        if (Str::startsWith($method, 'contains')) {
-            $elementName = Str::of($method)->after('contains')->camel();
-            $this->contains($elementName, ...$arguments);
-        }
-
-        if (Str::startsWith($method, 'doesntContain')) {
-            $elementName = Str::of($method)->after('doesntContain')->camel();
-            $this->doesntContain($elementName, ...$arguments);
-        }
-
-        return $this;
-    }
-
     public function has(string $attribute, mixed $value = null): self
     {
         if (! $value) {
@@ -58,7 +20,7 @@ public function has(string $attribute, mixed $value = null): self
             return $this;
         }
 
-        $value = $this->normalizeAttributeValue($attribute, $value);
+        $value = Normalize::attributeValue($attribute, $value);
 
         PHPUnit::assertEquals(
             $value,
@@ -111,7 +73,7 @@ public function contains(string $elementName, $attributes = null, $count = 0): s
         }
 
         $this->gatherAttributes($elementName);
-        $attributes = $this->normalizeAttributesArray($attributes);
+        $attributes = Normalize::attributesArray($attributes);
 
         if ($count) {
             $found = collect($this->attributes[$elementName])

src/Formatters/Normalize.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Sinnbeck\DomAssertions\Formatters;
+
+use Illuminate\Support\Str;
+
+class Normalize
+{
+    public static function attributesArray(array $attributes): array
+    {
+        foreach ($attributes as $attribute => $value) {
+            $attributes[$attribute] = self::attributeValue($attribute, $value);
+        }
+
+        return $attributes;
+    }
+
+    public static function attributeValue($attribute, $value): mixed
+    {
+        if ($attribute === 'class') {
+            return Normalize::className($value);
+        }
+
+        if ($attribute === 'text') {
+            return trim($value);
+        }
+
+        if (in_array($attribute, [
+            'readonly',
+            'required',
+        ]) && ! $value) {
+            return true;
+        }
+
+        return $value;
+    }
+
+    protected static function className(string $class): string
+    {
+        return Str::of($class)
+            ->explode(' ')
+            ->sort()
+            ->implode(' ');
+    }
+}

src/Macros/AssertElementMacro.php

@@ -34,6 +34,5 @@ public function __invoke()
 
             return $this;
         };
-
     }
 }

src/ide-helper.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Illuminate\Testing {
+    class TestResponse
+    {
+        public function assertElement($selector = 'body', $callback = null)
+        {
+            /** @var \Illuminate\Testing\TestResponse $instance */
+            return $instance;
+        }
+
+        public function assertForm($selector = 'form', $callback = null)
+        {
+            /** @var \Illuminate\Testing\TestResponse $instance */
+            return $instance;
+        }
+    }
+}