Code style

CHANGELOG.md

@@ -15,6 +15,8 @@
 - `Innmind\Html\Node\Document` no longer implement any interface
 - `Innmind\Html\Reader\Reader` now return an `Innmind\Immutable\Attempt`
 - `Innmind\Html\Visitor\Elements` now return a `Innmind\Immutable\Sequence`
+- `Innmind\Html\Reader\Reader` has been renamed `Innmind\Html\Reader`
+- `Innmind\Html\Node\Document` has been renamed `Innmind\Html\Document`
 
 ### Removed
 

README.md

@@ -18,8 +18,8 @@ composer require innmind/html
 
 ```php
 use Innmind\Html\{
-    Reader\Reader,
-    Node\Document,
+    Reader,
+    Document,
 };
 use Innmind\Xml\{
     Node,

src/Node/Document.php → src/Document.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Html\Node;
+namespace Innmind\Html;
 
 use Innmind\Xml\{
     Node,
@@ -22,17 +22,13 @@
  */
 final class Document
 {
-    private Type $type;
-    /** @var Sequence<Node|Element|Custom> */
-    private Sequence $children;
-
     /**
-     * @param Sequence<Node|Element|Custom>|null $children
+     * @param Sequence<Node|Element|Custom> $children
      */
-    private function __construct(Type $type, ?Sequence $children = null)
-    {
-        $this->type = $type;
-        $this->children = $children ?? Sequence::of();
+    private function __construct(
+        private Type $type,
+        private Sequence $children,
+    ) {
     }
 
     /**
@@ -42,7 +38,7 @@ private function __construct(Type $type, ?Sequence $children = null)
      */
     public static function of(Type $type, ?Sequence $children = null): self
     {
-        return new self($type, $children);
+        return new self($type, $children ?? Sequence::of());
     }
 
     public function type(): Type

src/Element/A.php

@@ -18,13 +18,10 @@
  */
 final class A implements Custom
 {
-    private Element $element;
-    private Url $href;
-
-    private function __construct(Url $href, Element $element)
-    {
-        $this->element = $element;
-        $this->href = $href;
+    private function __construct(
+        private Url $href,
+        private Element $element,
+    ) {
     }
 
     /**

src/Element/Base.php

@@ -17,13 +17,10 @@
  */
 final class Base implements Custom
 {
-    private Element $element;
-    private Url $href;
-
-    private function __construct(Url $href, Element $element)
-    {
-        $this->element = $element;
-        $this->href = $href;
+    private function __construct(
+        private Url $href,
+        private Element $element,
+    ) {
     }
 
     /**

src/Element/Img.php

@@ -17,13 +17,10 @@
  */
 final class Img implements Custom
 {
-    private Element $element;
-    private Url $src;
-
-    private function __construct(Url $src, Element $element)
-    {
-        $this->element = $element;
-        $this->src = $src;
+    private function __construct(
+        private Url $src,
+        private Element $element,
+    ) {
     }
 
     /**

src/Element/Link.php

@@ -17,22 +17,14 @@
  */
 final class Link implements Custom
 {
-    private Element $element;
-    private Url $href;
-    /** @var non-empty-string */
-    private string $relationship;
-
     /**
      * @param non-empty-string $relationship
      */
     private function __construct(
-        Url $href,
-        string $relationship,
-        Element $element,
+        private Url $href,
+        private string $relationship,
+        private Element $element,
     ) {
-        $this->element = $element;
-        $this->href = $href;
-        $this->relationship = $relationship;
     }
 
     /**

src/Reader/Reader.php → src/Reader.php

@@ -1,12 +1,8 @@
 <?php
 declare(strict_types = 1);
 
-namespace Innmind\Html\Reader;
+namespace Innmind\Html;
 
-use Innmind\Html\{
-    Node\Document,
-    Translator,
-};
 use Innmind\Xml\{
     Node,
     Element,
@@ -21,11 +17,8 @@
  */
 final class Reader
 {
-    private Translator $translate;
-
-    private function __construct(Translator $translate)
+    private function __construct(private Translator $translate)
     {
-        $this->translate = $translate;
     }
 
     /**

src/Translator.php

@@ -3,13 +3,12 @@
 
 namespace Innmind\Html;
 
-use Innmind\Html\{
-    Element\A,
-    Element\Base,
-    Element\Img,
-    Element\Link,
-    Element\Script,
-    Node\Document,
+use Innmind\Html\Element\{
+    A,
+    Base,
+    Img,
+    Link,
+    Script,
 };
 use Innmind\Xml\{
     Element,

src/Visitor/Element.php

@@ -3,7 +3,7 @@
 
 namespace Innmind\Html\Visitor;
 
-use Innmind\Html\Node\Document;
+use Innmind\Html\Document;
 use Innmind\Xml\{
     Node,
     Element as Model,
@@ -20,15 +20,11 @@
  */
 final class Element
 {
-    /** @var non-empty-string */
-    private string $name;
-
     /**
      * @param non-empty-string $name
      */
-    private function __construct(string $name)
+    private function __construct(private string $name)
     {
-        $this->name = $name;
     }
 
     /**

src/Visitor/Elements.php

@@ -3,7 +3,7 @@
 
 namespace Innmind\Html\Visitor;
 
-use Innmind\Html\Node\Document;
+use Innmind\Html\Document;
 use Innmind\Xml\{
     Node,
     Element,
@@ -16,15 +16,11 @@
  */
 final class Elements
 {
-    /** @var non-empty-string */
-    private string $name;
-
     /**
      * @param non-empty-string $name
      */
-    private function __construct(string $name)
+    private function __construct(private string $name)
     {
-        $this->name = $name;
     }
 
     /**

tests/Node/DocumentTest.php → tests/DocumentTest.php

@@ -1,9 +1,9 @@
 <?php
 declare(strict_types = 1);
 
-namespace Tests\Innmind\Html\Node;
+namespace Tests\Innmind\Html;
 
-use Innmind\Html\Node\Document;
+use Innmind\Html\Document;
 use Innmind\Xml\{
     Node,
     Document\Type,

tests/Reader/ReaderTest.php → tests/ReaderTest.php

@@ -1,11 +1,11 @@
 <?php
 declare(strict_types = 1);
 
-namespace Tests\Innmind\Html\Reader;
+namespace Tests\Innmind\Html;
 
 use Innmind\Html\{
-    Reader\Reader,
-    Node\Document,
+    Reader,
+    Document,
 };
 use Innmind\Xml\Format;
 use Innmind\Filesystem\File\Content;

tests/Translator/NodeTranslator/DocumentTranslatorTest.php

@@ -5,7 +5,7 @@
 
 use Innmind\Html\{
     Translator,
-    Node\Document,
+    Document,
 };
 use Innmind\BlackBox\PHPUnit\Framework\TestCase;
 

tests/Visitor/BodyTest.php

@@ -5,7 +5,7 @@
 
 use Innmind\Html\{
     Visitor,
-    Reader\Reader,
+    Reader,
 };
 use Innmind\Xml\{
     Element,

tests/Visitor/ElementTest.php

@@ -5,7 +5,7 @@
 
 use Innmind\Html\{
     Visitor\Element as ElementFinder,
-    Reader\Reader,
+    Reader,
 };
 use Innmind\Xml\{
     Element,

tests/Visitor/ElementsTest.php

@@ -5,7 +5,7 @@
 
 use Innmind\Html\{
     Visitor\Elements,
-    Reader\Reader,
+    Reader,
 };
 use Innmind\Xml\{
     Element,

tests/Visitor/HeadTest.php

@@ -5,7 +5,7 @@
 
 use Innmind\Html\{
     Visitor,
-    Reader\Reader,
+    Reader,
 };
 use Innmind\Xml\{
     Element,