@@ -165,7 +165,7 @@ |
||
| 165 | 165 | return $this; |
| 166 | 166 | } |
| 167 | 167 | return $this->lineByLine() |
| 168 | - ->bubbleSections() |
|
| 168 | + ->bubbleSections() |
|
| 169 | 169 | ; |
| 170 | 170 | } |
| 171 | 171 | |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | * |
| 91 | 91 | * @var int |
| 92 | 92 | */ |
| 93 | - private $level= 0; |
|
| 93 | + private $level=0; |
|
| 94 | 94 | |
| 95 | 95 | /** |
| 96 | 96 | * Section indent level. |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | * |
| 100 | 100 | * @var int |
| 101 | 101 | */ |
| 102 | - private $sectionLevel= 0; |
|
| 102 | + private $sectionLevel=0; |
|
| 103 | 103 | |
| 104 | 104 | /** |
| 105 | 105 | * Opened nodes. |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | * |
| 109 | 109 | * @var [ Htsl\Parser\Node\Contracts\ANode, ] |
| 110 | 110 | */ |
| 111 | - private $openedNodes= []; |
|
| 111 | + private $openedNodes=[ ]; |
|
| 112 | 112 | |
| 113 | 113 | /** |
| 114 | 114 | * Current scopes. |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | * |
| 118 | 118 | * @var [ Htsl\Parser\Node\Contracts\ANode, ] |
| 119 | 119 | */ |
| 120 | - private $scopes= []; |
|
| 120 | + private $scopes=[ ]; |
|
| 121 | 121 | |
| 122 | 122 | /** |
| 123 | 123 | * Current line number. |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * |
| 127 | 127 | * @var int |
| 128 | 128 | */ |
| 129 | - private $lineNumber= 0; |
|
| 129 | + private $lineNumber=0; |
|
| 130 | 130 | |
| 131 | 131 | /** |
| 132 | 132 | * Current line. |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | * |
| 145 | 145 | * @var [ Htsl\Parser\Section, ] |
| 146 | 146 | */ |
| 147 | - private $sections=[]; |
|
| 147 | + private $sections=[ ]; |
|
| 148 | 148 | |
| 149 | 149 | /** |
| 150 | 150 | * Whether the document is executed. |
@@ -184,13 +184,13 @@ discard block |
||
| 184 | 184 | */ |
| 185 | 185 | public function __construct( Htsl$htsl, Buffer$buffer, self$parent=null ) |
| 186 | 186 | { |
| 187 | - $this->htsl= $htsl; |
|
| 188 | - $this->buffer= $buffer; |
|
| 187 | + $this->htsl=$htsl; |
|
| 188 | + $this->buffer=$buffer; |
|
| 189 | 189 | |
| 190 | 190 | if( $parent ){ |
| 191 | - $this->parent= $parent; |
|
| 192 | - $this->docType= $parent->docType; |
|
| 193 | - $this->indentation= $parent->indentation; |
|
| 191 | + $this->parent=$parent; |
|
| 192 | + $this->docType=$parent->docType; |
|
| 193 | + $this->indentation=$parent->indentation; |
|
| 194 | 194 | }else{ |
| 195 | 195 | $this->parseFirstLine(); |
| 196 | 196 | } |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | protected function getLine():Line |
| 252 | 252 | { |
| 253 | 253 | do{ |
| 254 | - $line= $this->buffer->getLine(); |
|
| 254 | + $line=$this->buffer->getLine(); |
|
| 255 | 255 | }while( $line->isEmpty() && $line->hasMore() ); |
| 256 | 256 | |
| 257 | 257 | return $line; |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | */ |
| 269 | 269 | public function getConfig( string...$keys ) |
| 270 | 270 | { |
| 271 | - return $this->htsl->getConfig(array_shift($keys),$this->docType,...$keys); |
|
| 271 | + return $this->htsl->getConfig(array_shift($keys), $this->docType, ...$keys); |
|
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | /** |
@@ -316,16 +316,16 @@ discard block |
||
| 316 | 316 | */ |
| 317 | 317 | protected function parseFirstLine():self |
| 318 | 318 | { |
| 319 | - $line= $this->getLine(); |
|
| 319 | + $line=$this->getLine(); |
|
| 320 | 320 | |
| 321 | 321 | if( '@'===$line->getChar(0) ){ |
| 322 | 322 | return $this->setExtending($line); |
| 323 | 323 | } |
| 324 | 324 | |
| 325 | - $this->docType= $line->content; |
|
| 326 | - $docTypeContent= $this->getConfig('doc_types') or $this->throw("DocType $this->docType is not supported"); |
|
| 325 | + $this->docType=$line->content; |
|
| 326 | + $docTypeContent=$this->getConfig('doc_types') or $this->throw("DocType $this->docType is not supported"); |
|
| 327 | 327 | |
| 328 | - $this->indentation= $this->htsl->getConfig('indentation',$this->docType) ?? ( function( $scalarOrFalse ){ return is_scalar($scalarOrFalse)?$scalarOrFalse:false; } )($this->htsl->getConfig('indentation')); |
|
| 328 | + $this->indentation=$this->htsl->getConfig('indentation', $this->docType) ?? (function( $scalarOrFalse ){ return is_scalar($scalarOrFalse)? $scalarOrFalse : false; } )($this->htsl->getConfig('indentation')); |
|
| 329 | 329 | |
| 330 | 330 | return $this->appendLine($docTypeContent); |
| 331 | 331 | } |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | */ |
| 342 | 342 | protected function setExtending( Line$firstLine ):self |
| 343 | 343 | { |
| 344 | - switch( $name= $firstLine->pregGet('/(?<=^@)[\w-:]+/') ){ |
|
| 344 | + switch( $name=$firstLine->pregGet('/(?<=^@)[\w-:]+/') ){ |
|
| 345 | 345 | default:{ |
| 346 | 346 | $this->throw("The @$name is not supported."); |
| 347 | 347 | }break; |
@@ -367,8 +367,8 @@ discard block |
||
| 367 | 367 | */ |
| 368 | 368 | protected function lineByLine():self |
| 369 | 369 | { |
| 370 | - while( ($line= $this->getLine())->hasMore() ){ |
|
| 371 | - $this->lineNumber+= 1; |
|
| 370 | + while( ($line=$this->getLine())->hasMore() ){ |
|
| 371 | + $this->lineNumber+=1; |
|
| 372 | 372 | |
| 373 | 373 | if( $this->embedment ){ |
| 374 | 374 | $this->embeddingParse($line); |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | |
| 382 | 382 | $this->closeNodes($this->level); |
| 383 | 383 | |
| 384 | - $this->isExecuted= true; |
|
| 384 | + $this->isExecuted=true; |
|
| 385 | 385 | |
| 386 | 386 | return $this; |
| 387 | 387 | } |
@@ -417,10 +417,10 @@ discard block |
||
| 417 | 417 | */ |
| 418 | 418 | protected function startEmbedding( string$embedType ):self |
| 419 | 419 | { |
| 420 | - $embedmentClass= '\\Htsl\\Embedment\\'.ucfirst($embedType).'Embedment'; |
|
| 420 | + $embedmentClass='\\Htsl\\Embedment\\'.ucfirst($embedType).'Embedment'; |
|
| 421 | 421 | class_exists($embedmentClass) or $this->throw("Embed type $embedType not exists."); |
| 422 | 422 | |
| 423 | - $this->embedment= new $embedmentClass($this); |
|
| 423 | + $this->embedment=new $embedmentClass($this); |
|
| 424 | 424 | |
| 425 | 425 | return $this; |
| 426 | 426 | } |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | public function breakEmbedding():self |
| 436 | 436 | { |
| 437 | 437 | $this->append($this->embedment->getContent()); |
| 438 | - $this->embedment= null; |
|
| 438 | + $this->embedment=null; |
|
| 439 | 439 | |
| 440 | 440 | return $this; |
| 441 | 441 | } |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | */ |
| 452 | 452 | protected function parseLine( Line$line ):self |
| 453 | 453 | { |
| 454 | - $this->currentLine= $line; |
|
| 454 | + $this->currentLine=$line; |
|
| 455 | 455 | $this->setLevel($line->getIndentLevel()); |
| 456 | 456 | |
| 457 | 457 | $this->{'parse'.ucfirst($this->getLineType($line))}($line); |
@@ -470,10 +470,10 @@ discard block |
||
| 470 | 470 | */ |
| 471 | 471 | protected function getLineType( Line$line ):string |
| 472 | 472 | { |
| 473 | - $possibleType= self::POSSIBLE_LINE_TYPES; |
|
| 473 | + $possibleType=self::POSSIBLE_LINE_TYPES; |
|
| 474 | 474 | |
| 475 | 475 | for( $i=0; is_array($possibleType); ++$i ){ |
| 476 | - $possibleType= $possibleType[$line->getChar($i)]??$possibleType[' ']; |
|
| 476 | + $possibleType=$possibleType[ $line->getChar($i) ]??$possibleType[ ' ' ]; |
|
| 477 | 477 | } |
| 478 | 478 | |
| 479 | 479 | return $possibleType; |
@@ -488,7 +488,7 @@ discard block |
||
| 488 | 488 | * |
| 489 | 489 | * @todo Make this const private when php 7.1 |
| 490 | 490 | */ |
| 491 | - const POSSIBLE_LINE_TYPES= [ |
|
| 491 | + const POSSIBLE_LINE_TYPES=[ |
|
| 492 | 492 | '`'=> [ |
| 493 | 493 | '='=> 'expressionHtmlLine', |
| 494 | 494 | ' '=> 'htmlLine', |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | */ |
| 513 | 513 | protected function parseHtmlLine( Line$line ):self |
| 514 | 514 | { |
| 515 | - return $this->openNode(new StringNode($this,$line))->appendLine($line->slice(1)); |
|
| 515 | + return $this->openNode(new StringNode($this, $line))->appendLine($line->slice(1)); |
|
| 516 | 516 | } |
| 517 | 517 | |
| 518 | 518 | /** |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | */ |
| 527 | 527 | protected function parseStringLine( Line$line ):self |
| 528 | 528 | { |
| 529 | - return $this->openNode(new StringNode($this,$line))->appendLine($this->htmlEntities(trim($line->getContent()))); |
|
| 529 | + return $this->openNode(new StringNode($this, $line))->appendLine($this->htmlEntities(trim($line->getContent()))); |
|
| 530 | 530 | } |
| 531 | 531 | |
| 532 | 532 | /** |
@@ -540,11 +540,11 @@ discard block |
||
| 540 | 540 | */ |
| 541 | 541 | protected function parseExpressionLine( Line$line ):self |
| 542 | 542 | { |
| 543 | - $content= $line->slice(1); |
|
| 544 | - $ent_flag= var_export($this->htsl->getConfig('ENT_flags',$this->docType),true); |
|
| 545 | - $charset= var_export($this->htsl->getConfig('charset'),true); |
|
| 543 | + $content=$line->slice(1); |
|
| 544 | + $ent_flag=var_export($this->htsl->getConfig('ENT_flags', $this->docType), true); |
|
| 545 | + $charset=var_export($this->htsl->getConfig('charset'), true); |
|
| 546 | 546 | |
| 547 | - return $this->openNode(new StringNode($this,$line))->appendLine("<?=htmlentities($content,$ent_flag,$charset,false)?>"); |
|
| 547 | + return $this->openNode(new StringNode($this, $line))->appendLine("<?=htmlentities($content,$ent_flag,$charset,false)?>"); |
|
| 548 | 548 | } |
| 549 | 549 | |
| 550 | 550 | /** |
@@ -558,9 +558,9 @@ discard block |
||
| 558 | 558 | */ |
| 559 | 559 | protected function parseExpressionHtmlLine( Line$line ):self |
| 560 | 560 | { |
| 561 | - $content= $line->slice(1); |
|
| 561 | + $content=$line->slice(1); |
|
| 562 | 562 | |
| 563 | - return $this->openNode(new StringNode($this,$line))->appendLine("<?$content?>"); |
|
| 563 | + return $this->openNode(new StringNode($this, $line))->appendLine("<?$content?>"); |
|
| 564 | 564 | } |
| 565 | 565 | |
| 566 | 566 | /** |
@@ -574,7 +574,7 @@ discard block |
||
| 574 | 574 | */ |
| 575 | 575 | protected function parseCommentLine( Line$line ):self |
| 576 | 576 | { |
| 577 | - $node= new CommentNode($this,$line); |
|
| 577 | + $node=new CommentNode($this, $line); |
|
| 578 | 578 | |
| 579 | 579 | return $this->openNode($node)->appendLine($node->open()); |
| 580 | 580 | } |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | */ |
| 591 | 591 | protected function parseTagLine( Line$line ):self |
| 592 | 592 | { |
| 593 | - $node= new TagNode($this,$line); |
|
| 593 | + $node=new TagNode($this, $line); |
|
| 594 | 594 | |
| 595 | 595 | $this->appendLine($node->open()); |
| 596 | 596 | |
@@ -610,7 +610,7 @@ discard block |
||
| 610 | 610 | */ |
| 611 | 611 | protected function parseControlLine( Line$line ):self |
| 612 | 612 | { |
| 613 | - $node= new ControlNode($this,$line); |
|
| 613 | + $node=new ControlNode($this, $line); |
|
| 614 | 614 | |
| 615 | 615 | return $this->appendLine($node->open())->openNode($node); |
| 616 | 616 | } |
@@ -626,7 +626,7 @@ discard block |
||
| 626 | 626 | */ |
| 627 | 627 | protected function parseDocControlLine( Line$line ):self |
| 628 | 628 | { |
| 629 | - switch( $name= $line->pregGet('/(?<=^@)[\w-:]+/') ){ |
|
| 629 | + switch( $name=$line->pregGet('/(?<=^@)[\w-:]+/') ){ |
|
| 630 | 630 | default:{ |
| 631 | 631 | $this->throw("The @$name is not supported."); |
| 632 | 632 | }break; |
@@ -658,10 +658,10 @@ discard block |
||
| 658 | 658 | */ |
| 659 | 659 | protected function extend( string$fileName ):self |
| 660 | 660 | { |
| 661 | - $this->parent= new static($this->htsl,$this->buffer->goSide($fileName)); |
|
| 661 | + $this->parent=new static($this->htsl, $this->buffer->goSide($fileName)); |
|
| 662 | 662 | |
| 663 | - $this->docType= $this->parent->docType; |
|
| 664 | - $this->indentation= $this->parent->indentation; |
|
| 663 | + $this->docType=$this->parent->docType; |
|
| 664 | + $this->indentation=$this->parent->indentation; |
|
| 665 | 665 | |
| 666 | 666 | return $this; |
| 667 | 667 | } |
@@ -677,7 +677,7 @@ discard block |
||
| 677 | 677 | */ |
| 678 | 678 | protected function insertIndentations( string$input ):string |
| 679 | 679 | { |
| 680 | - return preg_replace('/(?<=^|\\n)(?!$)/',str_repeat($this->indentation,$this->level-$this->sectionLevel),$input); |
|
| 680 | + return preg_replace('/(?<=^|\\n)(?!$)/', str_repeat($this->indentation, $this->level-$this->sectionLevel), $input); |
|
| 681 | 681 | } |
| 682 | 682 | |
| 683 | 683 | /** |
@@ -689,13 +689,13 @@ discard block |
||
| 689 | 689 | * |
| 690 | 690 | * @return \Htsl\Parser\Document |
| 691 | 691 | */ |
| 692 | - protected function include( Line$line ):self |
|
| 692 | + protected function include(Line$line):self |
|
| 693 | 693 | { |
| 694 | - $inclued= (new static($this->htsl,$this->buffer->goSide($line->pregGet('/(?<=\( ).*(?= \))/')),$this))->execute()->content; |
|
| 694 | + $inclued=(new static($this->htsl, $this->buffer->goSide($line->pregGet('/(?<=\( ).*(?= \))/')), $this))->execute()->content; |
|
| 695 | 695 | |
| 696 | - false===$this->indentation or $inclued= $this->insertIndentations($inclued); |
|
| 696 | + false===$this->indentation or $inclued=$this->insertIndentations($inclued); |
|
| 697 | 697 | |
| 698 | - return $this->openNode(new StringNode($this,$line))->append($inclued); |
|
| 698 | + return $this->openNode(new StringNode($this, $line))->append($inclued); |
|
| 699 | 699 | } |
| 700 | 700 | |
| 701 | 701 | /** |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | */ |
| 710 | 710 | protected function defineSection( Line$line ):self |
| 711 | 711 | { |
| 712 | - $node= new SectionNode($this,$line); |
|
| 712 | + $node=new SectionNode($this, $line); |
|
| 713 | 713 | |
| 714 | 714 | $node->open(); |
| 715 | 715 | |
@@ -727,18 +727,18 @@ discard block |
||
| 727 | 727 | */ |
| 728 | 728 | protected function showSection( Line$line ):self |
| 729 | 729 | { |
| 730 | - $sectionName= $line->pregGet('/(?<=\( ).*(?= \))/'); |
|
| 730 | + $sectionName=$line->pregGet('/(?<=\( ).*(?= \))/'); |
|
| 731 | 731 | |
| 732 | - if( !isset($this->sections[$sectionName]) ){ |
|
| 733 | - return $this->openNode(new StringNode($this,$line)); |
|
| 732 | + if( !isset($this->sections[ $sectionName ]) ){ |
|
| 733 | + return $this->openNode(new StringNode($this, $line)); |
|
| 734 | 734 | } |
| 735 | - $content= $this->sections[$sectionName]->content; |
|
| 735 | + $content=$this->sections[ $sectionName ]->content; |
|
| 736 | 736 | |
| 737 | - false===$this->indentation or $content= $this->insertIndentations($content); |
|
| 737 | + false===$this->indentation or $content=$this->insertIndentations($content); |
|
| 738 | 738 | |
| 739 | 739 | $this->append($content); |
| 740 | 740 | |
| 741 | - $node= new NamelessSectionNode($this,$line); |
|
| 741 | + $node=new NamelessSectionNode($this, $line); |
|
| 742 | 742 | |
| 743 | 743 | $node->open(); |
| 744 | 744 | |
@@ -755,8 +755,8 @@ discard block |
||
| 755 | 755 | public function setSection( Section$section=null ):self |
| 756 | 756 | { |
| 757 | 757 | if( !$section ){ |
| 758 | - $this->sectionLevel= 0; |
|
| 759 | - $this->currentSection= null; |
|
| 758 | + $this->sectionLevel=0; |
|
| 759 | + $this->currentSection=null; |
|
| 760 | 760 | |
| 761 | 761 | return $this; |
| 762 | 762 | } |
@@ -765,17 +765,17 @@ discard block |
||
| 765 | 765 | $this->throw('Nesting definition of section is forbidden.'); |
| 766 | 766 | } |
| 767 | 767 | |
| 768 | - if( isset($this->parent->sections[$section->name]) ){ |
|
| 768 | + if( isset($this->parent->sections[ $section->name ]) ){ |
|
| 769 | 769 | $this->throw("Section {$section->name} already defined."); |
| 770 | 770 | } |
| 771 | 771 | |
| 772 | - $this->currentSection= $section; |
|
| 772 | + $this->currentSection=$section; |
|
| 773 | 773 | |
| 774 | 774 | if( $section->name ){ |
| 775 | - $this->parent->sections[$section->name]=$section; |
|
| 775 | + $this->parent->sections[ $section->name ]=$section; |
|
| 776 | 776 | } |
| 777 | 777 | |
| 778 | - $this->sectionLevel= $this->level+1; |
|
| 778 | + $this->sectionLevel=$this->level+1; |
|
| 779 | 779 | |
| 780 | 780 | return $this; |
| 781 | 781 | } |
@@ -791,8 +791,8 @@ discard block |
||
| 791 | 791 | { |
| 792 | 792 | if( $this->parent ){ |
| 793 | 793 | foreach( $this->sections as $name=>$section ){ |
| 794 | - if( !isset($this->parent->sections[$name]) ){ |
|
| 795 | - $this->parent->sections[$name]=$section; |
|
| 794 | + if( !isset($this->parent->sections[ $name ]) ){ |
|
| 795 | + $this->parent->sections[ $name ]=$section; |
|
| 796 | 796 | }; |
| 797 | 797 | } |
| 798 | 798 | } |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | */ |
| 812 | 812 | public function htmlEntities( string$input ):string |
| 813 | 813 | { |
| 814 | - return htmlentities($input,$this->htsl->getConfig('ENT_flags',$this->docType),$this->htsl->getConfig('charset'),false); |
|
| 814 | + return htmlentities($input, $this->htsl->getConfig('ENT_flags', $this->docType), $this->htsl->getConfig('charset'), false); |
|
| 815 | 815 | } |
| 816 | 816 | |
| 817 | 817 | /** |
@@ -823,12 +823,12 @@ discard block |
||
| 823 | 823 | */ |
| 824 | 824 | protected function setLevel( int$level ):self |
| 825 | 825 | { |
| 826 | - $level-= $this->level; |
|
| 826 | + $level-=$this->level; |
|
| 827 | 827 | |
| 828 | 828 | if( $level<=0 ){ |
| 829 | 829 | $this->closeNodes(-$level); |
| 830 | 830 | }elseif( $level==1 ){ |
| 831 | - $this->level+= 1; |
|
| 831 | + $this->level+=1; |
|
| 832 | 832 | }else{ |
| 833 | 833 | $this->throw('Indent error.'); |
| 834 | 834 | } |
@@ -847,7 +847,7 @@ discard block |
||
| 847 | 847 | */ |
| 848 | 848 | protected function openNode( Node$node ):self |
| 849 | 849 | { |
| 850 | - array_push($this->openedNodes,$node); |
|
| 850 | + array_push($this->openedNodes, $node); |
|
| 851 | 851 | |
| 852 | 852 | $node->scope and $this->setScope($node); |
| 853 | 853 | |
@@ -868,13 +868,13 @@ discard block |
||
| 868 | 868 | if( empty($this->openedNodes) ) return $this; |
| 869 | 869 | |
| 870 | 870 | while( $level-->=0 ){ |
| 871 | - $node= array_pop($this->openedNodes); |
|
| 871 | + $node=array_pop($this->openedNodes); |
|
| 872 | 872 | |
| 873 | 873 | $node->scope and $this->removeScope($node); |
| 874 | 874 | |
| 875 | 875 | $closer=$node->close($this->currentLine) and $this->appendLine($closer); |
| 876 | 876 | |
| 877 | - $this->level-= $level>=0 ?1:0; |
|
| 877 | + $this->level-=$level>=0? 1 : 0; |
|
| 878 | 878 | } |
| 879 | 879 | |
| 880 | 880 | return $this; |
@@ -889,7 +889,7 @@ discard block |
||
| 889 | 889 | */ |
| 890 | 890 | protected function setScope( Node$scope ):int |
| 891 | 891 | { |
| 892 | - return array_unshift($this->scopes,$scope); |
|
| 892 | + return array_unshift($this->scopes, $scope); |
|
| 893 | 893 | } |
| 894 | 894 | |
| 895 | 895 | /** |
@@ -901,7 +901,7 @@ discard block |
||
| 901 | 901 | */ |
| 902 | 902 | public function getScope() |
| 903 | 903 | { |
| 904 | - return $this->scopes[0]??null; |
|
| 904 | + return $this->scopes[ 0 ]??null; |
|
| 905 | 905 | } |
| 906 | 906 | |
| 907 | 907 | /** |
@@ -933,7 +933,7 @@ discard block |
||
| 933 | 933 | */ |
| 934 | 934 | protected function appendLine( string$content ):self |
| 935 | 935 | { |
| 936 | - false===$this->indentation or $content= str_repeat($this->indentation,$this->level-$this->sectionLevel).$content."\n"; |
|
| 936 | + false===$this->indentation or $content=str_repeat($this->indentation, $this->level-$this->sectionLevel).$content."\n"; |
|
| 937 | 937 | |
| 938 | 938 | return $this->append($content); |
| 939 | 939 | } |
@@ -979,7 +979,7 @@ discard block |
||
| 979 | 979 | * |
| 980 | 980 | * @throw \Htsl\Parser\HtslParsingException |
| 981 | 981 | */ |
| 982 | - public function throw( string$message ) |
|
| 982 | + public function throw(string$message) |
|
| 983 | 983 | { |
| 984 | 984 | throw new HtslParsingException("$message at file {$this->buffer->filePath} line $this->lineNumber"); |
| 985 | 985 | } |
@@ -36,8 +36,8 @@ |
||
| 36 | 36 | public function open():string |
| 37 | 37 | { |
| 38 | 38 | return $this->htmlComment ? |
| 39 | - '<!--'.str_replace('-->','--'.chr(0xC).'>',substr($this->line->getContent(),1)): |
|
| 40 | - '<?php /* '.substr($this->line->getContent(),2); |
|
| 39 | + '<!--'.str_replace('-->','--'.chr(0xC).'>',substr($this->line->getContent(),1)): |
|
| 40 | + '<?php /* '.substr($this->line->getContent(),2); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | */ |
| 25 | 25 | protected function construct():parent |
| 26 | 26 | { |
| 27 | - $this->htmlComment= '!'!==$this->line->getChar(1); |
|
| 27 | + $this->htmlComment='!'!==$this->line->getChar(1); |
|
| 28 | 28 | return $this; |
| 29 | 29 | } |
| 30 | 30 | |
@@ -35,9 +35,8 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | public function open():string |
| 37 | 37 | { |
| 38 | - return $this->htmlComment ? |
|
| 39 | - '<!--'.str_replace('-->','--'.chr(0xC).'>',substr($this->line->getContent(),1)): |
|
| 40 | - '<?php /* '.substr($this->line->getContent(),2); |
|
| 38 | + return $this->htmlComment? |
|
| 39 | + '<!--'.str_replace('-->', '--'.chr(0xC).'>', substr($this->line->getContent(), 1)) : '<?php /* '.substr($this->line->getContent(), 2); |
|
| 41 | 40 | } |
| 42 | 41 | |
| 43 | 42 | /** |
@@ -49,6 +48,6 @@ discard block |
||
| 49 | 48 | */ |
| 50 | 49 | public function close( Line$closerLine ):string |
| 51 | 50 | { |
| 52 | - return $this->htmlComment ? '-->' : ' */ ?>'; |
|
| 51 | + return $this->htmlComment? '-->' : ' */ ?>'; |
|
| 53 | 52 | } |
| 54 | 53 | } |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | public function __get( $attribute ) |
| 17 | 17 | { |
| 18 | - if( is_callable([static::class, $getter= 'get'.implode('',array_map('ucfirst',explode('_',$attribute))),]) ){ |
|
| 18 | + if( is_callable([ static::class, $getter='get'.implode('', array_map('ucfirst', explode('_', $attribute))), ]) ){ |
|
| 19 | 19 | return static::$getter(); |
| 20 | 20 | }else{ |
| 21 | 21 | throw new \Exception(static::class.' has no attribute named '.$attribute); |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | public function __set( $attribute, $value ) |
| 16 | 16 | { |
| 17 | - if( is_callable([static::class, $setter= 'set'.implode('',array_map('ucfirst',explode('_',$attribute))),]) ){ |
|
| 17 | + if( is_callable([ static::class, $setter='set'.implode('', array_map('ucfirst', explode('_', $attribute))), ]) ){ |
|
| 18 | 18 | return static::$setter($value); |
| 19 | 19 | }else{ |
| 20 | 20 | throw new \Exception(static::class.' has no attribute named '.$attribute); |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | */ |
| 32 | 32 | public function __construct( string$name=null ) |
| 33 | 33 | { |
| 34 | - $this->name = $name; |
|
| 34 | + $this->name=$name; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | /** |
@@ -51,9 +51,9 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | final public function __construct( Document$document, Line$line ) |
| 53 | 53 | { |
| 54 | - $this->htsl= $document->htsl; |
|
| 55 | - $this->document= $document; |
|
| 56 | - $this->line= $line; |
|
| 54 | + $this->htsl=$document->htsl; |
|
| 55 | + $this->document=$document; |
|
| 56 | + $this->line=$line; |
|
| 57 | 57 | |
| 58 | 58 | $this->construct(); |
| 59 | 59 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | public function getNodeType() |
| 100 | 100 | { |
| 101 | 101 | static $nodeType; |
| 102 | - return $nodeType??$nodeType= $this->nodeType??(static function($className){return strtolower(preg_replace('/(?<=\\w)([A-Z])/','_$1',preg_replace('/^(?:\\w+\\\\)*(\\w+)Node$/','$1',$className)));})(get_class($this)); |
|
| 102 | + return $nodeType??$nodeType=$this->nodeType??(static function( $className ){return strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_$1', preg_replace('/^(?:\\w+\\\\)*(\\w+)Node$/', '$1', $className))); })(get_class($this)); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | /** |
@@ -112,39 +112,39 @@ discard block |
||
| 112 | 112 | */ |
| 113 | 113 | protected function loadConfig( string$name, IConfigProvider$configProvider ) |
| 114 | 114 | { |
| 115 | - $config= $configProvider->getConfig($this->nodeType.'_nodes',$name) ?: $configProvider->getConfig($this->nodeType.'_nodes','*'); |
|
| 115 | + $config=$configProvider->getConfig($this->nodeType.'_nodes', $name)?: $configProvider->getConfig($this->nodeType.'_nodes', '*'); |
|
| 116 | 116 | |
| 117 | - if( isset($config['multiple']) ){ |
|
| 118 | - foreach( $config['multiple'] as $value ){ |
|
| 119 | - if( $this->line->pregGet($value['pattern']) ){ |
|
| 120 | - $config= $value; |
|
| 117 | + if( isset($config[ 'multiple' ]) ){ |
|
| 118 | + foreach( $config[ 'multiple' ] as $value ){ |
|
| 119 | + if( $this->line->pregGet($value[ 'pattern' ]) ){ |
|
| 120 | + $config=$value; |
|
| 121 | 121 | break; |
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - if( isset($config['in']) ){ |
|
| 126 | + if( isset($config[ 'in' ]) ){ |
|
| 127 | 127 | $config=(function( array$config )use($name){ |
| 128 | - foreach( $config['in'] as $key=>$value ){ |
|
| 128 | + foreach( $config[ 'in' ] as $key=>$value ){ |
|
| 129 | 129 | if( $this->document->scope && $this->document->scope->scope===$key ){ |
| 130 | - $value['in_scope']= $key; |
|
| 130 | + $value[ 'in_scope' ]=$key; |
|
| 131 | 131 | return $value; |
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | - if( !isset($config['out']) ){ |
|
| 135 | - $this->document->throw("The $this->nodeType node $name only use in scope ".implode(',',array_keys($config['in']))); |
|
| 134 | + if( !isset($config[ 'out' ]) ){ |
|
| 135 | + $this->document->throw("The $this->nodeType node $name only use in scope ".implode(',', array_keys($config[ 'in' ]))); |
|
| 136 | 136 | } |
| 137 | - return $config['out']; |
|
| 137 | + return $config[ 'out' ]; |
|
| 138 | 138 | })($config); |
| 139 | - }elseif( isset($config['only_in']) && (!$this->document->scope || !in_array($this->document->scope->scope,$config['only_in'])) ){ |
|
| 140 | - $this->document->throw("The $this->nodeType node $name only use in scope ".implode(',',$config['only_in'])); |
|
| 141 | - }elseif( isset($config['not_in']) && (!$this->document->scope || !in_array($this->document->scope->scope,$config['not_in'])) ){ |
|
| 142 | - $this->document->throw("The $this->nodeType node $name not use in scope ".implode(',',$config['not_in'])); |
|
| 139 | + }elseif( isset($config[ 'only_in' ]) && (!$this->document->scope || !in_array($this->document->scope->scope, $config[ 'only_in' ])) ){ |
|
| 140 | + $this->document->throw("The $this->nodeType node $name only use in scope ".implode(',', $config[ 'only_in' ])); |
|
| 141 | + }elseif( isset($config[ 'not_in' ]) && (!$this->document->scope || !in_array($this->document->scope->scope, $config[ 'not_in' ])) ){ |
|
| 142 | + $this->document->throw("The $this->nodeType node $name not use in scope ".implode(',', $config[ 'not_in' ])); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - if( !is_array($config) ){$this->document->throw("The $this->nodeType node $name is not supported.");} |
|
| 145 | + if( !is_array($config) ){$this->document->throw("The $this->nodeType node $name is not supported."); } |
|
| 146 | 146 | |
| 147 | - $this->config= $config; |
|
| 147 | + $this->config=$config; |
|
| 148 | 148 | |
| 149 | 149 | return $this; |
| 150 | 150 | } |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | */ |
| 26 | 26 | protected function construct():parent |
| 27 | 27 | { |
| 28 | - $this->name= null; |
|
| 28 | + $this->name=null; |
|
| 29 | 29 | |
| 30 | 30 | return $this; |
| 31 | 31 | } |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | */ |
| 26 | 26 | protected function construct():parent |
| 27 | 27 | { |
| 28 | - $this->name= $this->line->pregGet('/(?<=\( ).*(?= \))/'); |
|
| 28 | + $this->name=$this->line->pregGet('/(?<=\( ).*(?= \))/'); |
|
| 29 | 29 | |
| 30 | 30 | return $this; |
| 31 | 31 | } |
@@ -38,14 +38,14 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | protected function construct():parent |
| 40 | 40 | { |
| 41 | - $name= $this->line->pregGet('/(?<=^~)[\w-]*/'); |
|
| 41 | + $name=$this->line->pregGet('/(?<=^~)[\w-]*/'); |
|
| 42 | 42 | $this->name=$name; |
| 43 | 43 | |
| 44 | - $this->loadConfig($name,$this->htsl); |
|
| 44 | + $this->loadConfig($name, $this->htsl); |
|
| 45 | 45 | |
| 46 | - $this->param= $this->line->pregGet('/^~[\w-]*\( (.*) \)/',1); |
|
| 46 | + $this->param=$this->line->pregGet('/^~[\w-]*\( (.*) \)/', 1); |
|
| 47 | 47 | |
| 48 | - $this->structureName=$this->config['name']??$name; |
|
| 48 | + $this->structureName=$this->config[ 'name' ]??$name; |
|
| 49 | 49 | |
| 50 | 50 | $this->id=strtoupper(uniqid()); |
| 51 | 51 | |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function open():string |
| 61 | 61 | { |
| 62 | - return $this->withParam($this->config['opener']); |
|
| 62 | + return $this->withParam($this->config[ 'opener' ]); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | */ |
| 70 | 70 | public function getScope() |
| 71 | 71 | { |
| 72 | - return $this->config['scope']??null; |
|
| 72 | + return $this->config[ 'scope' ]??null; |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | |
@@ -82,16 +82,16 @@ discard block |
||
| 82 | 82 | */ |
| 83 | 83 | public function close( Line$closerLine ):string |
| 84 | 84 | { |
| 85 | - if( isset($this->config['close_by']) && $closerLine->indentLevel==$this->line->indentLevel ){ |
|
| 86 | - foreach( $this->config['close_by'] as $key=>$value ){ |
|
| 85 | + if( isset($this->config[ 'close_by' ]) && $closerLine->indentLevel==$this->line->indentLevel ){ |
|
| 86 | + foreach( $this->config[ 'close_by' ] as $key=>$value ){ |
|
| 87 | 87 | if( $closerLine->pregMatch($key) ){ |
| 88 | 88 | return $this->withParam($value); |
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - if( isset($this->config['closer']) ) |
|
| 94 | - { return $this->withParam($this->config['closer']); } |
|
| 93 | + if( isset($this->config[ 'closer' ]) ) |
|
| 94 | + { return $this->withParam($this->config[ 'closer' ]); } |
|
| 95 | 95 | |
| 96 | 96 | return ''; |
| 97 | 97 | } |
@@ -105,23 +105,23 @@ discard block |
||
| 105 | 105 | */ |
| 106 | 106 | private function withParam( string$input ) |
| 107 | 107 | { |
| 108 | - return str_replace('$_FLAG_$',"__HTSL_CTRL_FLAG_{$this->id}__",preg_replace_callback('/(?<!%)%s((?:\\/.+?(?<!\\\\)\\/.+?(?<!\\\\)\\/)+)?/',function( array$matches ){ |
|
| 109 | - $param= $this->param; |
|
| 108 | + return str_replace('$_FLAG_$', "__HTSL_CTRL_FLAG_{$this->id}__", preg_replace_callback('/(?<!%)%s((?:\\/.+?(?<!\\\\)\\/.+?(?<!\\\\)\\/)+)?/', function( array$matches ){ |
|
| 109 | + $param=$this->param; |
|
| 110 | 110 | |
| 111 | - if( isset($matches[1]) ){ |
|
| 111 | + if( isset($matches[ 1 ]) ){ |
|
| 112 | 112 | array_map(...[ |
| 113 | - function($replacer)use(&$param){ |
|
| 114 | - list($pattern,$replacement,)= preg_split('/(?<!\\\\)\\//',$replacer); |
|
| 115 | - $param= preg_replace(...[ |
|
| 113 | + function( $replacer )use(&$param){ |
|
| 114 | + list($pattern, $replacement,)=preg_split('/(?<!\\\\)\\//', $replacer); |
|
| 115 | + $param=preg_replace(...[ |
|
| 116 | 116 | "/$pattern/", |
| 117 | - preg_replace('/^\\\\_$/','',$replacement), |
|
| 117 | + preg_replace('/^\\\\_$/', '', $replacement), |
|
| 118 | 118 | $param, |
| 119 | 119 | ]); |
| 120 | 120 | }, |
| 121 | 121 | preg_split( |
| 122 | 122 | '/(?<!\\\\)\\/\\//' |
| 123 | 123 | , |
| 124 | - trim($matches[1],'/') |
|
| 124 | + trim($matches[ 1 ], '/') |
|
| 125 | 125 | ), |
| 126 | 126 | ]); |
| 127 | 127 | } |