Merge pull request #3 from 8fold/preparing-major

preparing major

Author: joshbruce

composer.json

@@ -11,12 +11,12 @@
   ],
   "require": {
     "php": "^8.0",
-    "8fold/php-xml-builder": "^0.6"
+    "8fold/php-xml-builder": "^1.0.0"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "^3.6.0",
     "phpstan/phpstan": "^1.2.0",
-    "phpunit/phpunit": "^9.5.0"
+    "phpunit/phpunit": "^9.5",
+    "squizlabs/php_codesniffer": "^3.6"
   },
   "autoload": {
     "psr-4": {

composer.lock

@@ -1,15 +1,21 @@
 <?xml version="1.0"?>
 <ruleset name="8fold PSR12">
 	<description>PHP-FIG PSR-12 standards with modifications to: control structure (empty space before closing brace).</description>
+
+	<file>src</file>
+
 	<arg name="colors" />
+
  	<rule ref="PSR12">
  		<!-- 8fold prefers one empty before the closing of control strcuctures
  			in most cases -->
  		<exclude name="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose"/>
+ 		<!-- We separate `use` clauses, all other PSR12 whitespace rules should apply -->
+ 		<exclude name="PSR12.Files.FileHeader"/>
  	</rule>
 	<rule ref="Generic.Files.LineLength">
 		<properties>
-			<property phpcs-only="true" name="lineLimit" value="90"/>
+			<property phpcs-only="true" name="lineLimit" value="100"/>
 			<property phpcbf-only="true" name="lineLimit" value="120"/>
 		</properties>
 	</rule>

phpcs.xml

@@ -4,23 +4,21 @@
 
 namespace Eightfold\HTMLBuilder;
 
+use Stringable;
+
 use Eightfold\XMLBuilder\Comment;
 use Eightfold\XMLBuilder\Contracts\Buildable;
 use Eightfold\HTMLBuilder\Element;
 
 class Document implements Buildable
 {
-    private string $title   = '';
-    private string $lang    = 'en';
-    private string $charset = 'utf-8';
-
     /**
-     * @var array<Element|Comment>
+     * @var array<string|Stringable>
      */
     private array $head = [];
 
     /**
-     * @var array<Element|Comment|string>
+     * @var array<string|Stringable>
      */
     private array $body = [];
 
@@ -32,31 +30,20 @@ public static function create(
         return new static($title, $lang, $charset);
     }
 
-    final public function __construct(
-        string $title,
-        string $lang = 'en',
-        string $charset = 'utf-8'
+    final private function __construct(
+        private string $title,
+        private string $lang = 'en',
+        private string $charset = 'utf-8'
     ) {
-        $this->title   = $title;
-        $this->lang    = $lang;
-        $this->charset = $charset;
     }
 
-    // TODO: PHP8 - Element|Comment
-    /**
-     * @param  Element|Comment $content
-     */
-    public function head(Element|Comment ...$content): Document
+    public function head(string|Stringable ...$content): Document
     {
         $this->head = $content;
         return $this;
     }
 
-    // TODO: PHP8 - Element|Comment
-    /**
-     * @param Element|Comment|string $content
-     */
-    public function body(Element|Comment|string ...$content): Document
+    public function body(string|Stringable ...$content): Document
     {
         $this->body = $content;
         return $this;
@@ -96,15 +83,15 @@ private function charset(): string
     }
 
     /**
-     * @return array<Element|Comment> $content
+     * @return array<string|Stringable>
      */
     private function headContent(): array
     {
         return $this->head;
     }
 
     /**
-     * @return array<Element|Comment|string> $content
+     * @return array<string|Stringable>
      */
     private function bodyContent(): array
     {

src/Document.php

@@ -4,10 +4,11 @@
 
 namespace Eightfold\HTMLBuilder;
 
+use Stringable;
+
 use Eightfold\XMLBuilder\Element as XMLElement;
-use Eightfold\XMLBuilder\Contracts\Buildable;
 
-class Element extends XMLElement implements Buildable
+class Element extends XMLElement implements Stringable
 {
     /**
      * The following attributes will be placed in this order if used in an

src/Element.php

@@ -58,7 +58,7 @@ public function document_is_speedy(): void // phpcs:ignore
         $elapsed = $end - $start;
         $ms      = $elapsed/1e+6;
 
-        $this->assertLessThan(1, $ms);
+        $this->assertLessThan(0.8, $ms);
     }
 
     /**
@@ -81,6 +81,6 @@ public function document_is_small(): void // phpcs:ignore
         $used = $end - $start;
         $kb   = round($used/1024.2);
 
-        $this->assertLessThan(53, $kb);
+        $this->assertLessThan(65, $kb);
     }
 }