@@ -500,184 +500,184 @@ |
||
500 | 500 | return \in_array($tag_name, self::$optional_end_tags, true) |
501 | 501 | || |
502 | 502 | ( |
503 | - $tag_name == 'li' |
|
503 | + $tag_name == 'li' |
|
504 | 504 | && |
505 | 505 | ( |
506 | - $nextSibling === null |
|
506 | + $nextSibling === null |
|
507 | 507 | || |
508 | 508 | ( |
509 | - $nextSibling instanceof \DOMElement |
|
509 | + $nextSibling instanceof \DOMElement |
|
510 | 510 | && |
511 | 511 | $nextSibling->tagName == 'li' |
512 | - ) |
|
513 | - ) |
|
514 | - ) |
|
512 | + ) |
|
513 | + ) |
|
514 | + ) |
|
515 | 515 | || |
516 | 516 | ( |
517 | - ( |
|
518 | - $tag_name == 'rp' |
|
519 | - ) |
|
517 | + ( |
|
518 | + $tag_name == 'rp' |
|
519 | + ) |
|
520 | 520 | && |
521 | 521 | ( |
522 | - $nextSibling === null |
|
522 | + $nextSibling === null |
|
523 | 523 | || |
524 | 524 | ( |
525 | - $nextSibling instanceof \DOMElement |
|
525 | + $nextSibling instanceof \DOMElement |
|
526 | 526 | && |
527 | 527 | ( |
528 | - $nextSibling->tagName == 'rp' |
|
528 | + $nextSibling->tagName == 'rp' |
|
529 | 529 | || |
530 | 530 | $nextSibling->tagName == 'rt' |
531 | - ) |
|
532 | - ) |
|
533 | - ) |
|
534 | - ) |
|
531 | + ) |
|
532 | + ) |
|
533 | + ) |
|
534 | + ) |
|
535 | 535 | || |
536 | 536 | ( |
537 | - $tag_name == 'tr' |
|
537 | + $tag_name == 'tr' |
|
538 | 538 | && |
539 | 539 | ( |
540 | - $nextSibling === null |
|
540 | + $nextSibling === null |
|
541 | 541 | || |
542 | 542 | ( |
543 | - $nextSibling instanceof \DOMElement |
|
543 | + $nextSibling instanceof \DOMElement |
|
544 | 544 | && |
545 | 545 | $nextSibling->tagName == 'tr' |
546 | - ) |
|
547 | - ) |
|
548 | - ) |
|
546 | + ) |
|
547 | + ) |
|
548 | + ) |
|
549 | 549 | || |
550 | 550 | ( |
551 | - ( |
|
552 | - $tag_name == 'td' |
|
551 | + ( |
|
552 | + $tag_name == 'td' |
|
553 | 553 | || |
554 | 554 | $tag_name == 'th' |
555 | - ) |
|
555 | + ) |
|
556 | 556 | && |
557 | 557 | ( |
558 | - $nextSibling === null |
|
558 | + $nextSibling === null |
|
559 | 559 | || |
560 | 560 | ( |
561 | - $nextSibling instanceof \DOMElement |
|
561 | + $nextSibling instanceof \DOMElement |
|
562 | 562 | && |
563 | 563 | ( |
564 | - $nextSibling->tagName == 'td' |
|
564 | + $nextSibling->tagName == 'td' |
|
565 | 565 | || |
566 | 566 | $nextSibling->tagName == 'th' |
567 | - ) |
|
568 | - ) |
|
569 | - ) |
|
570 | - ) |
|
567 | + ) |
|
568 | + ) |
|
569 | + ) |
|
570 | + ) |
|
571 | 571 | || |
572 | 572 | ( |
573 | - ( |
|
574 | - $tag_name == 'dd' |
|
573 | + ( |
|
574 | + $tag_name == 'dd' |
|
575 | 575 | || |
576 | 576 | $tag_name == 'dt' |
577 | - ) |
|
577 | + ) |
|
578 | 578 | && |
579 | 579 | ( |
580 | - ( |
|
581 | - $nextSibling === null |
|
580 | + ( |
|
581 | + $nextSibling === null |
|
582 | 582 | && |
583 | 583 | $tag_name == 'dd' |
584 | - ) |
|
584 | + ) |
|
585 | 585 | || |
586 | 586 | ( |
587 | - $nextSibling instanceof \DOMElement |
|
587 | + $nextSibling instanceof \DOMElement |
|
588 | 588 | && |
589 | 589 | ( |
590 | - $nextSibling->tagName == 'dd' |
|
590 | + $nextSibling->tagName == 'dd' |
|
591 | 591 | || |
592 | 592 | $nextSibling->tagName == 'dt' |
593 | - ) |
|
594 | - ) |
|
595 | - ) |
|
596 | - ) |
|
593 | + ) |
|
594 | + ) |
|
595 | + ) |
|
596 | + ) |
|
597 | 597 | || |
598 | 598 | ( |
599 | - $tag_name == 'option' |
|
599 | + $tag_name == 'option' |
|
600 | 600 | && |
601 | 601 | ( |
602 | - $nextSibling === null |
|
602 | + $nextSibling === null |
|
603 | 603 | || |
604 | 604 | ( |
605 | - $nextSibling instanceof \DOMElement |
|
605 | + $nextSibling instanceof \DOMElement |
|
606 | 606 | && |
607 | 607 | ( |
608 | - $nextSibling->tagName == 'option' |
|
608 | + $nextSibling->tagName == 'option' |
|
609 | 609 | || |
610 | 610 | $nextSibling->tagName == 'optgroup' |
611 | - ) |
|
612 | - ) |
|
613 | - ) |
|
614 | - ) |
|
611 | + ) |
|
612 | + ) |
|
613 | + ) |
|
614 | + ) |
|
615 | 615 | || |
616 | 616 | ( |
617 | - $tag_name == 'p' |
|
617 | + $tag_name == 'p' |
|
618 | 618 | && |
619 | 619 | ( |
620 | - ( |
|
621 | - $nextSibling === null |
|
620 | + ( |
|
621 | + $nextSibling === null |
|
622 | 622 | && |
623 | 623 | ( |
624 | - $node->parentNode !== null |
|
624 | + $node->parentNode !== null |
|
625 | 625 | && |
626 | 626 | !\in_array( |
627 | - $node->parentNode->tagName, |
|
628 | - [ |
|
629 | - 'a', |
|
630 | - 'audio', |
|
631 | - 'del', |
|
632 | - 'ins', |
|
633 | - 'map', |
|
634 | - 'noscript', |
|
635 | - 'video' |
|
636 | - ], |
|
637 | - true |
|
638 | - ) |
|
639 | - ) |
|
640 | - ) |
|
627 | + $node->parentNode->tagName, |
|
628 | + [ |
|
629 | + 'a', |
|
630 | + 'audio', |
|
631 | + 'del', |
|
632 | + 'ins', |
|
633 | + 'map', |
|
634 | + 'noscript', |
|
635 | + 'video' |
|
636 | + ], |
|
637 | + true |
|
638 | + ) |
|
639 | + ) |
|
640 | + ) |
|
641 | 641 | || |
642 | 642 | ( |
643 | - $nextSibling instanceof \DOMElement |
|
643 | + $nextSibling instanceof \DOMElement |
|
644 | 644 | && |
645 | 645 | \in_array( |
646 | - $nextSibling->tagName, |
|
647 | - [ |
|
648 | - 'address', |
|
649 | - 'article', |
|
650 | - 'aside', |
|
651 | - 'blockquote', |
|
652 | - 'dir', |
|
653 | - 'div', |
|
654 | - 'dl', |
|
655 | - 'fieldset', |
|
656 | - 'footer', |
|
657 | - 'form', |
|
658 | - 'h1', |
|
659 | - 'h2', |
|
660 | - 'h3', |
|
661 | - 'h4', |
|
662 | - 'h5', |
|
663 | - 'h6', |
|
664 | - 'header', |
|
665 | - 'hgroup', |
|
666 | - 'hr', |
|
667 | - 'menu', |
|
668 | - 'nav', |
|
669 | - 'ol', |
|
670 | - 'p', |
|
671 | - 'pre', |
|
672 | - 'section', |
|
673 | - 'table', |
|
674 | - 'ul', |
|
675 | - ], |
|
676 | - true |
|
677 | - ) |
|
678 | - ) |
|
679 | - ) |
|
680 | - ); |
|
646 | + $nextSibling->tagName, |
|
647 | + [ |
|
648 | + 'address', |
|
649 | + 'article', |
|
650 | + 'aside', |
|
651 | + 'blockquote', |
|
652 | + 'dir', |
|
653 | + 'div', |
|
654 | + 'dl', |
|
655 | + 'fieldset', |
|
656 | + 'footer', |
|
657 | + 'form', |
|
658 | + 'h1', |
|
659 | + 'h2', |
|
660 | + 'h3', |
|
661 | + 'h4', |
|
662 | + 'h5', |
|
663 | + 'h6', |
|
664 | + 'header', |
|
665 | + 'hgroup', |
|
666 | + 'hr', |
|
667 | + 'menu', |
|
668 | + 'nav', |
|
669 | + 'ol', |
|
670 | + 'p', |
|
671 | + 'pre', |
|
672 | + 'section', |
|
673 | + 'table', |
|
674 | + 'ul', |
|
675 | + ], |
|
676 | + true |
|
677 | + ) |
|
678 | + ) |
|
679 | + ) |
|
680 | + ); |
|
681 | 681 | } |
682 | 682 | |
683 | 683 | protected function domNodeToString(\DOMNode $node): string |