Merge pull request #111 from phug-php/feature/multi-tester-3

Use multi-tester 2.5 split: 44978d6c0f5d5245cd8b9988002d117ea9ebdd04
phug-php · Sep 21, 2023 · 6568257 · 6568257
1 parent fc8e3a0
commit 6568257
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Formatter/Format/XmlFormat.php b/Formatter/Format/XmlFormat.php
@@ -167,19 +167,23 @@ protected function formatAttributeElement(AttributeElement $element)
         $value = $element->getValue();
         $name = $element->getName();
         $nonEmptyAttribute = ($name === 'class' || $name === 'id');
+
         if ($nonEmptyAttribute && (
             !$value ||
             ($value instanceof TextElement && ((string) $value->getValue()) === '') ||
             (is_string($value) && in_array(trim($value), ['', '""', "''"], true))
         )) {
             return '';
         }
+
         if ($value instanceof ExpressionElement) {
             if ($nonEmptyAttribute && in_array(trim($value->getValue()), ['', '""', "''"], true)) {
                 return '';
             }
+
             if (strtolower($value->getValue()) === 'true') {
                 $formattedValue = null;
+
                 if ($name instanceof ExpressionElement) {
                     $bufferVariable = $this->pattern('buffer_variable');
                     $name = $this->pattern(
@@ -193,6 +197,7 @@ protected function formatAttributeElement(AttributeElement $element)
                     $value = new ExpressionElement($bufferVariable);
                     $formattedValue = $this->format($value);
                 }
+
                 $formattedName = $this->format($name);
                 $formattedValue = $formattedValue || $formattedValue === '0'
                     ? $formattedValue
@@ -204,6 +209,7 @@ protected function formatAttributeElement(AttributeElement $element)
                     $formattedValue
                 );
             }
+
             if (in_array(strtolower($value->getValue()), ['false', 'null', 'undefined'], true)) {
                 return '';
             }

diff --git a/Formatter/Partial/MagicAccessorTrait.php b/Formatter/Partial/MagicAccessorTrait.php
@@ -6,13 +6,7 @@ trait MagicAccessorTrait
 {
     private function getMethod($prefix, $name)
     {
-        switch ($name) {
-            case 'nodes':
-                $name = 'children';
-                break;
-        }
-
-        return $prefix.ucfirst($name);
+        return $prefix.ucfirst($name === 'nodes' ? 'children' : $name);
     }
 
     public function __get($name)