Fenzland / Htsl.php

libs/Embedment/CodeEmbedment.php

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 	 *
 	 * @param  \Htsl\ReadingBuffer\Line $line
 	 *
-	 * @return \Htsl\Embedment\Contracts
+	 * @return CodeEmbedment
 	 */
 	public function parseLine( Line$line ):parent
 	{

Spacing +5 added lines, -5 removed lines

@@ -16,15 +16,15 @@
 	 *
 	 * @return \Htsl\Embedment\Contracts
 	 */
-	public function parseLine( Line$line ):parent
+	public function parseLine(Line$line):parent
 	{
-		$content= '<code>'.htmlentities($line->fullContent).'</code>';
+		$content='<code>'.htmlentities($line->fullContent).'</code>';
 
-		$indentation= $this->document->indentation;
+		$indentation=$this->document->indentation;
 
-		false!==$indentation and $content= str_repeat($indentation,$this->document->indentLevel).$content."\n";
+		false!==$indentation and $content=str_repeat($indentation, $this->document->indentLevel).$content."\n";
 
-		$this->content.= $content;
+		$this->content.=$content;
 
 		return $this;
 	}

libs/Embedment/CssEmbedment.php

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 	 *
 	 * @param  \Htsl\ReadingBuffer\Line $line
 	 *
-	 * @return \Htsl\Embedment\Contracts
+	 * @return CssEmbedment
 	 */
 	public function parseLine( Line$line ):parent
 	{

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
 	 *
 	 * @return \Htsl\Embedment\Contracts
 	 */
-	public function parseLine( Line$line ):parent
+	public function parseLine(Line$line):parent
 	{
-		$this->content.= $line->content;
+		$this->content.=$line->content;
 		return $this;
 	}
 }

libs/Embedment/JsEmbedment.php

Doc Comments +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 *
 	 * @param  \Htsl\ReadingBuffer\Line $line
 	 *
-	 * @return \Htsl\Embedment\Contracts
+	 * @return JsEmbedment
 	 */
 	public function parseLine( Line$line ):parent
 	{

Spacing +2 added lines, -2 removed lines

@@ -24,9 +24,9 @@
 	 *
 	 * @return \Htsl\Embedment\Contracts
 	 */
-	public function parseLine( Line$line ):parent
+	public function parseLine(Line$line):parent
 	{
-		$this->content.= $line->fullContent."\n";
+		$this->content.=$line->fullContent."\n";
 		return $this;
 	}
 }

libs/Embedment/PhpEmbedment.php

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 	 *
 	 * @param  \Htsl\ReadingBuffer\Line $line
 	 *
-	 * @return \Htsl\Embedment\Contracts
+	 * @return PhpEmbedment
 	 */
 	public function parseLine( Line$line ):parent
 	{

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
 	 *
 	 * @return \Htsl\Embedment\Contracts
 	 */
-	public function parseLine( Line$line ):parent
+	public function parseLine(Line$line):parent
 	{
-		$this->content.= $line->content;
+		$this->content.=$line->content;
 		return $this;
 	}
 }

libs/Embedment/TextEmbedment.php

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 	 *
 	 * @param  \Htsl\ReadingBuffer\Line $line
 	 *
-	 * @return \Htsl\Embedment\Contracts
+	 * @return TextEmbedment
 	 */
 	public function parseLine( Line$line ):parent
 	{

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
 	 *
 	 * @return \Htsl\Embedment\Contracts
 	 */
-	public function parseLine( Line$line ):parent
+	public function parseLine(Line$line):parent
 	{
-		$this->content.= $line->fullContent."\n";
+		$this->content.=$line->fullContent."\n";
 		return $this;
 	}
 }

libs/Htsl.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +29 added lines, -29 removed lines

@@ -34,9 +34,9 @@ 
 	 *
 	 * @param array $config
 	 */
-	public function __construct( array$config=[] )
+	public function __construct(array$config=[])
 	{
-		$this->config= array_replace_recursive($this->getDefaultConfigs(),$config);
+		$this->config=array_replace_recursive($this->getDefaultConfigs(), $config);
 	}
 
 	/**
@@ -46,9 +46,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function parse( string$content ):string
+	public function parse(string$content):string
 	{
-		return $this->execute(new StringBuffer($this,$content));
+		return $this->execute(new StringBuffer($this, $content));
 	}
 
 	/**
@@ -59,15 +59,15 @@ 
 	 *
 	 * @return int|string
 	 */
-	public function compile( string$fromFile, string$toFile=null )
+	public function compile(string$fromFile, string$toFile=null)
 	{
-		$fromFile= $this->getFilePath($fromFile);
+		$fromFile=$this->getFilePath($fromFile);
 
-		$result= $this->execute(new FileBuffer($this,$fromFile));
+		$result=$this->execute(new FileBuffer($this, $fromFile));
 
-		if( $toFile ){
-			return file_put_contents($toFile,$result);
-		}else{
+		if ($toFile) {
+			return file_put_contents($toFile, $result);
+		}else {
 			return $result;
 		}
 	}
@@ -77,7 +77,7 @@ 
 	 *
 	 * @param callable $fileGetter
 	 */
-	public function setFileGetter( callable$fileGetter ):self
+	public function setFileGetter(callable$fileGetter):self
 	{
 		$this->fileGetter=$fileGetter;
 
@@ -91,9 +91,9 @@ 
 	 *
 	 * @return self
 	 */
-	public function setBasePath( string$basePath ):self
+	public function setBasePath(string$basePath):self
 	{
-		$this->basePath= '/'===substr($basePath,-1) ? substr($basePath,0,-1) : $basePath;
+		$this->basePath='/'===substr($basePath, -1) ? substr($basePath, 0, -1) : $basePath;
 
 		return $this;
 	}
@@ -115,9 +115,9 @@ 
 	 *
 	 * @return string
 	 */
-	protected function execute( ABuffer$buffer ):string
+	protected function execute(ABuffer$buffer):string
 	{
-		return (new Document($this,$buffer))->content;
+		return (new Document($this, $buffer))->content;
 	}
 
 	/**
@@ -127,15 +127,15 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function getConfig( string...$keys )
+	public function getConfig(string...$keys)
 	{
-		$result= $this->config;
+		$result=$this->config;
 
-		foreach( $keys as $key ){
-			if( !isset($result[$key]) )
+		foreach ($keys as $key) {
+			if (!isset($result[$key]))
 				{ return null; }
 
-			$result= $result[$key];
+			$result=$result[$key];
 		}
 
 		return $result;
@@ -149,23 +149,23 @@ 
 	 *
 	 * @return string
 	 */
-	public function getFilePath( string$filePath, string$path=null ):string
+	public function getFilePath(string$filePath, string$path=null):string
 	{
-		if( !isset($this->basePath) )
+		if (!isset($this->basePath))
 			{ throw new \Exception('BasePath musbe set.'); }
 
-		if( !strlen($filePath) )
+		if (!strlen($filePath))
 			{ throw new \Exception('FilePath cannot be empty.'); }
 
-		if( '/'===$filePath{0} ){
-			if( is_null($path) )
+		if ('/'===$filePath{0} ) {
+			if (is_null($path))
 				{ return $filePath; }
 			else
 				{ return $this->basePath.$filePath; }
-		}else{
-			if( !strlen($path) )
+		}else {
+			if (!strlen($path))
 				{ return $this->basePath.'/'.$filePath; }
-			elseif( '/'===substr($path,-1) )
+			elseif ('/'===substr($path, -1))
 				{ return $path.$filePath; }
 			else
 				{ return $path.'/'.$filePath; }
@@ -179,7 +179,7 @@ 
 	 * @param  string $filePath
 	 * @return string
 	 */
-	public function getFileContent( string$filePath ):string
+	public function getFileContent(string$filePath):string
 	{
 		return isset($this->fileGetter) ? $this->fileGetter($filePath) : file_get_contents($filePath);
 	}

Braces +5 added lines, -8 removed lines

@@ -67,7 +67,7 @@ 
 
 		if( $toFile ){
 			return file_put_contents($toFile,$result);
-		}else{
+		} else{
 			return $result;
 		}
 	}
@@ -159,15 +159,12 @@ 
 
 		if( '/'===$filePath{0} ){
 			if( is_null($path) )
-				{ return $filePath; }
-			else
+				{ return $filePath; } else
 				{ return $this->basePath.$filePath; }
-		}else{
+		} else{
 			if( !strlen($path) )
-				{ return $this->basePath.'/'.$filePath; }
-			elseif( '/'===substr($path,-1) )
-				{ return $path.$filePath; }
-			else
+				{ return $this->basePath.'/'.$filePath; } elseif( '/'===substr($path,-1) )
+				{ return $path.$filePath; } else
 				{ return $path.'/'.$filePath; }
 		}
 

libs/Parser/Document.php

Doc Comments +2 added lines, -2 removed lines

@@ -172,7 +172,7 @@ 
 	/**
 	 * Alias of getContent.
 	 *
-	 * @return sting
+	 * @return string
 	 */
 	public function __toString():string
 	{
@@ -211,7 +211,7 @@ 
 	 * Getting the config of type of this document.
 	 *
 	 * @param  [ string, ] ...$keys
-	 * @return mixed
+	 * @return string
 	 */
 	public function getConfig( string...$keys )
 	{

Indentation +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 			return $this;
 		}
 		return $this->lineByLine()
-		            ->bubbleSections()
+					->bubbleSections()
 		;
 	}
 

Spacing +120 added lines, -120 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.
@@ -140,16 +140,16 @@ 
 	 * @param \Htsl\ReadingBuffer\Contracts\ABuffer $buffer
 	 * @param \Htsl\Parser\Document | null          $parent
 	 */
-	public function __construct( Htsl$htsl, Buffer$buffer, self$parent=null )
+	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;
-		}else{
+		if ($parent) {
+			$this->parent=$parent;
+			$this->docType=$parent->docType;
+			$this->indentation=$parent->indentation;
+		}else {
 			$this->parseFirstLine();
 		}
 	}
@@ -161,7 +161,7 @@ 
 	 */
 	public function execute():self
 	{
-		if( $this->isExecuted ){
+		if ($this->isExecuted) {
 			return $this;
 		}
 		return $this->lineByLine()
@@ -186,9 +186,9 @@ 
 	 */
 	protected function getContent():string
 	{
-		if( $this->parent ){
+		if ($this->parent) {
 			return $this->execute()->parent->getContent();
-		}else{
+		}else {
 			return $this->execute()->content;
 		}
 	}
@@ -200,9 +200,9 @@ 
 	 */
 	protected function getLine():Line
 	{
-		do{
-			$line= $this->buffer->getLine();
-		}while( $line->isEmpty() && $line->hasMore() );
+		do {
+			$line=$this->buffer->getLine();
+		} while ($line->isEmpty() && $line->hasMore());
 
 		return $line;
 	}
@@ -213,9 +213,9 @@ 
 	 * @param  [ string, ] ...$keys
 	 * @return mixed
 	 */
-	public function getConfig( string...$keys )
+	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);
 	}
 
 	/**
@@ -255,16 +255,16 @@ 
 	 */
 	protected function parseFirstLine():self
 	{
-		$line= $this->getLine();
+		$line=$this->getLine();
 
-		if( '@'===$line->getChar(0) ){
+		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);
 
@@ -276,9 +276,9 @@ 
 	 *
 	 * @param \Htsl\ReadingBuffer\Line $firstLine
 	 */
-	protected function setExtending( Line$firstLine ):self
+	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;
@@ -302,12 +302,12 @@ 
 	 */
 	protected function lineByLine():self
 	{
-		while( ($line= $this->getLine())->hasMore() ){
-			$this->lineNumber+= 1;
+		while (($line=$this->getLine())->hasMore()) {
+			$this->lineNumber+=1;
 
-			if( $this->embedment ){
+			if ($this->embedment) {
 				$this->embeddingParse($line);
-			}else{
+			}else {
 				$this->parseLine($line);
 			}
 		}
@@ -316,7 +316,7 @@ 
 
 		$this->closeNodes($this->level);
 
-		$this->isExecuted= true;
+		$this->isExecuted=true;
 
 		return $this;
 	}
@@ -328,11 +328,11 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function embeddingParse( Line$line ):self
+	protected function embeddingParse(Line$line):self
 	{
-		if( $line->content==='<}' ){
+		if ($line->content==='<}') {
 			$this->breakEmbedding();
-		}else{
+		}else {
 			$this->embedment->parseLine($line->getSubIndentLine());
 		}
 		return $this;
@@ -345,12 +345,12 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function startEmbedding( string$embedType ):self
+	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;
 	}
@@ -363,7 +363,7 @@ 
 	public function breakEmbedding():self
 	{
 		$this->append($this->embedment->getContent());
-		$this->embedment= null;
+		$this->embedment=null;
 
 		return $this;
 	}
@@ -375,17 +375,17 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function parseLine( Line$line ):self
+	protected function parseLine(Line$line):self
 	{
-		$this->currentLine= $line;
+		$this->currentLine=$line;
 		$this->setLevel($line->getIndentLevel());
 
-		switch( $line->getChar(0) ){
+		switch ($line->getChar(0)) {
 			default:{
 				$this->parseStringLine($line);
 			}break;
 			case '`':{
-				if( '='===$line->getChar(1) )
+				if ('='===$line->getChar(1))
 					{ $this->parseExpressionHtmlLine($line); }
 				else
 					{ $this->parseHtmlLine($line); }
@@ -416,9 +416,9 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function parseHtmlLine( Line$line ):self
+	protected function parseHtmlLine(Line$line):self
 	{
-		$node= new StringNode($this,$line);
+		$node=new StringNode($this, $line);
 
 		$this->openNode($node);
 
@@ -434,9 +434,9 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function parseStringLine( Line$line ):self
+	protected function parseStringLine(Line$line):self
 	{
-		$node= new StringNode($this,$line);
+		$node=new StringNode($this, $line);
 
 		$this->openNode($node);
 
@@ -452,14 +452,14 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function parseExpressionLine( Line$line ):self
+	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= $this->htsl->getConfig('ENT_flags',$this->docType);
+		$content=$line->slice(1);
+		$ent_flag=$this->htsl->getConfig('ENT_flags', $this->docType);
 
 		$this->appendLine("<?=htmlentities($content,'$ent_flag','UTF-8',false);?>");
 
@@ -473,13 +473,13 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function parseExpressionHtmlLine( Line$line ):self
+	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?>");
 
@@ -493,9 +493,9 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function parseCommentLine( Line$line ):self
+	protected function parseCommentLine(Line$line):self
 	{
-		$node= new CommentNode($this,$line);
+		$node=new CommentNode($this, $line);
 
 		$this->openNode($node);
 
@@ -511,9 +511,9 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function parseTagLine( Line$line ):self
+	protected function parseTagLine(Line$line):self
 	{
-		$tag= new TagNode($this,$line);
+		$tag=new TagNode($this, $line);
 
 		$this->appendLine($tag->open());
 
@@ -531,9 +531,9 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function parseControlLine( Line$line ):self
+	protected function parseControlLine(Line$line):self
 	{
-		$controlStructure= new ControlNode($this,$line);
+		$controlStructure=new ControlNode($this, $line);
 
 		$this->appendLine($controlStructure->open());
 
@@ -549,9 +549,9 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function parseDocControlLine( Line$line ):self
+	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;
@@ -579,12 +579,12 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function extend( string$fileName ):self
+	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;
 	}
@@ -596,15 +596,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);
+		if (false!==$this->indentation) {
+			$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);
 
@@ -620,9 +620,9 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function defineSection( Line$line ):self
+	protected function defineSection(Line$line):self
 	{
-		$node= new SectionNode($this,$line);
+		$node=new SectionNode($this, $line);
 
 		$node->open();
 
@@ -638,24 +638,24 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function showSection( Line$line ):self
+	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);
+		if (false!==$this->indentation) {
+			$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();
 
@@ -669,30 +669,30 @@ 
 	 *
 	 * @param Section | null $section
 	 */
-	public function setSection( Section$section=null ):self
+	public function setSection(Section$section=null):self
 	{
-		if( !$section ){
-			$this->sectionLevel= 0;
-			$this->currentSection= null;
+		if (!$section) {
+			$this->sectionLevel=0;
+			$this->currentSection=null;
 
 			return $this;
 		}
 
-		if( $this->currentSection ){
+		if ($this->currentSection) {
 			$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 ){
+		if ($section->name) {
 			$this->parent->sections[$section->name]=$section;
 		}
 
-		$this->sectionLevel= $this->level+1;
+		$this->sectionLevel=$this->level+1;
 
 		return $this;
 	}
@@ -704,9 +704,9 @@ 
 	 */
 	protected function bubbleSections():self
 	{
-		if( $this->parent ){
-			foreach( $this->sections as $name=>$section ){
-				if( !isset($this->parent->sections[$name]) ){
+		if ($this->parent) {
+			foreach ($this->sections as $name=>$section) {
+				if (!isset($this->parent->sections[$name])) {
 					$this->parent->sections[$name]=$section;
 				};
 			}
@@ -722,9 +722,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function htmlEntities( string$input ):string
+	public function htmlEntities(string$input):string
 	{
-		return htmlentities($input,$this->htsl->getConfig('ENT_flags',$this->docType),'UTF-8',false);
+		return htmlentities($input, $this->htsl->getConfig('ENT_flags', $this->docType), 'UTF-8', false);
 	}
 
 	/**
@@ -732,15 +732,15 @@ 
 	 *
 	 * @param int $level
 	 */
-	protected function setLevel( int$level ):self
+	protected function setLevel(int$level):self
 	{
-		$level-= $this->level;
+		$level-=$this->level;
 
-		if( $level<=0 ){
+		if ($level <= 0) {
 			$this->closeNodes(-$level);
-		}elseif( $level==1 ){
-			$this->level+= 1;
-		}else{
+		}elseif ($level==1) {
+			$this->level+=1;
+		}else {
 			$this->throw('Indent error.');
 		}
 
@@ -754,9 +754,9 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function openNode( Node$node ):self
+	protected function openNode(Node$node):self
 	{
-		array_push($this->openedNodes,$node);
+		array_push($this->openedNodes, $node);
 
 		$node->scope and $this->setScope($node);
 
@@ -770,18 +770,18 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function closeNodes( int$level=0 ):self
+	protected function closeNodes(int$level=0):self
 	{
-		if( empty($this->openedNodes) ) return $this;
+		if (empty($this->openedNodes)) return $this;
 
-		while( $level-->=0 ){
-			$node= array_pop($this->openedNodes);
+		while ($level-- >= 0) {
+			$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;
@@ -792,9 +792,9 @@ 
 	 *
 	 * @param \Htsl\Parser\Node\Contracts\ANode $scope
 	 */
-	protected function setScope( Node$scope ):int
+	protected function setScope(Node$scope):int
 	{
-		return array_unshift($this->scopes,$scope);
+		return array_unshift($this->scopes, $scope);
 	}
 
 	/**
@@ -814,9 +814,9 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function removeScope( Node$scope ):self
+	protected function removeScope(Node$scope):self
 	{
-		if( $scope!==array_shift($this->scopes) ){
+		if ($scope!==array_shift($this->scopes)) {
 			$this->throw('Scope nesting error');
 		};
 
@@ -830,10 +830,10 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function appendLine( string$content ):self
+	protected function appendLine(string$content):self
 	{
-		if( false!==$this->indentation ){
-			$content= str_repeat($this->indentation,$this->level-$this->sectionLevel).$content."\n";
+		if (false!==$this->indentation) {
+			$content=str_repeat($this->indentation, $this->level-$this->sectionLevel).$content."\n";
 		}
 
 		return $this->append($content);
@@ -846,11 +846,11 @@ 
 	 *
 	 * @return \Htsl\Parser\Document
 	 */
-	protected function append( string$content ):self
+	protected function append(string$content):self
 	{
-		if( $this->currentSection ){
+		if ($this->currentSection) {
 			$this->currentSection->append($content);
-		}else{
+		}else {
 			$this->content.=$content;
 		}
 
@@ -874,7 +874,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");
 	}

Braces +11 added lines, -10 removed lines

@@ -149,7 +149,7 @@ 
 			$this->parent= $parent;
 			$this->docType= $parent->docType;
 			$this->indentation= $parent->indentation;
-		}else{
+		} else{
 			$this->parseFirstLine();
 		}
 	}
@@ -188,7 +188,7 @@ 
 	{
 		if( $this->parent ){
 			return $this->execute()->parent->getContent();
-		}else{
+		} else{
 			return $this->execute()->content;
 		}
 	}
@@ -307,7 +307,7 @@ 
 
 			if( $this->embedment ){
 				$this->embeddingParse($line);
-			}else{
+			} else{
 				$this->parseLine($line);
 			}
 		}
@@ -332,7 +332,7 @@ 
 	{
 		if( $line->content==='<}' ){
 			$this->breakEmbedding();
-		}else{
+		} else{
 			$this->embedment->parseLine($line->getSubIndentLine());
 		}
 		return $this;
@@ -386,8 +386,7 @@ 
 			}break;
 			case '`':{
 				if( '='===$line->getChar(1) )
-					{ $this->parseExpressionHtmlLine($line); }
-				else
+					{ $this->parseExpressionHtmlLine($line); } else
 					{ $this->parseHtmlLine($line); }
 			}break;
 			case '=':{
@@ -738,9 +737,9 @@ 
 
 		if( $level<=0 ){
 			$this->closeNodes(-$level);
-		}elseif( $level==1 ){
+		} elseif( $level==1 ){
 			$this->level+= 1;
-		}else{
+		} else{
 			$this->throw('Indent error.');
 		}
 
@@ -772,7 +771,9 @@ 
 	 */
 	protected function closeNodes( int$level=0 ):self
 	{
-		if( empty($this->openedNodes) ) return $this;
+		if( empty($this->openedNodes) ) {
+			return $this;
+		}
 
 		while( $level-->=0 ){
 			$node= array_pop($this->openedNodes);
@@ -850,7 +851,7 @@ 
 	{
 		if( $this->currentSection ){
 			$this->currentSection->append($content);
-		}else{
+		} else{
 			$this->content.=$content;
 		}
 

libs/Parser/Node/TagNode.php

Doc Comments +1 added lines, -2 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
 	 */
@@ -208,7 +207,7 @@ 
 	/**
 	 * Parsing #ids .classes ^titles [styles] %event{>listeners<} and {other attributes}
 	 *
-	 * @return \Htsl\Parser\Node\TagNode
+	 * @return string
 	 */
 	protected function parseCommonAttributes():string
 	{

Spacing +69 added lines, -69 removed lines

@@ -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->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']) )
+		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}";
 	}
@@ -94,7 +94,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function close( Line$Line ):string
+	public function close(Line$Line):string
 	{
 		return $this->isEmpty ? '' : $this->config['closer']??"</{$this->tagName}>";
 	}
@@ -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);
-
-		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);
-			}elseif( '\\\\'===$firstTwoLetters ){
-				$this->setAttribute($this->config['link'],'https://'.substr($link,2));
-			}else{
-				$this->setAttribute($this->config['link'],$this->checkExpression($link));
+		$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);
+			}elseif ('\\\\'===$firstTwoLetters) {
+				$this->setAttribute($this->config['link'], 'https://'.substr($link, 2));
+			}else {
+				$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));
+		if (strlen($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));
+		if (strlen($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('/(?<=\{).*?(?=;\}( |$))/')
-		 and array_map(function( $keyValue ){
-			preg_replace_callback('/^([\w-:]+)(?:\?(.+?))?(?:\=(.*))?$/',function($matches){
-				$this->setAttribute($matches[1],($matches[3]??$matches[1])?:$matches[1],$matches[2]??null);
+		$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);
 			},$keyValue);
-		},explode(';',$other));
+		},explode(';', $other));
 
 		return $attributes;
 	}
@@ -250,9 +250,9 @@ 
 	 *
 	 * @return string
 	 */
-	protected function checkExpression( string$value ):string
+	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'])?
+		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']}\""
 			);
-		},array_keys($this->attributes),$this->attributes));
+		},array_keys($this->attributes), $this->attributes));
 	}
 
 	/**
@@ -279,9 +279,9 @@ 
 	 * @param string      $value     Attribute value
 	 * @param string|null $condition Optional condition, If given, attribute will seted only when condition is true.
 	 */
-	protected function setAttribute( string$key, string$value, string$condition=null ):self
+	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]=[
@@ -304,7 +304,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function offsetExists( $offset ):bool
+	public function offsetExists($offset):bool
 	{
 		return isset($this->attributes[$offset]);
 	}
@@ -316,7 +316,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function offsetGet( $offset )
+	public function offsetGet($offset)
 	{
 		return $this->attributes[$offset]??null;
 	}
@@ -327,9 +327,9 @@ 
 	 * @param  mixed $offset
 	 * @param  mixed $value
 	 */
-	public function offsetSet( $offset, $value )
+	public function offsetSet($offset, $value)
 	{
-		$this->setAttribute($offset,$value);
+		$this->setAttribute($offset, $value);
 	}
 
 	/**
@@ -337,9 +337,9 @@ 
 	 *
 	 * @param  mixed $offset
 	 */
-	public function offsetUnset( $offset )
+	public function offsetUnset($offset)
 	{
-		if( isset($this->attributes[$offset]) )
+		if (isset($this->attributes[$offset]))
 			{ unset($this->attributes[$offset]); }
 	}
 }

Braces +3 added lines, -3 removed lines

@@ -161,11 +161,11 @@
 		if( strlen($link) ){
 			if( isset($this->config['target']) && ':'===$link{0} ){
 				$this->setAttribute($this->config['link'],'javascript'.$link);
-			}elseif( '//'===($firstTwoLetters=substr($link,0,2)) ){
+			} elseif( '//'===($firstTwoLetters=substr($link,0,2)) ){
 				$this->setAttribute($this->config['link'],'http:'.$link);
-			}elseif( '\\\\'===$firstTwoLetters ){
+			} elseif( '\\\\'===$firstTwoLetters ){
 				$this->setAttribute($this->config['link'],'https://'.substr($link,2));
-			}else{
+			} else{
 				$this->setAttribute($this->config['link'],$this->checkExpression($link));
 			}
 		}

libs/ReadingBuffer/Contracts/ABuffer.php

Doc Comments +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 
 	/**
 	 * Get a line of the document.
-	 * @return \Htsl\ReadingBuffer\Line
+	 * @return string
 	 */
 	public function getFileName():string
 	{
@@ -48,8 +48,8 @@ 
 	/**
 	 * Getting another file reference file of this buffer.
 	 *
-	 * @param  string $filePath
 	 *
+	 * @param string $fileName
 	 * @return \Htsl\ReadingBuffer\Contracts\ABuffer
 	 */
 	abstract public function goSide( $fileName ):self;

Spacing +4 added lines, -4 removed lines

@@ -23,11 +23,11 @@ 
 	 *
 	 * @var string
 	 */
-	protected $fileName= '';
+	protected $fileName='';
 
-	public function __construct( Htsl$htsl )
+	public function __construct(Htsl$htsl)
 	{
-		$this->htsl= $htsl;
+		$this->htsl=$htsl;
 	}
 
 	/**
@@ -52,5 +52,5 @@ 
 	 *
 	 * @return \Htsl\ReadingBuffer\Contracts\ABuffer
 	 */
-	abstract public function goSide( $fileName ):self;
+	abstract public function goSide($fileName):self;
 }