Mibew/CanteenHTML5
1
0
Fork 0
mirror of https://github.com/Mibew/CanteenHTML5.git synced 2024-11-15 00:34:11 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix code styling

Browse Source
This commit is contained in:
Fedor A. Fetisov 2021-07-09 23:19:03 +03:00
parent 7bdec8e106
commit 9f7340ec78
14 changed files with 1853 additions and 1837 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/document.php
View File

@ -53,5 +53,3 @@
// Output the result formatted nice with indents // Output the result formatted nice with indents
echo $doc; echo $doc;
?>

12
src/Attribute.php
View File

@ -113,7 +113,7 @@ namespace Canteen\HTML5
// Match the name=value in the attributes string // Match the name=value in the attributes string
preg_match_all('/([a-z]+[a-z\-]*)\=("[^\"]*"|\'[^\']*\'|[^\s\"\']*)/',$str, $arr); preg_match_all('/([a-z]+[a-z\-]*)\=("[^\"]*"|\'[^\']*\'|[^\s\"\']*)/',$str, $arr);
foreach($arr[1] as $i=>$name) foreach ($arr[1] as $i=>$name)
{ {
$value = $arr[2][$i]; $value = $arr[2][$i];
@ -135,10 +135,14 @@ namespace Canteen\HTML5
public function __get($name) public function __get($name)
{ {
if (method_exists($this , $method =('get' . ucfirst($name)))) if (method_exists($this , $method =('get' . ucfirst($name))))
{
return $this->$method(); return $this->$method();
}
else else
{
throw new HTML5Error(HTML5Error::INVALID_GETTER, $name); throw new HTML5Error(HTML5Error::INVALID_GETTER, $name);
} }
}
/** /**
* General purpose setter for setting attribute->name and attribute->value * General purpose setter for setting attribute->name and attribute->value
@ -149,10 +153,14 @@ namespace Canteen\HTML5
public function __set($name, $value) public function __set($name, $value)
{ {
if (method_exists($this , $method =('set' . ucfirst($name)))) if (method_exists($this , $method =('set' . ucfirst($name))))
{
return $this->$method($value); return $this->$method($value);
}
else else
{
throw new HTML5Error(HTML5Error::INVALID_SETTER, $name); throw new HTML5Error(HTML5Error::INVALID_SETTER, $name);
} }
}
/** /**
* See if a property exists * See if a property exists
@ -166,5 +174,3 @@ namespace Canteen\HTML5
} }
} }
} }
?>

4
src/Comment.php
View File

@ -30,9 +30,7 @@ namespace Canteen\HTML5
*/ */
public function __toString() public function __toString()
{ {
return '<!-- '.$this->_tag.' -->'; return '<!-- ' . $this->_tag . ' -->';
} }
} }
} }
?>

6
src/Document.php
View File

@ -70,7 +70,7 @@ namespace Canteen\HTML5
$this->body = html('body'); $this->body = html('body');
$this->title = html('title', $title); $this->title = html('title', $title);
$this->head->addChild(html('meta', 'charset='.$charset)); $this->head->addChild(html('meta', 'charset=' . $charset));
$this->head->addChild($this->title); $this->head->addChild($this->title);
$this->addChild($this->head); $this->addChild($this->head);
@ -86,7 +86,9 @@ namespace Canteen\HTML5
{ {
$result = $this->docType . parent::__toString(); $result = $this->docType . parent::__toString();
if ($this->beautify) if ($this->beautify)
{
$result = self::beautify($result); $result = self::beautify($result);
}
return $result; return $result;
} }
@ -113,5 +115,3 @@ namespace Canteen\HTML5
} }
} }
} }
?>

4
src/Fragment.php
View File

@ -31,7 +31,7 @@ namespace Canteen\HTML5
public function __toString() public function __toString()
{ {
$buffer = ''; $buffer = '';
foreach($this->getChildren() as $child) foreach ($this->getChildren() as $child)
{ {
$buffer .= $child->__toString(); $buffer .= $child->__toString();
} }
@ -39,5 +39,3 @@ namespace Canteen\HTML5
} }
} }
} }
?>

17
src/HTML5.php
View File

@ -22,7 +22,10 @@ namespace Canteen\HTML5
spl_autoload_register(function($name) spl_autoload_register(function($name)
{ {
// Ignore class names not in the HTML5 namespace // 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 // Remove the HTML5 namespace
$name = preg_replace('/^Canteen\\\HTML5\\\/', '', $name); $name = preg_replace('/^Canteen\\\HTML5\\\/', '', $name);
@ -31,7 +34,7 @@ namespace Canteen\HTML5
$name = str_replace("\\", '/', $name); $name = str_replace("\\", '/', $name);
// Include the class relative to here // Include the class relative to here
include __DIR__.'/'.$name.'.php'; include __DIR__ . '/' . $name . '.php';
}); });
} }
@ -41,7 +44,7 @@ namespace Canteen\HTML5
*/ */
static public function useGlobal() static public function useGlobal()
{ {
include __DIR__.'/html.php'; include __DIR__ . '/html.php';
} }
} }
@ -152,15 +155,17 @@ namespace Canteen\HTML5
new NodeContainer($tag, $childrenOrAttributes, $attributes); new NodeContainer($tag, $childrenOrAttributes, $attributes);
// Take the selectors convert them into id or class // Take the selectors convert them into id or class
foreach($selectors[0] as $selector) foreach ($selectors[0] as $selector)
{ {
switch($selector[0]) switch ($selector[0])
{ {
case '#' : case '#' :
$node->id = substr($selector, 1); $node->id = substr($selector, 1);
break; break;
case '.' : case '.' :
if ($node->class) $node->class .= ' '; if ($node->class) {
$node->class .= ' ';
}
$node->class .= substr($selector, 1); $node->class .= substr($selector, 1);
break; break;
} }

2
src/HTML5Error.php
View File

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

16
src/Node.php
View File

@ -134,14 +134,18 @@ namespace Canteen\HTML5
{ {
throw new HTML5Error(HTML5Error::EMPTY_ATTRIBUTE_NAME); throw new HTML5Error(HTML5Error::EMPTY_ATTRIBUTE_NAME);
} }
foreach($this->_attributes as $i=>$attribute) foreach ($this->_attributes as $i=>$attribute)
{ {
if ($attribute->name === $name) if ($attribute->name === $name)
{ {
if (!$this->isEmpty($value)) if (!$this->isEmpty($value))
{
$attribute->value = $value; $attribute->value = $value;
}
else else
{
unset($this->_attributes[$i]); unset($this->_attributes[$i]);
}
return $this; return $this;
} }
} }
@ -165,7 +169,7 @@ namespace Canteen\HTML5
{ {
throw new HTML5Error(HTML5Error::EMPTY_ATTRIBUTE_NAME); throw new HTML5Error(HTML5Error::EMPTY_ATTRIBUTE_NAME);
} }
foreach($this->_attributes as $attribute) foreach ($this->_attributes as $attribute)
{ {
if ($attribute->name === $name) if ($attribute->name === $name)
{ {
@ -186,7 +190,7 @@ namespace Canteen\HTML5
{ {
if (is_array($values)) if (is_array($values))
{ {
foreach($values as $name=>$value) foreach ($values as $name=>$value)
{ {
$this->setAttribute($name, $value); $this->setAttribute($name, $value);
} }
@ -237,7 +241,7 @@ namespace Canteen\HTML5
*/ */
public function getData($name) public function getData($name)
{ {
return $this->getAttribute('data-'.$name); return $this->getAttribute('data-' . $name);
} }
/** /**
@ -261,7 +265,7 @@ namespace Canteen\HTML5
{ {
$buffer = '<'; $buffer = '<';
$buffer .= $this->_tag; $buffer .= $this->_tag;
foreach($this->_attributes as $attribute) foreach ($this->_attributes as $attribute)
{ {
$buffer .= (string)$attribute; $buffer .= (string)$attribute;
} }
@ -337,5 +341,3 @@ namespace Canteen\HTML5
} }
} }
} }
?>

8
src/NodeContainer.php
View File

@ -45,7 +45,7 @@ namespace Canteen\HTML5
} }
if (is_array($children)) if (is_array($children))
{ {
foreach($children as $child) foreach ($children as $child)
{ {
$this->addChild($child); $this->addChild($child);
} }
@ -141,7 +141,7 @@ namespace Canteen\HTML5
throw new HTML5Error(HTML5Error::EMPTY_CHILD); throw new HTML5Error(HTML5Error::EMPTY_CHILD);
} }
for($i = 0; $i < count($this->_children); $i++) for ($i = 0; $i < count($this->_children); $i++)
{ {
$child = $this->_children[$i]; $child = $this->_children[$i];
if ($child === $childNode) if ($child === $childNode)
@ -223,7 +223,7 @@ namespace Canteen\HTML5
public function __toString() public function __toString()
{ {
$buffer = $this->writeOpen(false); $buffer = $this->writeOpen(false);
foreach($this->_children as $child) foreach ($this->_children as $child)
{ {
$buffer .= $child->__toString(); $buffer .= $child->__toString();
} }
@ -233,5 +233,3 @@ namespace Canteen\HTML5
} }
} }
} }
?>

4
src/SimpleList.php
View File

@ -37,7 +37,7 @@ namespace Canteen\HTML5
{ {
assert(is_array($elements)); assert(is_array($elements));
foreach($elements as $child) foreach ($elements as $child)
{ {
$this->addChild($child); $this->addChild($child);
} }
@ -68,5 +68,3 @@ namespace Canteen\HTML5
} }
} }
} }
?>

34
src/Specification.php
View File

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

19
src/Table.php
View File

@ -46,7 +46,7 @@ namespace Canteen\HTML5
$row->addChild(html('th', html('span', $checkbox))); $row->addChild(html('th', html('span', $checkbox)));
} }
foreach($headers as $header) foreach ($headers as $header)
{ {
$row->addChild(html('th', $header)); $row->addChild(html('th', $header));
} }
@ -55,7 +55,7 @@ namespace Canteen\HTML5
$body = html('tbody'); $body = html('tbody');
foreach($data as $d) foreach ($data as $d)
{ {
$row = html('tr'); $row = html('tr');
@ -64,16 +64,19 @@ namespace Canteen\HTML5
$td = html('td', $td = html('td',
html( html(
'input', 'input',
'type=checkbox name='.$checkbox.'[] value='.$d[$checkbox] 'type=checkbox name=' . $checkbox . '[] value='.$d[$checkbox]
), ),
'class='.$checkbox 'class=' . $checkbox
); );
$row->addChild($td); $row->addChild($td);
} }
foreach($d as $name=>$value) foreach ($d as $name=>$value)
{ {
if ($name == $checkbox) continue; if ($name == $checkbox)
$td = html('td', $value, 'class='.$name); {
continue;
}
$td = html('td', $value, 'class=' . $name);
$row->addChild($td); $row->addChild($td);
} }
$body->addChild($row); $body->addChild($row);
@ -82,5 +85,3 @@ namespace Canteen\HTML5
} }
} }
} }
?>

2
src/Text.php
View File

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