Fenzland / Htsl.php

libs/Htsl.php

Doc Comments +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 	/**
 	 * Getting the config of Htsl.
 	 *
-	 * @param  string $keys
+	 * @param  string[] $keys
 	 *
 	 * @return mixed
 	 */

libs/Parser/Document.php

Doc Comments +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
 	 *
 	 * @param  [ string, ] ...$keys
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public function getConfig( string...$keys )
 	{

Spacing +69 added lines, -69 removed lines

@@ -68,35 +68,35 @@ 
 	 *
 	 * @var int
 	 */
-	private $level= 0;
+	private $level=0;
 
 	/**
 	 * Section indent level.
 	 *
 	 * @var int
 	 */
-	private $sectionLevel= 0;
+	private $sectionLevel=0;
 
 	/**
 	 * Opened nodes.
 	 *
 	 * @var [ Htsl\Parser\Node\Contracts\ANode, ]
 	 */
-	private $openedNodes= [];
+	private $openedNodes=[ ];
 
 	/**
 	 * Current scopes.
 	 *
 	 * @var [ Htsl\Parser\Node\Contracts\ANode, ]
 	 */
-	private $scopes= [];
+	private $scopes=[ ];
 
 	/**
 	 * Current line number.
 	 *
 	 * @var int
 	 */
-	private $lineNumber= 0;
+	private $lineNumber=0;
 
 	/**
 	 * Current line.
@@ -110,7 +110,7 @@ 
 	 *
 	 * @var [ Htsl\Parser\Section, ]
 	 */
-	private $sections=[];
+	private $sections=[ ];
 
 	/**
 	 * Whether the document is executed.
@@ -142,13 +142,13 @@ 
 	 */
 	public function __construct( Htsl$htsl, Buffer$buffer, self$parent=null )
 	{
-		$this->htsl= $htsl;
-		$this->buffer= $buffer;
+		$this->htsl=$htsl;
+		$this->buffer=$buffer;
 
 		if( $parent ){
-			$this->parent= $parent;
-			$this->docType= $parent->docType;
-			$this->indentation= $parent->indentation;
+			$this->parent=$parent;
+			$this->docType=$parent->docType;
+			$this->indentation=$parent->indentation;
 		}else{
 			$this->parseFirstLine();
 		}
@@ -201,7 +201,7 @@ 
 	protected function getLine():Line
 	{
 		do{
-			$line= $this->buffer->getLine();
+			$line=$this->buffer->getLine();
 		}while( $line->isEmpty() && $line->hasMore() );
 
 		return $line;
@@ -216,7 +216,7 @@ 
 	 */
 	public function getConfig( string...$keys )
 	{
-		return $this->htsl->getConfig(array_shift($keys),$this->docType,...$keys);
+		return $this->htsl->getConfig(array_shift($keys), $this->docType, ...$keys);
 	}
 
 	/**
@@ -256,16 +256,16 @@ 
 	 */
 	protected function parseFirstLine():self
 	{
-		$line= $this->getLine();
+		$line=$this->getLine();
 
 		if( '@'===$line->getChar(0) ){
 			return $this->setExtending($line);
 		}
 
-		$this->docType= $line->content;
-		$docTypeContent= $this->getConfig('doc_types') or $this->throw("DocType $this->docType is not supported");
+		$this->docType=$line->content;
+		$docTypeContent=$this->getConfig('doc_types') or $this->throw("DocType $this->docType is not supported");
 
-		$this->indentation= $this->htsl->getConfig('indentation',$this->docType) ?? ( function( $scalarOrFalse ){ return is_scalar($scalarOrFalse)?$scalarOrFalse:false; } )($this->htsl->getConfig('indentation'));
+		$this->indentation=$this->htsl->getConfig('indentation', $this->docType) ?? (function( $scalarOrFalse ){ return is_scalar($scalarOrFalse)? $scalarOrFalse : false; } )($this->htsl->getConfig('indentation'));
 
 		$this->appendLine($docTypeContent);
 
@@ -279,7 +279,7 @@ 
 	 */
 	protected function setExtending( Line$firstLine ):self
 	{
-		switch( $name= $firstLine->pregGet('/(?<=^@)[\w-:]+/') ){
+		switch( $name=$firstLine->pregGet('/(?<=^@)[\w-:]+/') ){
 			default:{
 				$this->throw("The @$name is not supported.");
 			}break;
@@ -303,8 +303,8 @@ 
 	 */
 	protected function lineByLine():self
 	{
-		while( ($line= $this->getLine())->hasMore() ){
-			$this->lineNumber+= 1;
+		while( ($line=$this->getLine())->hasMore() ){
+			$this->lineNumber+=1;
 
 			if( $this->embedment ){
 				$this->embeddingParse($line);
@@ -317,7 +317,7 @@ 
 
 		$this->closeNodes($this->level);
 
-		$this->isExecuted= true;
+		$this->isExecuted=true;
 
 		return $this;
 	}
@@ -348,10 +348,10 @@ 
 	 */
 	protected function startEmbedding( string$embedType ):self
 	{
-		$embedmentClass= '\\Htsl\\Embedment\\'.ucfirst($embedType).'Embedment';
+		$embedmentClass='\\Htsl\\Embedment\\'.ucfirst($embedType).'Embedment';
 		class_exists($embedmentClass) or $this->throw("Embed type $embedType not exists.");
 
-		$this->embedment= new $embedmentClass($this);
+		$this->embedment=new $embedmentClass($this);
 
 		return $this;
 	}
@@ -364,7 +364,7 @@ 
 	public function breakEmbedding():self
 	{
 		$this->append($this->embedment->getContent());
-		$this->embedment= null;
+		$this->embedment=null;
 
 		return $this;
 	}
@@ -378,7 +378,7 @@ 
 	 */
 	protected function parseLine( Line$line ):self
 	{
-		$this->currentLine= $line;
+		$this->currentLine=$line;
 		$this->setLevel($line->getIndentLevel());
 
 		switch( $line->getChar(0) ){
@@ -419,7 +419,7 @@ 
 	 */
 	protected function parseHtmlLine( Line$line ):self
 	{
-		$node= new StringNode($this,$line);
+		$node=new StringNode($this, $line);
 
 		$this->openNode($node);
 
@@ -437,7 +437,7 @@ 
 	 */
 	protected function parseStringLine( Line$line ):self
 	{
-		$node= new StringNode($this,$line);
+		$node=new StringNode($this, $line);
 
 		$this->openNode($node);
 
@@ -455,13 +455,13 @@ 
 	 */
 	protected function parseExpressionLine( Line$line ):self
 	{
-		$node= new StringNode($this,$line);
+		$node=new StringNode($this, $line);
 
 		$this->openNode($node);
 
-		$content=  $line->slice(1);
-		$ent_flag= var_export($this->htsl->getConfig('ENT_flags',$this->docType),true);
-		$charset=   var_export($this->htsl->getConfig('charset'),true);
+		$content=$line->slice(1);
+		$ent_flag=var_export($this->htsl->getConfig('ENT_flags', $this->docType), true);
+		$charset=var_export($this->htsl->getConfig('charset'), true);
 
 		$this->appendLine("<?=htmlentities($content,$ent_flag,$charset,false)?>");
 
@@ -477,11 +477,11 @@ 
 	 */
 	protected function parseExpressionHtmlLine( Line$line ):self
 	{
-		$node= new StringNode($this,$line);
+		$node=new StringNode($this, $line);
 
 		$this->openNode($node);
 
-		$content=  $line->slice(1);
+		$content=$line->slice(1);
 
 		$this->appendLine("<?$content?>");
 
@@ -497,7 +497,7 @@ 
 	 */
 	protected function parseCommentLine( Line$line ):self
 	{
-		$node= new CommentNode($this,$line);
+		$node=new CommentNode($this, $line);
 
 		$this->openNode($node);
 
@@ -515,7 +515,7 @@ 
 	 */
 	protected function parseTagLine( Line$line ):self
 	{
-		$tag= new TagNode($this,$line);
+		$tag=new TagNode($this, $line);
 
 		$this->appendLine($tag->open());
 
@@ -535,7 +535,7 @@ 
 	 */
 	protected function parseControlLine( Line$line ):self
 	{
-		$controlStructure= new ControlNode($this,$line);
+		$controlStructure=new ControlNode($this, $line);
 
 		$this->appendLine($controlStructure->open());
 
@@ -553,7 +553,7 @@ 
 	 */
 	protected function parseDocControlLine( Line$line ):self
 	{
-		switch( $name= $line->pregGet('/(?<=^@)[\w-:]+/') ){
+		switch( $name=$line->pregGet('/(?<=^@)[\w-:]+/') ){
 			default:{
 				$this->throw("The @$name is not supported.");
 			}break;
@@ -583,10 +583,10 @@ 
 	 */
 	protected function extend( string$fileName ):self
 	{
-		$this->parent= new static($this->htsl,$this->buffer->goSide($fileName),null,$this->indentation);
+		$this->parent=new static($this->htsl, $this->buffer->goSide($fileName), null, $this->indentation);
 
-		$this->docType= $this->parent->docType;
-		$this->indentation= $this->parent->indentation;
+		$this->docType=$this->parent->docType;
+		$this->indentation=$this->parent->indentation;
 
 		return $this;
 	}
@@ -598,15 +598,15 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function include( Line$line ):self
+	protected function include(Line$line):self
 	{
-		$inclued= (new static($this->htsl,$this->buffer->goSide($line->pregGet('/(?<=\( ).*(?= \))/')),$this,$this->indentation))->execute()->content;
+		$inclued=(new static($this->htsl, $this->buffer->goSide($line->pregGet('/(?<=\( ).*(?= \))/')), $this, $this->indentation))->execute()->content;
 
 		if( false!==$this->indentation ){
-			$inclued= preg_replace('/(?<=^|\\n)(?!$)/',str_repeat($this->indentation,$this->level-$this->sectionLevel),$inclued);
+			$inclued=preg_replace('/(?<=^|\\n)(?!$)/', str_repeat($this->indentation, $this->level-$this->sectionLevel), $inclued);
 		}
 
-		$node= new StringNode($this,$line);
+		$node=new StringNode($this, $line);
 
 		$this->openNode($node);
 
@@ -624,7 +624,7 @@ 
 	 */
 	protected function defineSection( Line$line ):self
 	{
-		$node= new SectionNode($this,$line);
+		$node=new SectionNode($this, $line);
 
 		$node->open();
 
@@ -642,22 +642,22 @@ 
 	 */
 	protected function showSection( Line$line ):self
 	{
-		$sectionName= $line->pregGet('/(?<=\( ).*(?= \))/');
+		$sectionName=$line->pregGet('/(?<=\( ).*(?= \))/');
 
-		if( !isset($this->sections[$sectionName]) ){
-			$this->openNode(new StringNode($this,$line));
+		if( !isset($this->sections[ $sectionName ]) ){
+			$this->openNode(new StringNode($this, $line));
 
 			return $this;
 		}
-		$content= $this->sections[$sectionName]->content;
+		$content=$this->sections[ $sectionName ]->content;
 
 		if( false!==$this->indentation ){
-			$content= preg_replace('/(?<=^|\\n)(?!$)/',str_repeat($this->indentation,$this->level),$content);
+			$content=preg_replace('/(?<=^|\\n)(?!$)/', str_repeat($this->indentation, $this->level), $content);
 		}
 
 		$this->append($content);
 
-		$node= new NamelessSectionNode($this,$line);
+		$node=new NamelessSectionNode($this, $line);
 
 		$node->open();
 
@@ -674,8 +674,8 @@ 
 	public function setSection( Section$section=null ):self
 	{
 		if( !$section ){
-			$this->sectionLevel= 0;
-			$this->currentSection= null;
+			$this->sectionLevel=0;
+			$this->currentSection=null;
 
 			return $this;
 		}
@@ -684,17 +684,17 @@ 
 			$this->throw('Nesting definition of section is forbidden.');
 		}
 
-		if( isset($this->parent->sections[$section->name]) ){
+		if( isset($this->parent->sections[ $section->name ]) ){
 			$this->throw("Section $sectionName already defined.");
 		}
 
-		$this->currentSection= $section;
+		$this->currentSection=$section;
 
 		if( $section->name ){
-			$this->parent->sections[$section->name]=$section;
+			$this->parent->sections[ $section->name ]=$section;
 		}
 
-		$this->sectionLevel= $this->level+1;
+		$this->sectionLevel=$this->level+1;
 
 		return $this;
 	}
@@ -708,8 +708,8 @@ 
 	{
 		if( $this->parent ){
 			foreach( $this->sections as $name=>$section ){
-				if( !isset($this->parent->sections[$name]) ){
-					$this->parent->sections[$name]=$section;
+				if( !isset($this->parent->sections[ $name ]) ){
+					$this->parent->sections[ $name ]=$section;
 				};
 			}
 		}
@@ -726,7 +726,7 @@ 
 	 */
 	public function htmlEntities( string$input ):string
 	{
-		return htmlentities($input,$this->htsl->getConfig('ENT_flags',$this->docType),$this->htsl->getConfig('charset'),false);
+		return htmlentities($input, $this->htsl->getConfig('ENT_flags', $this->docType), $this->htsl->getConfig('charset'), false);
 	}
 
 	/**
@@ -736,12 +736,12 @@ 
 	 */
 	protected function setLevel( int$level ):self
 	{
-		$level-= $this->level;
+		$level-=$this->level;
 
 		if( $level<=0 ){
 			$this->closeNodes(-$level);
 		}elseif( $level==1 ){
-			$this->level+= 1;
+			$this->level+=1;
 		}else{
 			$this->throw('Indent error.');
 		}
@@ -758,7 +758,7 @@ 
 	 */
 	protected function openNode( Node$node ):self
 	{
-		array_push($this->openedNodes,$node);
+		array_push($this->openedNodes, $node);
 
 		$node->scope and $this->setScope($node);
 
@@ -777,13 +777,13 @@ 
 		if( empty($this->openedNodes) ) return $this;
 
 		while( $level-->=0 ){
-			$node= array_pop($this->openedNodes);
+			$node=array_pop($this->openedNodes);
 
 			$node->scope and $this->removeScope($node);
 
 			$closer=$node->close($this->currentLine) and $this->appendLine($closer);
 
-			$this->level-= $level>=0 ?1:0;
+			$this->level-=$level>=0? 1 : 0;
 		}
 
 		return $this;
@@ -796,7 +796,7 @@ 
 	 */
 	protected function setScope( Node$scope ):int
 	{
-		return array_unshift($this->scopes,$scope);
+		return array_unshift($this->scopes, $scope);
 	}
 
 	/**
@@ -806,7 +806,7 @@ 
 	 */
 	public function getScope()
 	{
-		return $this->scopes[0]??null;
+		return $this->scopes[ 0 ]??null;
 	}
 
 	/**
@@ -835,7 +835,7 @@ 
 	protected function appendLine( string$content ):self
 	{
 		if( false!==$this->indentation ){
-			$content= str_repeat($this->indentation,$this->level-$this->sectionLevel).$content."\n";
+			$content=str_repeat($this->indentation, $this->level-$this->sectionLevel).$content."\n";
 		}
 
 		return $this->append($content);
@@ -876,7 +876,7 @@ 
 	 *
 	 * @throw \Htsl\Parser\HtslParsingException
 	 */
-	public function throw( string$message )
+	public function throw(string$message)
 	{
 		throw new HtslParsingException("$message at file {$this->buffer->fileName} line $this->lineNumber");
 	}

libs/Parser/Node/TagNode.php

Doc Comments -1 removed lines

@@ -90,7 +90,6 @@
 	/**
 	 * Close this tag node, and returning node closer.
 	 *
-	 * @param  \Htsl\ReadingBuffer\Line   $closerLine  The line when node closed.
 	 *
 	 * @return string
 	 */

Spacing +67 added lines, -67 removed lines

@@ -30,7 +30,7 @@ 
 	 *
 	 * @var array
 	 */
-	private $attributes=[];
+	private $attributes=[ ];
 
 	/**
 	 * Real constructor.
@@ -40,14 +40,14 @@ 
 	protected function construct():parent
 	{
 
-		$name= $this->line->pregGet('/(?<=^-)[\w-:]+/');
+		$name=$this->line->pregGet('/(?<=^-)[\w-:]+/');
 		$this->name=$name;
 
-		$this->loadConfig($name,$this->document);
+		$this->loadConfig($name, $this->document);
 
-		$this->tagName=$this->config['name']??$name;
-		$this->isEmpty= $this->line->getChar(-1)==='/' || $this->document->getConfig('empty_tags',$this->tagName);
-		isset($this->config['default_attributes']) and array_walk($this->config['default_attributes'],function( $value,$key ){ $this->setAttribute($key,$value); });
+		$this->tagName=$this->config[ 'name' ]??$name;
+		$this->isEmpty=$this->line->getChar(-1)==='/' || $this->document->getConfig('empty_tags', $this->tagName);
+		isset($this->config[ 'default_attributes' ]) and array_walk($this->config[ 'default_attributes' ], function( $value, $key ){ $this->setAttribute($key, $value); });
 
 		return $this;
 	}
@@ -59,30 +59,30 @@ 
 	 */
 	public function open():string
 	{
-		if( isset($this->config['opener']) )
-			{ return $this->config['opener']; }
+		if( isset($this->config[ 'opener' ]) )
+			{ return $this->config[ 'opener' ]; }
 
-		if( isset($this->config['params']) )
+		if( isset($this->config[ 'params' ]) )
 			{ $this->parseParams(); }
 
-		if( isset($this->config['name_value']) )
+		if( isset($this->config[ 'name_value' ]) )
 			{ $this->parseNameValue(); }
 
-		if( isset($this->config['link']) )
+		if( isset($this->config[ 'link' ]) )
 			{ $this->parseLink(); }
 
-		if( isset($this->config['target']) )
+		if( isset($this->config[ 'target' ]) )
 			{ $this->parseTarget(); }
 
-		if( isset($this->config['alt']) )
+		if( isset($this->config[ 'alt' ]) )
 			{ $this->parseAlt(); }
 
 		$this->parseCommonAttributes();
 
-		if( isset($this->config['in_scope']) && isset($this->config['scope_function']) && is_callable($this->config['scope_function']) )
-			{ $this->config['scope_function']->call($this,$this->document->scope); }
+		if( isset($this->config[ 'in_scope' ]) && isset($this->config[ 'scope_function' ]) && is_callable($this->config[ 'scope_function' ]) )
+			{ $this->config[ 'scope_function' ]->call($this, $this->document->scope); }
 
-		$finisher= $this->isEmpty ? ' />' : '>';
+		$finisher=$this->isEmpty? ' />' : '>';
 
 		return "<{$this->tagName}{$this->attributesString}{$finisher}";
 	}
@@ -96,7 +96,7 @@ 
 	 */
 	public function close( Line$Line ):string
 	{
-		return $this->isEmpty ? '' : $this->config['closer']??"</{$this->tagName}>";
+		return $this->isEmpty? '' : $this->config[ 'closer' ]??"</{$this->tagName}>";
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 */
 	public function getEmbed():string
 	{
-		return $this->config['embedding']??'';
+		return $this->config[ 'embedding' ]??'';
 	}
 
 	/**
@@ -116,7 +116,7 @@ 
 	 */
 	public function getScope()
 	{
-		return $this->config['scope']??null;
+		return $this->config[ 'scope' ]??null;
 	}
 
 	/**
@@ -126,11 +126,11 @@ 
 	 */
 	protected function parseParams():self
 	{
-		$params= preg_split('/(?<!\\\\)\\|/',$this->line->pregGet('/^-[\w-:]+\((.*?)\)(?= |(\\{>)?$)/',1));
+		$params=preg_split('/(?<!\\\\)\\|/', $this->line->pregGet('/^-[\w-:]+\((.*?)\)(?= |(\\{>)?$)/', 1));
 
-		if( ($m= count($params)) != ($n= count($this->config['params'])) ){$this->document->throw("Tag $this->name has $n parameters $m given.");}
+		if( ($m=count($params))!=($n=count($this->config[ 'params' ])) ){$this->document->throw("Tag $this->name has $n parameters $m given."); }
 
-		array_map(function( $key, $value ){return $this->setAttribute($key,str_replace('\\|','|',$value));},$this->config['params'],$params);
+		array_map(function( $key, $value ){return $this->setAttribute($key, str_replace('\\|', '|', $value)); },$this->config[ 'params' ], $params);
 
 		return $this;
 	}
@@ -142,9 +142,9 @@ 
 	 */
 	protected function parseNameValue():self
 	{
-		$params= $this->line->pregGet('/ <(.*?)>(?= |$)/',1)
-		 and $params= preg_split('/(?<!\\\\)\\|/',$params)
-		  and array_map(function( $key, $value ){return isset($key)&&isset($value) ? $this->setAttribute($key,$this->checkExpression(str_replace('\\|','|',$value))) : '';},$this->config['name_value'],$params);
+		$params=$this->line->pregGet('/ <(.*?)>(?= |$)/', 1)
+		 and $params=preg_split('/(?<!\\\\)\\|/', $params)
+		  and array_map(function( $key, $value ){return isset($key) && isset($value)? $this->setAttribute($key, $this->checkExpression(str_replace('\\|', '|', $value))) : ''; },$this->config[ 'name_value' ], $params);
 
 		return $this;
 	}
@@ -156,17 +156,17 @@ 
 	 */
 	protected function parseLink():self
 	{
-		$link= $this->line->pregGet('/ @((?!\()(?:[^ ]| (?=[a-zA-Z0-9]))+|(?<exp>\((?:[^()]+|(?&exp)?)+?\)))(?= |$)/',1);
+		$link=$this->line->pregGet('/ @((?!\()(?:[^ ]| (?=[a-zA-Z0-9]))+|(?<exp>\((?:[^()]+|(?&exp)?)+?\)))(?= |$)/', 1);
 
 		if( strlen($link) ){
-			if( isset($this->config['target']) && ':'===$link{0} ){
-				$this->setAttribute($this->config['link'],'javascript'.$link);
-			}elseif( '//'===($firstTwoLetters=substr($link,0,2)) ){
-				$this->setAttribute($this->config['link'],'http:'.$link);
+			if( isset($this->config[ 'target' ]) && ':'===$link{0} ){
+				$this->setAttribute($this->config[ 'link' ], 'javascript'.$link);
+			}elseif( '//'===($firstTwoLetters=substr($link, 0, 2)) ){
+				$this->setAttribute($this->config[ 'link' ], 'http:'.$link);
 			}elseif( '\\\\'===$firstTwoLetters ){
-				$this->setAttribute($this->config['link'],'https://'.substr($link,2));
+				$this->setAttribute($this->config[ 'link' ], 'https://'.substr($link, 2));
 			}else{
-				$this->setAttribute($this->config['link'],$this->checkExpression($link));
+				$this->setAttribute($this->config[ 'link' ], $this->checkExpression($link));
 			}
 		}
 
@@ -180,10 +180,10 @@ 
 	 */
 	protected function parseTarget():self
 	{
-		$target= $this->line->pregGet('/ >((?!\()(?:[^ ]| (?=[a-zA-Z0-9]))+|(?<exp>\((?:[^()]+|(?&exp)?)+?\)))(?= |$)/',1);
+		$target=$this->line->pregGet('/ >((?!\()(?:[^ ]| (?=[a-zA-Z0-9]))+|(?<exp>\((?:[^()]+|(?&exp)?)+?\)))(?= |$)/', 1);
 
 		if( strlen($target) ){
-			$this->setAttribute($this->config['target'],$this->checkExpression($target));
+			$this->setAttribute($this->config[ 'target' ], $this->checkExpression($target));
 		}
 
 		return $this;
@@ -196,10 +196,10 @@ 
 	 */
 	protected function parseAlt():self
 	{
-		$alt= $this->line->pregGet('/ _((?!\()(?:[^ ]| (?=[a-zA-Z0-9]))+|(?<exp>\((?:[^()]+|(?&exp)?)+?\)))(?= |$)/',1);
+		$alt=$this->line->pregGet('/ _((?!\()(?:[^ ]| (?=[a-zA-Z0-9]))+|(?<exp>\((?:[^()]+|(?&exp)?)+?\)))(?= |$)/', 1);
 
 		if( strlen($alt) ){
-			$this->setAttribute($this->config['alt'],$this->checkExpression($alt));
+			$this->setAttribute($this->config[ 'alt' ], $this->checkExpression($alt));
 		}
 
 		return $this;
@@ -212,33 +212,33 @@ 
 	 */
 	protected function parseCommonAttributes():string
 	{
-		$attributes= '';
+		$attributes='';
 
-		$id= $this->line->pregGet('/ #([^ ]+|(?<exp>\((?:[^()]+|(?&exp)?)+?\)))(?= |$)/',1)
-		 and $this->setAttribute('id',$id);
+		$id=$this->line->pregGet('/ #([^ ]+|(?<exp>\((?:[^()]+|(?&exp)?)+?\)))(?= |$)/', 1)
+		 and $this->setAttribute('id', $id);
 
-		$classes= $this->line->pregGet('/ \.[^ ]+(?= |$)/')
-		 and preg_match_all('/\.((?(?!\()[^.]+|(?<exp>\((?:[^()]+|(?&exp)?)+?\))))/',$classes,$matches)
-		  and $classes= implode(' ',array_filter(array_map(function( $className ){return $this->checkExpression($className);},$matches[1])))
-		   and $this->setAttribute('class',$classes);
+		$classes=$this->line->pregGet('/ \.[^ ]+(?= |$)/')
+		 and preg_match_all('/\.((?(?!\()[^.]+|(?<exp>\((?:[^()]+|(?&exp)?)+?\))))/', $classes, $matches)
+		  and $classes=implode(' ', array_filter(array_map(function( $className ){return $this->checkExpression($className); },$matches[ 1 ])))
+		   and $this->setAttribute('class', $classes);
 
-		$title= $this->line->pregGet('/ \^((?!\()(?:[^ ]| (?=[a-zA-Z0-9]))+|(?<exp>\((?:[^()]+|(?&exp)?)+?\)))(?= |$)/',1)
-		 and $this->setAttribute('title',$title);
+		$title=$this->line->pregGet('/ \^((?!\()(?:[^ ]| (?=[a-zA-Z0-9]))+|(?<exp>\((?:[^()]+|(?&exp)?)+?\)))(?= |$)/', 1)
+		 and $this->setAttribute('title', $title);
 
-		$style= $this->line->pregGet('/ \[([^\]]+;)(?=\]( |$))/',1)
-		 and $this->setAttribute('style',$style);
+		$style=$this->line->pregGet('/ \[([^\]]+;)(?=\]( |$))/', 1)
+		 and $this->setAttribute('style', $style);
 
-		$eventListeners= $this->line->pregMap('/ %(\w+)\{>(.*?)<\}(?= |$)/',function( $string, $name, $code ){
-			$this->setAttribute('on'.$name,str_replace('"','&quot;',$code));
+		$eventListeners=$this->line->pregMap('/ %(\w+)\{>(.*?)<\}(?= |$)/', function( $string, $name, $code ){
+			$this->setAttribute('on'.$name, str_replace('"', '&quot;', $code));
 		})
-		 and implode('',$eventListeners);
+		 and implode('', $eventListeners);
 
-		$other= $this->line->pregGet('/(?<=\{).*?(?=;\}( |$))/')
+		$other=$this->line->pregGet('/(?<=\{).*?(?=;\}( |$))/')
 		 and array_map(function( $keyValue ){
-			preg_replace_callback('/^([\w-:]+)(?:\?(.+?))?(?:\=(.*))?$/',function($matches){
-				$this->setAttribute($matches[1],($matches[3]??$matches[1])?:$matches[1],$matches[2]??null);
+			preg_replace_callback('/^([\w-:]+)(?:\?(.+?))?(?:\=(.*))?$/', function( $matches ){
+				$this->setAttribute($matches[ 1 ], ($matches[ 3 ]??$matches[ 1 ])?: $matches[ 1 ], $matches[ 2 ]??null);
 			},$keyValue);
-		},explode(';',$other));
+		},explode(';', $other));
 
 		return $attributes;
 	}
@@ -252,7 +252,7 @@ 
 	 */
 	protected function checkExpression( string$value ):string
 	{
-		return preg_match('/^\(.*\)$/',$value) ? '<?='.substr($value,1,-1).'?>' : str_replace('"','&quot;',$value);
+		return preg_match('/^\(.*\)$/', $value)? '<?='.substr($value, 1, -1).'?>' : str_replace('"', '&quot;', $value);
 	}
 
 	/**
@@ -263,13 +263,13 @@ 
 	protected function getAttributesString():string
 	{
 		ksort($this->attributes);
-		return implode('',array_map(static function( string$key, array$data ){
-			return (isset($data['condition'])&&strlen($data['condition'])?
-				"<?php if( {$data['condition']} ){?> $key=\"{$data['value']}\"<?php }?>"
+		return implode('', array_map(static function( string$key, array$data ){
+			return (isset($data[ 'condition' ]) && strlen($data[ 'condition' ])?
+				"<?php if( {$data[ 'condition' ]} ){?> $key=\"{$data[ 'value' ]}\"<?php }?>"
 				:
-				" $key=\"{$data['value']}\""
+				" $key=\"{$data[ 'value' ]}\""
 			);
-		},array_keys($this->attributes),$this->attributes));
+		},array_keys($this->attributes), $this->attributes));
 	}
 
 	/**
@@ -281,10 +281,10 @@ 
 	 */
 	protected function setAttribute( string$key, string$value, string$condition=null ):self
 	{
-		if( isset($this->attributes[$key]) )
+		if( isset($this->attributes[ $key ]) )
 			{ $this->document->throw("Attribute $key of $this->name cannot redeclare."); }
 
-		$this->attributes[$key]=[
+		$this->attributes[ $key ]=[
 			'value'=> $value,
 			'condition'=> $condition,
 		];
@@ -306,7 +306,7 @@ 
 	 */
 	public function offsetExists( $offset ):bool
 	{
-		return isset($this->attributes[$offset]);
+		return isset($this->attributes[ $offset ]);
 	}
 
 	/**
@@ -318,7 +318,7 @@ 
 	 */
 	public function offsetGet( $offset )
 	{
-		return $this->attributes[$offset]??null;
+		return $this->attributes[ $offset ]??null;
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	 */
 	public function offsetSet( $offset, $value )
 	{
-		$this->setAttribute($offset,$value);
+		$this->setAttribute($offset, $value);
 	}
 
 	/**
@@ -339,7 +339,7 @@ 
 	 */
 	public function offsetUnset( $offset )
 	{
-		if( isset($this->attributes[$offset]) )
-			{ unset($this->attributes[$offset]); }
+		if( isset($this->attributes[ $offset ]) )
+			{ unset($this->attributes[ $offset ]); }
 	}
 }

libs/Helper/DefaultConfigs.php

Spacing +74 added lines, -74 removed lines

@@ -168,66 +168,66 @@ 
 				],
 			],
 			'tag_nodes'=> [
-				'SVG1.1'=> $svgTags= [
+				'SVG1.1'=> $svgTags=[
 					'svg'=> [
 						'out'=> [
-							'default_attributes'=> ['xmlns'=> 'http://www.w3.org/2000/svg','version'=> '1.1',],
-							'params'=> ['viewBox',],
+							'default_attributes'=> [ 'xmlns'=> 'http://www.w3.org/2000/svg', 'version'=> '1.1', ],
+							'params'=> [ 'viewBox', ],
 							'scope'=> 'svg',
 						],
 						'in'=> [
 							'svg'=> [
-								'params'=> ['x','y','width','height',],
+								'params'=> [ 'x', 'y', 'width', 'height', ],
 							],
 						],
 					],
-					'*'=> [],
+					'*'=> [ ],
 					'polygon'=> [
-						'params'=> ['points',],
-						'only_in'=> ['svg',],
+						'params'=> [ 'points', ],
+						'only_in'=> [ 'svg', ],
 					],
 					'polyline'=> [
-						'params'=> ['points',],
-						'only_in'=> ['svg',],
+						'params'=> [ 'points', ],
+						'only_in'=> [ 'svg', ],
 					],
 					'path'=> [
-						'params'=> ['d',],
-						'only_in'=> ['svg',],
+						'params'=> [ 'd', ],
+						'only_in'=> [ 'svg', ],
 					],
 					'line'=> [
-						'params'=> ['x1','y1','x2','y2',],
-						'only_in'=> ['svg',],
+						'params'=> [ 'x1', 'y1', 'x2', 'y2', ],
+						'only_in'=> [ 'svg', ],
 					],
 					'rect'=> [
-						'params'=> ['x','y','width','height',],
-						'only_in'=> ['svg',],
+						'params'=> [ 'x', 'y', 'width', 'height', ],
+						'only_in'=> [ 'svg', ],
 					],
 					'circle'=> [
-						'params'=> ['cx','cy','r',],
-						'only_in'=> ['svg',],
+						'params'=> [ 'cx', 'cy', 'r', ],
+						'only_in'=> [ 'svg', ],
 					],
 					'ellipse'=> [
-						'params'=> ['cx','cy','rx','ry',],
-						'only_in'=> ['svg',],
+						'params'=> [ 'cx', 'cy', 'rx', 'ry', ],
+						'only_in'=> [ 'svg', ],
 					],
 					'text'=> [
-						'params'=> ['x','y',],
-						'only_in'=> ['svg',],
+						'params'=> [ 'x', 'y', ],
+						'only_in'=> [ 'svg', ],
 					],
 				],
 				'HTML5'=> [
-					'*'=> [],
+					'*'=> [ ],
 					'charset'=> [
 						'name'=> 'meta',
-						'params'=> ['charset',],
+						'params'=> [ 'charset', ],
 					],
 					'equiv'=> [
 						'name'=> 'meta',
-						'name_value'=> ['http-equiv','content','scheme',],
+						'name_value'=> [ 'http-equiv', 'content', 'scheme', ],
 					],
 					'meta'=> [
 						'name'=> 'meta',
-						'name_value'=> ['name','content','scheme',],
+						'name_value'=> [ 'name', 'content', 'scheme', ],
 					],
 					'php'=> [
 						'opener'=> '<?php ',
@@ -239,14 +239,14 @@ 
 						'multiple'=> [
 							[
 								'pattern'=> '/\{>$/',
-								'params'=> ['type',],
-								'default_attributes'=> ['codeset'=> 'codeset',],
+								'params'=> [ 'type', ],
+								'default_attributes'=> [ 'codeset'=> 'codeset', ],
 								'embedding'=> 'code',
 							],
 							[
 								'pattern'=> '/.?/',
 								'name'=> 'code',
-								'params'=> ['type',],
+								'params'=> [ 'type', ],
 							],
 						],
 					],
@@ -255,13 +255,13 @@ 
 							[
 								'pattern'=> '/^-js @/',
 								'name'=> 'script',
-								'default_attributes'=> ['type'=> 'text/javascript',],
+								'default_attributes'=> [ 'type'=> 'text/javascript', ],
 								'link'=> 'src',
 							],
 							[
 								'pattern'=> '/^-js\{>/',
 								'name'=> 'script',
-								'default_attributes'=> ['type'=> 'text/javascript',],
+								'default_attributes'=> [ 'type'=> 'text/javascript', ],
 								'embedding'=> 'js',
 							],
 						],
@@ -271,90 +271,90 @@ 
 							[
 								'pattern'=> '/^-css @/',
 								'name'=> 'link',
-								'default_attributes'=> ['rel'=> 'stylesheet','type'=> 'text/css',],
+								'default_attributes'=> [ 'rel'=> 'stylesheet', 'type'=> 'text/css', ],
 								'link'=> 'href',
 							],
 							[
 								'pattern'=> '/^-css\{>/',
 								'name'=> 'style',
-								'default_attributes'=> ['type'=> 'text/css',],
+								'default_attributes'=> [ 'type'=> 'text/css', ],
 								'embedding'=> 'css',
 							],
 						],
 					],
 					'icon'=> [
 						'name'=> 'link',
-						'default_attributes'=> ['rel'=> 'icon',],
-						'params'=> ['sizes',],
+						'default_attributes'=> [ 'rel'=> 'icon', ],
+						'params'=> [ 'sizes', ],
 						'link'=> 'href',
 					],
 					'shortcut'=> [
 						'name'=> 'link',
-						'default_attributes'=> ['rel'=> 'shortcut icon','type'=> 'image/x-icon',],
+						'default_attributes'=> [ 'rel'=> 'shortcut icon', 'type'=> 'image/x-icon', ],
 						'link'=> 'href',
 					],
 					'link'=> [
 						'name'=> 'link',
-						'params'=> ['rel',],
+						'params'=> [ 'rel', ],
 						'link'=> 'href',
 					],
 					'a'=> [
 						'link'=> 'href',
-						'name_value'=> ['name',],
+						'name_value'=> [ 'name', ],
 						'target'=> 'target',
 					],
 					'iframe'=> [
 						'link'=> 'src',
-						'default_attributes'=> ['frameborder'=> '0',],
-						'name_value'=> ['name',],
+						'default_attributes'=> [ 'frameborder'=> '0', ],
+						'name_value'=> [ 'name', ],
 					],
 					'img'=> [
 						'link'=> 'src',
 						'alt'=> 'alt',
 					],
-					'form'=>   ['name'=> 'form', 'link'=> 'action', 'target'=> 'target', 'name_value'=> ['name',], 'default_attributes'=> ['method'=> 'post',],],
-					'post'=>   ['name'=> 'form', 'link'=> 'action', 'target'=> 'target', 'name_value'=> ['name',], 'default_attributes'=> ['method'=> 'post',],],
-					'upload'=> ['name'=> 'form', 'link'=> 'action', 'target'=> 'target', 'name_value'=> ['name',], 'default_attributes'=> ['method'=> 'post','enctype'=> 'multipart/form-data',],],
-					'get'=>    ['name'=> 'form', 'link'=> 'action', 'target'=> 'target', 'name_value'=> ['name',], 'default_attributes'=> ['method'=> 'get',],],
+					'form'=>   [ 'name'=> 'form', 'link'=> 'action', 'target'=> 'target', 'name_value'=> [ 'name', ], 'default_attributes'=> [ 'method'=> 'post', ], ],
+					'post'=>   [ 'name'=> 'form', 'link'=> 'action', 'target'=> 'target', 'name_value'=> [ 'name', ], 'default_attributes'=> [ 'method'=> 'post', ], ],
+					'upload'=> [ 'name'=> 'form', 'link'=> 'action', 'target'=> 'target', 'name_value'=> [ 'name', ], 'default_attributes'=> [ 'method'=> 'post', 'enctype'=> 'multipart/form-data', ], ],
+					'get'=>    [ 'name'=> 'form', 'link'=> 'action', 'target'=> 'target', 'name_value'=> [ 'name', ], 'default_attributes'=> [ 'method'=> 'get', ], ],
 
-					'input'=>          ['name'=> 'input',  'default_attributes'=> ['type'=> 'hidden',],         'name_value'=> ['name', 'value', 'form',],],
-					'text'=>  ['out'=> ['name'=> 'input',  'default_attributes'=> ['type'=> 'text',],           'name_value'=> ['name', 'value', 'form',], 'alt'=> 'placeholder',], 'in'=> ['svg'=> ['params'=> ['x','y',],],],],
-					'search'=>         ['name'=> 'input',  'default_attributes'=> ['type'=> 'search',],         'name_value'=> ['name', 'value', 'form',], 'alt'=> 'placeholder',],
-					'password'=>       ['name'=> 'input',  'default_attributes'=> ['type'=> 'password',],       'name_value'=> ['name', 'value', 'form',], 'alt'=> 'placeholder',],
-					'email'=>          ['name'=> 'input',  'default_attributes'=> ['type'=> 'email',],          'name_value'=> ['name', 'value', 'form',], 'alt'=> 'placeholder',],
-					'url'=>            ['name'=> 'input',  'default_attributes'=> ['type'=> 'url',],            'name_value'=> ['name', 'value', 'form',], 'alt'=> 'placeholder',],
-					'tel'=>            ['name'=> 'input',  'default_attributes'=> ['type'=> 'tel',],            'name_value'=> ['name', 'value', 'form',], 'alt'=> 'placeholder',],
-					'number'=>         ['name'=> 'input',  'default_attributes'=> ['type'=> 'number',],         'name_value'=> ['name', 'value', 'form',], 'alt'=> 'placeholder', 'params'=> ['min', 'step', 'max',],],
-					'range'=>          ['name'=> 'input',  'default_attributes'=> ['type'=> 'range',],          'name_value'=> ['name', 'value', 'form',],                'params'=> ['min', 'step', 'max',],],
-					'radio'=>          ['name'=> 'input',  'default_attributes'=> ['type'=> 'radio',],          'name_value'=> ['name', 'value', 'form',],],
-					'checkbox'=>       ['name'=> 'input',  'default_attributes'=> ['type'=> 'checkbox',],       'name_value'=> ['name', 'value', 'form',],],
-					'date'=>           ['name'=> 'input',  'default_attributes'=> ['type'=> 'date',],           'name_value'=> ['name', 'value', 'form',],],
-					'month'=>          ['name'=> 'input',  'default_attributes'=> ['type'=> 'month',],          'name_value'=> ['name', 'value', 'form',],],
-					'week'=>           ['name'=> 'input',  'default_attributes'=> ['type'=> 'week',],           'name_value'=> ['name', 'value', 'form',],],
-					'time'=>           ['name'=> 'input',  'default_attributes'=> ['type'=> 'time',],           'name_value'=> ['name', 'value', 'form',],],
-					'datetime'=>       ['name'=> 'input',  'default_attributes'=> ['type'=> 'datetime',],       'name_value'=> ['name', 'value', 'form',],],
-					'datetime-local'=> ['name'=> 'input',  'default_attributes'=> ['type'=> 'datetime-local',], 'name_value'=> ['name', 'value', 'form',],],
-					'color'=>          ['name'=> 'input',  'default_attributes'=> ['type'=> 'color',],          'name_value'=> ['name', 'value', 'form',],],
-					'file'=>           ['name'=> 'input',  'default_attributes'=> ['type'=> 'file',],           'name_value'=> ['name', 'form',], 'params'=> ['accept',],],
+					'input'=>          [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'hidden', ], 'name_value'=> [ 'name', 'value', 'form', ], ],
+					'text'=>  [ 'out'=> [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'text', ], 'name_value'=> [ 'name', 'value', 'form', ], 'alt'=> 'placeholder', ], 'in'=> [ 'svg'=> [ 'params'=> [ 'x', 'y', ], ], ], ],
+					'search'=>         [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'search', ], 'name_value'=> [ 'name', 'value', 'form', ], 'alt'=> 'placeholder', ],
+					'password'=>       [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'password', ], 'name_value'=> [ 'name', 'value', 'form', ], 'alt'=> 'placeholder', ],
+					'email'=>          [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'email', ], 'name_value'=> [ 'name', 'value', 'form', ], 'alt'=> 'placeholder', ],
+					'url'=>            [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'url', ], 'name_value'=> [ 'name', 'value', 'form', ], 'alt'=> 'placeholder', ],
+					'tel'=>            [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'tel', ], 'name_value'=> [ 'name', 'value', 'form', ], 'alt'=> 'placeholder', ],
+					'number'=>         [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'number', ], 'name_value'=> [ 'name', 'value', 'form', ], 'alt'=> 'placeholder', 'params'=> [ 'min', 'step', 'max', ], ],
+					'range'=>          [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'range', ], 'name_value'=> [ 'name', 'value', 'form', ], 'params'=> [ 'min', 'step', 'max', ], ],
+					'radio'=>          [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'radio', ], 'name_value'=> [ 'name', 'value', 'form', ], ],
+					'checkbox'=>       [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'checkbox', ], 'name_value'=> [ 'name', 'value', 'form', ], ],
+					'date'=>           [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'date', ], 'name_value'=> [ 'name', 'value', 'form', ], ],
+					'month'=>          [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'month', ], 'name_value'=> [ 'name', 'value', 'form', ], ],
+					'week'=>           [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'week', ], 'name_value'=> [ 'name', 'value', 'form', ], ],
+					'time'=>           [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'time', ], 'name_value'=> [ 'name', 'value', 'form', ], ],
+					'datetime'=>       [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'datetime', ], 'name_value'=> [ 'name', 'value', 'form', ], ],
+					'datetime-local'=> [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'datetime-local', ], 'name_value'=> [ 'name', 'value', 'form', ], ],
+					'color'=>          [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'color', ], 'name_value'=> [ 'name', 'value', 'form', ], ],
+					'file'=>           [ 'name'=> 'input', 'default_attributes'=> [ 'type'=> 'file', ], 'name_value'=> [ 'name', 'form', ], 'params'=> [ 'accept', ], ],
 
-					'submit'=>         ['name'=> 'button', 'default_attributes'=> ['type'=> 'submit',],         'name_value'=> ['name', 'value','form',], 'link'=> 'formaction', 'target'=> 'formtarget',],
-					'reset'=>          ['name'=> 'button', 'default_attributes'=> ['type'=> 'reset',],          'name_value'=> ['form',],],
-					'button'=>         ['name'=> 'button', 'default_attributes'=> ['type'=> 'button',],],
+					'submit'=>         [ 'name'=> 'button', 'default_attributes'=> [ 'type'=> 'submit', ], 'name_value'=> [ 'name', 'value', 'form', ], 'link'=> 'formaction', 'target'=> 'formtarget', ],
+					'reset'=>          [ 'name'=> 'button', 'default_attributes'=> [ 'type'=> 'reset', ], 'name_value'=> [ 'form', ], ],
+					'button'=>         [ 'name'=> 'button', 'default_attributes'=> [ 'type'=> 'button', ], ],
 
-					'textarea'=>       ['name'=> 'textarea', 'name_value'=> ['name','value','form',],'alt'=> 'placeholder',],
+					'textarea'=>       [ 'name'=> 'textarea', 'name_value'=> [ 'name', 'value', 'form', ], 'alt'=> 'placeholder', ],
 
 					'select'=> [
-						'name_value'=> ['name', 'value','form',],
+						'name_value'=> [ 'name', 'value', 'form', ],
 						'scope'=> 'select',
 					],
 					'datalist'=> [
-						'params'=> ['id',],
+						'params'=> [ 'id', ],
 						'scope'=> 'datalist',
 					],
 					'optgroup'=> [
 						'in'=> [
 							'select'=> [
-								'name_value'=> ['label',],
+								'name_value'=> [ 'label', ],
 							],
 						],
 					],
@@ -362,20 +362,20 @@ 
 						'in'=> [
 							'select'=> [
 								'scope_function'=> function( $scope ){
-									if( $scope['value']===$this['value'] ){
-										$this['selected']= 'selected';
+									if( $scope[ 'value' ]===$this[ 'value' ] ){
+										$this[ 'selected' ]='selected';
 									};
 								},
-								'name_value'=> ['value', 'label',],
+								'name_value'=> [ 'value', 'label', ],
 							],
 							'datalist'=> [
-								'name_value'=> ['value',],
+								'name_value'=> [ 'value', ],
 							],
 						],
 					],
 
 					'param'=> [
-						'name_value'=> ['name','value',],
+						'name_value'=> [ 'name', 'value', ],
 					],
 				]+$svgTags,
 			],