Declare this fork as a replacement of the original project

Add iframe to specification

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Matt Karl
+Copyright (c) 2014 Matt Karl
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -29,6 +29,12 @@ require 'vendor/autoload.php';
 To create an HTML node, simply call global `html` method, passing in the tag name and then any attributes.
 
 ```php
+// Enable the global use of html()
+Canteen\HTML5\HTML5::useGlobal();
+
+// Turn on autoloading if not using composer's autoloading
+Canteen\HTML5\HTML5::autoload();
+
 echo html('img src=home.jpg');
 echo html('img', 'src=home.jpg'); 
 echo html('img', array('src'=>'home.jpg')); 

build.properties

@@ -10,4 +10,4 @@ docs.helpers=${docs.themedir}/path.js
 git=git
 git.docs=gh-pages
 git.master=master
-version=1.0.1
+version=1.1.5

composer.json

@@ -1,31 +1,48 @@
 {
-    "name": "canteen/html5",
+    "name": "mibew/html5",
     "description" : "Create dynamic, valid HTML5 markup with a simple an intuitive PHP API",
-	"version" : "1.1.0",
+    "version" : "1.1.5",
     "type": "library",
-	"keywords": ["html5", "markup", "document", "html", "tags"],
+    "keywords": [
+        "html5",
+        "markup",
+        "document",
+        "html",
+        "tags"
+    ],
     "license": "MIT",
-	"homepage" : "http://github.com/Canteen/CanteenHTML5",
-	"time": "2014-10-31",
+    "homepage" : "http://github.com/Mibew/CanteenHTML5",
+    "time": "2021-07-09",
     "authors": [
         {
             "name": "Matt Karl",
             "email": "matt@mattkarl.com",
-            "homepage": "http://github.com/bigtimebuddy",
-            "role": "Developer"
+            "homepage": "http://github.com/bigtimebuddy"
+        },
+        {
+            "name": "Mibew Messenger project",
+            "homepage": "https://mibew.org/"
         }
     ],
     "autoload": {
-        "psr-4": {"Canteen\\HTML5\\": "src/"}
+        "psr-4": {
+            "Canteen\\HTML5\\": "src/"
+        },
+        "files": [
+            "src/HTML5.php"
+        ]
     },
     "require": {
         "php": ">=5.3.0"
     },
+    "replace": {
+        "canteen/html5": "~1.1.4"
+    },
     "minimum-stability": "dev",
     "repositories": [
         {
             "type": "vcs",
-			"url": "https://github.com/Canteen/CanteenHTML5"
+            "url": "https://github.com/Mibew/CanteenHTML5"
         }
     ]
 }

examples/document.php

@@ -17,6 +17,7 @@
     // Add a link to the page
     $link = html('a#google.external rel=external', 'Link', 'class="test something" target=blank rel=test');
     $link->href = 'http://google.com';
+    $link->onclick = "return confirm('Navigate away?');";
     $link->appendTo($doc->body);
 
     // Create an unordered list for an array of items
@@ -52,5 +53,3 @@
 
     // Output the result formatted nice with indents
     echo $doc;
-
-?>

src/Attribute.php

@@ -135,10 +135,14 @@ namespace Canteen\HTML5
         public function __get($name)
         {
             if (method_exists($this , $method =('get' . ucfirst($name))))
+            {
                 return $this->$method();
+            }
             else
+            {
                 throw new HTML5Error(HTML5Error::INVALID_GETTER, $name);
             }
+        }
 
         /**
         *  General purpose setter for setting attribute->name and attribute->value
@@ -149,10 +153,14 @@ namespace Canteen\HTML5
         public function __set($name, $value)
         {
             if (method_exists($this , $method =('set' . ucfirst($name))))
+            {
                 return $this->$method($value);
+            }
             else
+            {
                 throw new HTML5Error(HTML5Error::INVALID_SETTER, $name);
             }
+        }
 
         /**
         *  See if a property exists
@@ -166,5 +174,3 @@ namespace Canteen\HTML5
         }
     }
 }
-
-?>

src/Comment.php

@@ -34,5 +34,3 @@ namespace Canteen\HTML5
         }
     }
 }
-
-?>

src/Document.php

@@ -86,7 +86,9 @@ namespace Canteen\HTML5
         {
             $result = $this->docType . parent::__toString();
             if ($this->beautify)
+            {
                 $result = self::beautify($result);
+            }
             return $result;
         }
 
@@ -113,5 +115,3 @@ namespace Canteen\HTML5
         }
     }
 }
-
-?>

src/Fragment.php

@@ -0,0 +1,41 @@
+<?php
+
+/**
+* @module Canteen\HTML5
+*/
+namespace Canteen\HTML5
+{
+    /**
+    *  Represents a set of HTML tags without a wrapper.
+    *  Do not initiate this class directly, use the `html()` function:
+    *
+    *       $div = html('fragment');
+    *
+    *  @class Fragment
+    *  @extends NodeContainer
+    *  @constructor
+    *  @param {Node|Array} [children=null] The collection of children or single child
+    */
+    class Fragment extends NodeContainer
+    {
+        public function __construct($children = null)
+        {
+            parent::__construct('fragment', $children, null);
+        }
+
+        /**
+        *  Write to HTML
+        *  @method __toString
+        *  @return {String} The string representation of this HTML node
+        */
+        public function __toString()
+        {
+            $buffer = '';
+            foreach ($this->getChildren() as $child)
+            {
+                $buffer .= $child->__toString();
+            }
+            return $buffer;
+        }
+    }
+}

src/HTML5.php

@@ -22,7 +22,10 @@ namespace Canteen\HTML5
             spl_autoload_register(function($name)
             {
                 // Ignore class names not in the HTML5 namespace
-				if (!preg_match('/^Canteen\\\HTML5\\\/', $name)) return;
+                if (!preg_match('/^Canteen\\\HTML5\\\/', $name))
+                {
+                    return;
+                }
 
                 // Remove the HTML5 namespace
                 $name = preg_replace('/^Canteen\\\HTML5\\\/', '', $name);
@@ -109,6 +112,11 @@ namespace Canteen\HTML5
         {
             return new Text($childrenOrAttributes);
         }
+        // Untagged container
+        else if ($tag == 'fragment')
+        {
+            return new Fragment($childrenOrAttributes);
+        }
         // Check for task specification
         else if (isset(Specification::$TAGS[$tag]))
         {
@@ -155,7 +163,9 @@ namespace Canteen\HTML5
                     $node->id = substr($selector, 1);
                     break;
                 case '.' :
-					if ($node->class) $node->class .= ' ';
+                    if ($node->class) {
+                        $node->class .= ' ';
+                    }
                     $node->class .= substr($selector, 1);
                     break;
             }

src/HTML5Error.php

@@ -140,5 +140,3 @@ namespace Canteen\HTML5
         }
     }
 }
-
-?>

src/Node.php

@@ -12,11 +12,12 @@ namespace Canteen\HTML5
     *       echo html('br');
     *
     *  @class Node
+    *  @extends Proto
     *  @constructor
     *  @param {String} [tag=null] The name of the tag
     *  @param {Array|String} [attributes=null] The collection of tag attributes
     */
-	class Node
+    class Node extends Proto
     {
         /**
         *  The string name of the tag
@@ -138,9 +139,13 @@ namespace Canteen\HTML5
                 if ($attribute->name === $name)
                 {
                     if (!$this->isEmpty($value))
+                    {
                         $attribute->value = $value;
+                    }
                     else
+                    {
                         unset($this->_attributes[$i]);
+                    }
                     return $this;
                 }
             }
@@ -336,5 +341,3 @@ namespace Canteen\HTML5
         }
     }
 }
-
-?>

src/NodeContainer.php

@@ -83,7 +83,7 @@ namespace Canteen\HTML5
             {
                 array_unshift($this->_children, $childNode);
             }
-			else if ($index > $len)
+            else if ($index > (count($this->_children) - 1))
             {
                 $this->addChild($childNode);
             }
@@ -233,5 +233,3 @@ namespace Canteen\HTML5
         }
     }
 }
-
-?>

src/Proto.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+*  @module Canteen\HTML5
+*/
+namespace Canteen\HTML5
+{
+    /**
+    *  Prototype class for all Canteen\HTML5 entities
+    * 
+    *  @class Proto
+    *  @constructor
+    *  @param {String} text the plain text string
+    */
+    class Proto
+        {
+        /**
+        *  General purpose getter to get attribute values
+        *  @method __get
+        *  @param {String} name The name of the property to set
+        */
+        public function __get($name)
+        {
+            return null;
+        }
+
+        /**
+        *  See if a property exists
+        *  @method __isset
+        *  @param {String} name The name of the attribute
+        */
+        public function __isset($name)
+        {
+            return null;
+        }
+    }
+}

src/SimpleList.php

@@ -68,5 +68,3 @@ namespace Canteen\HTML5
         }
     }
 }
-
-?>

src/Specification.php

@@ -58,7 +58,9 @@ namespace Canteen\HTML5
                 'target'
             ),
             'bdo' => array(),
-			'blockquote' => array('cite'),
+            'blockquote' => array(
+                'cite'
+            ),
             'body' => array(),
             'br' => array(),
             'button' => array(
@@ -82,7 +84,9 @@ namespace Canteen\HTML5
             'cite' => array(),
             'code' => array(),
             'col' => null,
-			'colgroup' => array('span'),
+            'colgroup' => array(
+                'span'
+            ),
             'command' => array(
                 'checked',
                 'disabled',
@@ -137,7 +141,9 @@ namespace Canteen\HTML5
             'header' => array(),
             'hgroup' => array(),
             'hr' => array(),
-			'html' => array('manifest'),
+            'html' => array(
+                'manifest'
+            ),
             'img' => array(
                 'alt',
                 'crossorigin',
@@ -147,6 +153,13 @@ namespace Canteen\HTML5
                 'width'
             ),
             'i' => array(),
+            'iframe' => array(
+                'src',
+                'srcdoc',
+                'name',
+                'width',
+                'height'
+            ),
             'input' => array(
                 'accept',
                 'alt',
@@ -200,7 +213,9 @@ namespace Canteen\HTML5
                 'sizes',
                 'type'
             ),
-			'map' => array('name'),
+            'map' => array(
+                'name'
+            ),
             'mark' => array(),
             'menu' => array(),
             'meta' => array(
@@ -259,7 +274,9 @@ namespace Canteen\HTML5
                 'max',
                 'value'
             ),
-			'q' => array('cite'),
+            'q' => array(
+                'cite'
+            ),
             'rp' => array(),
             'rt' => array(),
             'ruby' => array(),
@@ -283,18 +300,22 @@ namespace Canteen\HTML5
                 'size'
             ),
             'small' => array(),
-			'source' => array('media',
+            'source' => array(
+                'media',
                 'src',
                 'type'
             ),
             'span' => array(),
             'strong' => array(),
-			'style' => array('media',
+            'style' => array(
+                'media',
                 'scoped',
                 'type'
             ),
             'sub' => array(),
-			'table' => array('border'),
+            'table' => array(
+                'border'
+            ),
             'tbody' => array(),
             'td' => array(
                 'colspan',
@@ -322,7 +343,9 @@ namespace Canteen\HTML5
                 'scope'
             ),
             'thead' => array(),
-			'time' => array('datetime'),
+            'time' => array(
+                'datetime'
+            ),
             'title' => array(),
             'tr' => array(),
             'track' => array(

src/Table.php

@@ -72,7 +72,10 @@ namespace Canteen\HTML5
                 }
                 foreach ($d as $name=>$value)
                 {
-					if ($name == $checkbox) continue;
+                    if ($name == $checkbox)
+                    {
+                        continue;
+                    }
                     $td = html('td', $value, 'class=' . $name);
                     $row->addChild($td);
                 }
@@ -82,5 +85,3 @@ namespace Canteen\HTML5
         }
     }
 }
-
-?>

src/Text.php

@@ -35,5 +35,3 @@ namespace Canteen\HTML5
         }
     }
 }
-
-?>