clean up classes

sinnbeck · Oct 21, 2022 · a069330 · a069330
1 parent 52d16de
commit a069330
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 103 deletions.
diff --git a/src/Asserts/BaseAssert.php b/src/Asserts/BaseAssert.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Sinnbeck\DomAssertions\Asserts;
+
+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;
+
+abstract class BaseAssert
+{
+    use UsesElementAsserts;
+    use CanGatherAttributes;
+    use InteractsWithParser;
+    use NormalizesData;
+    use Debugging;
+
+    public function __construct($html, $element = null)
+    {
+        $this->html = $html;
+        $this->parser = DomParser::new($html);
+
+        if (! is_null($element)) {
+            $this->parser->setRoot($element);
+        }
+    }
+
+}
diff --git a/src/Asserts/ElementAssert.php b/src/Asserts/ElementAssert.php
@@ -4,33 +4,10 @@
 
 use Sinnbeck\DomAssertions\Asserts\Traits\CanGatherAttributes;
 use Sinnbeck\DomAssertions\Asserts\Traits\Debugging;
-use Sinnbeck\DomAssertions\Asserts\Traits\HasElementAsserts;
+use Sinnbeck\DomAssertions\Asserts\Traits\NormalizesData;
+use Sinnbeck\DomAssertions\Asserts\Traits\UsesElementAsserts;
 use Sinnbeck\DomAssertions\Asserts\Traits\InteractsWithParser;
-use Sinnbeck\DomAssertions\DomParser;
+use Sinnbeck\DomAssertions\Parsers\DomParser;
 
-class ElementAssert
-{
-    use HasElementAsserts;
-    use CanGatherAttributes;
-    use InteractsWithParser;
-    use Debugging;
-
-    /**
-     * @var \Sinnbeck\DomAssertions\DomParser
-     */
-    protected DomParser $parser;
-
-    protected string $html;
-
-    protected array $attributes = [];
-
-    public function __construct($html, $element = null)
-    {
-        $this->html = $html;
-        $this->parser = DomParser::new($html);
-
-        if (! is_null($element)) {
-            $this->parser->setRoot($element);
-        }
-    }
-}
+class ElementAssert extends BaseAssert
+{}
diff --git a/src/Asserts/FormAssert.php b/src/Asserts/FormAssert.php
@@ -7,40 +7,13 @@
 use PHPUnit\Framework\Assert;
 use Sinnbeck\DomAssertions\Asserts\Traits\CanGatherAttributes;
 use Sinnbeck\DomAssertions\Asserts\Traits\Debugging;
-use Sinnbeck\DomAssertions\Asserts\Traits\HasElementAsserts;
+use Sinnbeck\DomAssertions\Asserts\Traits\NormalizesData;
+use Sinnbeck\DomAssertions\Asserts\Traits\UsesElementAsserts;
 use Sinnbeck\DomAssertions\Asserts\Traits\InteractsWithParser;
-use Sinnbeck\DomAssertions\DomParser;
+use Sinnbeck\DomAssertions\Parsers\DomParser;
 
-class FormAssert
+class FormAssert extends BaseAssert
 {
-    use HasElementAsserts;
-    use CanGatherAttributes;
-    use InteractsWithParser;
-    use Debugging;
-
-    /**
-     * @var \Sinnbeck\DomAssertions\DomParser
-     */
-    protected DomParser $parser;
-
-    protected string $html;
-
-    protected array $attributes = [];
-
-    public function __construct($html, $form)
-    {
-        $this->html = $html;
-        $this->parser = DomParser::new($html)
-            ->setRoot($form);
-    }
-
-    public function setParser($parser): static
-    {
-        $this->parser = $parser;
-
-        return $this;
-    }
-
     public function hasAction(string $action): self
     {
         PHPUnit::assertEquals(
@@ -117,14 +90,4 @@ public function findSelect($selector = 'select', $callback = null): static
         return $this;
     }
 
-//    protected function getSelectorFromAttributes($type, array $attributes): string
-//    {
-//        $selector = $type;
-//
-//        foreach ($attributes as $attribute => $value) {
-//            $selector .= sprintf('[%s="%s"]', $attribute, $value);
-//        }
-//
-//        return $selector;
-//    }
 }
diff --git a/src/Asserts/SelectAssert.php b/src/Asserts/SelectAssert.php
@@ -5,27 +5,13 @@
 use PHPUnit\Framework\Assert;
 use Sinnbeck\DomAssertions\Asserts\Traits\CanGatherAttributes;
 use Sinnbeck\DomAssertions\Asserts\Traits\Debugging;
-use Sinnbeck\DomAssertions\Asserts\Traits\HasElementAsserts;
+use Sinnbeck\DomAssertions\Asserts\Traits\NormalizesData;
+use Sinnbeck\DomAssertions\Asserts\Traits\UsesElementAsserts;
 use Sinnbeck\DomAssertions\Asserts\Traits\InteractsWithParser;
-use Sinnbeck\DomAssertions\DomParser;
+use Sinnbeck\DomAssertions\Parsers\DomParser;
 
-class SelectAssert
+class SelectAssert extends BaseAssert
 {
-    use HasElementAsserts;
-    use CanGatherAttributes;
-    use InteractsWithParser;
-    use Debugging;
-
-    protected DomParser $parser;
-
-    protected array $attributes = [];
-
-    public function __construct(string $html, $root)
-    {
-        $this->parser = DomParser::new($html)
-            ->setRoot($root);
-    }
-
     public function containsOption(mixed $attributes): self
     {
         return $this->contains('option', $attributes);

diff --git a/src/Asserts/Traits/CanGatherAttributes.php b/src/Asserts/Traits/CanGatherAttributes.php
@@ -4,9 +4,6 @@
 
 trait CanGatherAttributes
 {
-    use NormalizesData;
-    use InteractsWithParser;
-
     public function gatherAttributes($type): void
     {
         if (isset($this->attributes[$type])) {

diff --git a/src/Asserts/Traits/InteractsWithParser.php b/src/Asserts/Traits/InteractsWithParser.php
@@ -2,12 +2,10 @@
 
 namespace Sinnbeck\DomAssertions\Asserts\Traits;
 
-use Sinnbeck\DomAssertions\DomParser;
+use Sinnbeck\DomAssertions\Parsers\DomParser;
 
 trait InteractsWithParser
 {
-    use NormalizesData;
-
     protected function getParser(): DomParser
     {
         return $this->parser;

diff --git a/src/Asserts/Traits/NormalizesData.php b/src/Asserts/Traits/NormalizesData.php
@@ -6,7 +6,7 @@
 
 trait NormalizesData
 {
-    protected function normalizeAttributesArray(array $attributes)
+    protected function normalizeAttributesArray(array $attributes): array
     {
         foreach ($attributes as $attribute => $value) {
             $attributes[$attribute] = $this->normalizeAttributeValue($attribute, $value);
@@ -15,7 +15,7 @@ protected function normalizeAttributesArray(array $attributes)
         return $attributes;
     }
 
-    protected function normalizeAttributeValue($attribute, $value)
+    protected function normalizeAttributeValue($attribute, $value): mixed
     {
         if ($attribute === 'class') {
             return $this->normalizeClass($value);
@@ -28,8 +28,11 @@ protected function normalizeAttributeValue($attribute, $value)
         return $value;
     }
 
-    protected function normalizeClass(string $class)
+    protected function normalizeClass(string $class): string
     {
-        return Str::of($class)->explode(' ')->sort()->implode(' ');
+        return Str::of($class)
+            ->explode(' ')
+            ->sort()
+            ->implode(' ');
     }
 }
diff --git a/src/Asserts/Traits/HasElementAsserts.php → src/Asserts/Traits/UsesElementAsserts.php b/src/Asserts/Traits/HasElementAsserts.php → src/Asserts/Traits/UsesElementAsserts.php
@@ -8,9 +8,8 @@
 use PHPUnit\Framework\Assert;
 use Sinnbeck\DomAssertions\Asserts\ElementAssert;
 
-trait HasElementAsserts
+trait UsesElementAsserts
 {
-    use NormalizesData;
     use Macroable {
         __call as protected callMacro;
     }

diff --git a/src/Macros/AssertElementMacro.php b/src/Macros/AssertElementMacro.php
@@ -5,7 +5,7 @@
 use Illuminate\Testing\TestResponse;
 use PHPUnit\Framework\Assert;
 use Sinnbeck\DomAssertions\Asserts\ElementAssert;
-use Sinnbeck\DomAssertions\DomParser;
+use Sinnbeck\DomAssertions\Parsers\DomParser;
 
 class AssertElementMacro
 {
@@ -34,5 +34,6 @@ public function __invoke()
 
             return $this;
         };
+
     }
 }
diff --git a/src/Macros/AssertFormMacro.php b/src/Macros/AssertFormMacro.php
@@ -5,7 +5,7 @@
 use Illuminate\Testing\TestResponse;
 use PHPUnit\Framework\Assert;
 use Sinnbeck\DomAssertions\Asserts\FormAssert;
-use Sinnbeck\DomAssertions\DomParser;
+use Sinnbeck\DomAssertions\Parsers\DomParser;
 
 class AssertFormMacro
 {

diff --git a/src/DomParser.php → src/Parsers/DomParser.php b/src/DomParser.php → src/Parsers/DomParser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sinnbeck\DomAssertions;
+namespace Sinnbeck\DomAssertions\Parsers;
 
 use DOMDocument;
 use DOMElement;

diff --git a/tests/DomParserTest.php b/tests/DomParserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use Sinnbeck\DomAssertions\DomParser;
+use Sinnbeck\DomAssertions\Parsers\DomParser;
 
 it('can find a form', function () {
     $html = <<<'HTML'