servo-php / fluidxml

source/FluidXml/FluidContext.php

Indentation +4 added lines, -4 removed lines

@@ -8,10 +8,10 @@
 class FluidContext implements FluidInterface, \ArrayAccess, \Iterator
 {
         use FluidAliasesTrait,
-            FluidSaveTrait,
-            NewableTrait,
-            ReservedCallTrait,          // For compatibility with PHP 5.6.
-            ReservedCallStaticTrait;
+                FluidSaveTrait,
+                NewableTrait,
+                ReservedCallTrait,          // For compatibility with PHP 5.6.
+                ReservedCallStaticTrait;
         private array $nodes = [];
         private int $seek = 0;
 

Spacing +13 added lines, -13 removed lines

@@ -10,7 +10,7 @@ 
         use FluidAliasesTrait,
             FluidSaveTrait,
             NewableTrait,
-            ReservedCallTrait,          // For compatibility with PHP 5.6.
+            ReservedCallTrait, // For compatibility with PHP 5.6.
             ReservedCallStaticTrait;
         private array $nodes = [];
         private int $seek = 0;
@@ -20,14 +20,14 @@ 
          */
         public function __construct(private $document, private $handler, $context)
         {
-                if (! \is_array($context) && ! $context instanceof \Traversable) {
+                if (!\is_array($context) && !$context instanceof \Traversable) {
                         // DOMDocument, DOMElement and DOMNode are not iterable.
                         // DOMNodeList and FluidContext are iterable.
-                        $context = [ $context ];
+                        $context = [$context];
                 }
 
                 foreach ($context as $n) {
-                        if (! $n instanceof \DOMNode) {
+                        if (!$n instanceof \DOMNode) {
                                 throw new \Exception('Node type not recognized.');
                         }
 
@@ -155,7 +155,7 @@ 
                 return $this->query(...$query);
         }
 
-        public function times($times, callable $fn = null): FluidRepeater|static
+        public function times($times, callable $fn = null): FluidRepeater | static
         {
                 if ($fn === null) {
                         return new FluidRepeater($this->document, $this->handler, $this, $times);
@@ -226,7 +226,7 @@ 
 
         public function prependSibling($sibling, ...$optionals)
         {
-                return $this->handler->insertElement($this->nodes, $sibling, $optionals, function ($sibling, $element) {
+                return $this->handler->insertElement($this->nodes, $sibling, $optionals, function($sibling, $element) {
                         if ($sibling->parentNode === null) {
                                 // If the node doesn't have at least one parent node,
                                 // the sibling creation fails. In this case we replace
@@ -241,7 +241,7 @@ 
 
         public function appendSibling($sibling, ...$optionals)
         {
-                return $this->handler->insertElement($this->nodes, $sibling, $optionals, function ($sibling, $element) {
+                return $this->handler->insertElement($this->nodes, $sibling, $optionals, function($sibling, $element) {
                         if ($sibling->parentNode === null) {
                                 // If the node doesn't have at least one parent node,
                                 // the sibling creation fails. In this case we replace
@@ -262,7 +262,7 @@ 
                 if (\is_array($name)) {
                         $attrs = $name;
                 } else {
-                        $attrs = [ $name => $value ];
+                        $attrs = [$name => $value];
                 }
 
                 foreach ($this->nodes as $n) {
@@ -415,12 +415,12 @@ 
                 return new FluidContext($this->document, $this->handler, $context);
         }
 
-        protected function resolveQuery($query): array|string
+        protected function resolveQuery($query): array | string
         {
-                if ( $query === '.'
+                if ($query === '.'
                      || $query[0] === '/'
-                     || ( $query[0] === '.' && $query[1] === '/' )
-                     || ( $query[0] === '.' && $query[1] === '.' ) ) {
+                     || ($query[0] === '.' && $query[1] === '/')
+                     || ($query[0] === '.' && $query[1] === '.')) {
                         return $query;
                 }
 
@@ -438,7 +438,7 @@ 
                                 $found = ($r === $u) || $found;
                         }
 
-                        if (! $found) {
+                        if (!$found) {
                                 $set[] = $r;
                         }
                 }

source/FluidXml/CssTranslator.php

Spacing +33 added lines, -33 removed lines

@@ -7,32 +7,32 @@ 
         final public const TOKEN = '/{([[:alpha:]]+)(\d+)}/i';
         final public const MAP = [
                 // Empty part of #id and .class
-                [ '(?<=^|\s)      # The begining or an empty space.
+                ['(?<=^|\s)      # The begining or an empty space.
                    (?=[.#\[])     # . | # | [',
                   '*',
                   'TAG',
-                  false ],
+                  false],
                 // #id
-                [ '\#
+                ['\#
                    ([\w\-]+)',
                   '[@id="\1"]',
                   'ID',
-                  false ],
+                  false],
                 // .class
-                [ '\.
+                ['\.
                    ([\w\-]+)',
                   '[ contains( concat(" ", normalize-space(@class), " "), concat(" ", "\1", " ") ) ]',
                   'CLASS',
-                  false ],
+                  false],
                 // [attr]
-                [ '\[
+                ['\[
                    ([\w\-]+)
                    \]',
                   '[@\1]',
                   'ATTR',
-                  false ],
+                  false],
                 // [attr="val"]
-                [ '\[
+                ['\[
                    ([\w\-]+)
                    =["\']
                    (.*)
@@ -40,81 +40,81 @@ 
                    \]',
                   '[@\1="\2"]',
                   'ATTR',
-                  false ],
+                  false],
                 // ns|A
-                [ '([\w\-]+)
+                ['([\w\-]+)
                    \|
                    (?=\w)       # A namespace must be followed at least by a character.',
                   '\1:',
                   'NS',
-                  false ],
+                  false],
                 // *|A
-                [ '\*           # Namespace wildcard
+                ['\*           # Namespace wildcard
                    \|
                    (\w+)',
                   '*[local-name() = \'\1\']',
                   'NS',
-                  false ],
+                  false],
                 // :root
-                [ ':root\b',
+                [':root\b',
                   '/*',
                   'TAG',
-                  false ],
+                  false],
                 // A
-                [ '(?<=^|\s|\})
+                ['(?<=^|\s|\})
                    ( [\w\-]+ | \* )',
                   '\1',
                   'TAG',
-                  false ],
+                  false],
                 // Aggregates the components of a tag in an expression.
-                [ '({NS\d+})?
+                ['({NS\d+})?
                    ({TAG\d+})
                    ((?:{ATTR\d+})*|)
                    ((?:{ID\d+})*|)
                    ((?:{CLASS\d+})*|)',
                   '\1\2\3\4\5',
                   'EXP',
-                  false ],
-                [ '({EXP\d+})
+                  false],
+                ['({EXP\d+})
                    :first-child',
                   '*[1]/self::\1',
                   'EXP',
-                  false ],
+                  false],
                 // {} + {}
-                [ '({EXP\d+})
+                ['({EXP\d+})
                    \s* \+ \s*
                    ({EXP\d+})',
                   '\1/following-sibling::*[1]/self::\2',
                   'EXP',
-                  true ],
+                  true],
                 // {} ~ {}
-                [ '({EXP\d+})
+                ['({EXP\d+})
                    \s* \~ \s*
                    ({EXP\d+})',
                   '\1/following-sibling::*/self::\2',
                   'EXP',
-                  true ],
+                  true],
                 // {} > {}
-                [ '({EXP\d+})
+                ['({EXP\d+})
                    \s* > \s*
                    ({EXP\d+})',
                   '\1/\2',
                   'EXP',
-                  true ],
+                  true],
                 // {} {}
-                [ '({EXP\d+})
+                ['({EXP\d+})
                    \s+
                    ({EXP\d+})',
                   '\1//\2',
                   'EXP',
-                  true ],
+                  true],
                 // {}, {}
-                [ '({EXP\d+})
+                ['({EXP\d+})
                    \s* , \s*
                    ({EXP\d+})',
                   '\1|\2',
                   'EXP',
-                  true ]
+                  true]
         ];
 
         public static function xpath($css)
@@ -139,7 +139,7 @@ 
 
                 $xpath = \trim((string) $xpath);
                 $xpath = ".//$xpath";
-                $xpath = \str_replace('|', '|.//',   $xpath);
+                $xpath = \str_replace('|', '|.//', $xpath);
                 $xpath = \str_replace('.///', '/', $xpath);
 
                 return $xpath;

source/FluidXml/FluidHelper.php

Spacing +7 added lines, -7 removed lines

@@ -13,7 +13,7 @@ 
                 return $string && $string[0] === '<';
         }
 
-        public static function exportNode(\DOMDocument $dom, \DOMNode $node, $html = false): array|bool|string|null
+        public static function exportNode(\DOMDocument $dom, \DOMNode $node, $html = false): array | bool | string | null
         {
                 // $delegate = $html ? 'saveHTML' : 'saveXML';
                 // return $dom->$delegate($node);
@@ -25,7 +25,7 @@ 
                 return $dom->saveXML($node);
         }
 
-        public static function domdocumentToStringWithoutHeaders(\DOMDocument $dom, $html = false): bool|array|string|null
+        public static function domdocumentToStringWithoutHeaders(\DOMDocument $dom, $html = false): bool | array | string | null
         {
                 return static::exportNode($dom, $dom->documentElement, $html);
         }
@@ -53,20 +53,20 @@ 
                 $xml = '';
 
                 foreach ($nodes as $n) {
-                        $xml .= static::exportNode($dom, $n, $html) . PHP_EOL;
+                        $xml .= static::exportNode($dom, $n, $html).PHP_EOL;
                 }
 
                 return \rtrim($xml);
         }
 
-        public static function simplexmlToStringWithoutHeaders(\SimpleXMLElement $element, $html = false): bool|array|string|null
+        public static function simplexmlToStringWithoutHeaders(\SimpleXMLElement $element, $html = false): bool | array | string | null
         {
                 $dom = \dom_import_simplexml($element);
 
                 return static::exportNode($dom->ownerDocument, $dom, $html);
         }
 
-        public static function domdocumentToHtml($dom, $clone = true): array|string|null
+        public static function domdocumentToHtml($dom, $clone = true): array | string | null
         {
                 if ($clone) {
                         $dom = $dom->cloneNode(true);
@@ -95,7 +95,7 @@ 
                 $nodes = (new \DOMXPath($dom))->query($query);
 
                 foreach ($nodes as $n) {
-                        if (! \in_array($n->nodeName, $voids)) {
+                        if (!\in_array($n->nodeName, $voids)) {
                                 // If it is not a void/empty tag,
                                 // we need to leave the tag open.
                                 $n->appendChild(new \DOMProcessingInstruction('X-NOT-VOID'));
@@ -110,7 +110,7 @@ 
                 return $html;
         }
 
-        public static function domnodeToHtml(\DOMNode $node): array|string|null
+        public static function domnodeToHtml(\DOMNode $node): array | string | null
         {
                 $dom = new \DOMDocument();
                 $dom->formatOutput       = true;

source/FluidXml/FluidXml.php

Indentation +11 added lines, -11 removed lines

@@ -9,17 +9,17 @@ 
 class FluidXml implements FluidInterface
 {
         use FluidAliasesTrait,
-            FluidSaveTrait,
-            NewableTrait,
-            ReservedCallTrait,          // For compatibility with PHP 5.6.
-            ReservedCallStaticTrait;    // For compatibility with PHP 5.6.
+                FluidSaveTrait,
+                NewableTrait,
+                ReservedCallTrait,          // For compatibility with PHP 5.6.
+                ReservedCallStaticTrait;    // For compatibility with PHP 5.6.
 
         final public const ROOT_NODE = 'doc';
 
         private array $defaults = [ 'root'       => self::ROOT_NODE,
-                              'version'    => '1.0',
-                              'encoding'   => 'UTF-8',
-                              'stylesheet' => null ];
+                                'version'    => '1.0',
+                                'encoding'   => 'UTF-8',
+                                'stylesheet' => null ];
 
         private readonly \FluidXml\FluidDocument $document;
         private readonly \FluidXml\FluidInsertionHandler $handler;
@@ -63,7 +63,7 @@ 
 
                 // Now, we can further populate the DOM with any stylesheet or child.
                 $this->initStylesheet($options)
-                     ->initRoot($options);
+                        ->initRoot($options);
         }
 
         protected function mergeOptions(&$arguments): array
@@ -98,9 +98,9 @@ 
         {
                 if (! empty($options['stylesheet'])) {
                         $attrs = 'type="text/xsl" '
-                               . "encoding=\"{$options['encoding']}\" "
-                               . 'indent="yes" '
-                               . "href=\"{$options['stylesheet']}\"";
+                                . "encoding=\"{$options['encoding']}\" "
+                                . 'indent="yes" '
+                                . "href=\"{$options['stylesheet']}\"";
 
                         $stylesheet = new \DOMProcessingInstruction('xml-stylesheet', $attrs);
 

Spacing +20 added lines, -20 removed lines

@@ -11,15 +11,15 @@ 
         use FluidAliasesTrait,
             FluidSaveTrait,
             NewableTrait,
-            ReservedCallTrait,          // For compatibility with PHP 5.6.
-            ReservedCallStaticTrait;    // For compatibility with PHP 5.6.
+            ReservedCallTrait, // For compatibility with PHP 5.6.
+            ReservedCallStaticTrait; // For compatibility with PHP 5.6.
 
         final public const ROOT_NODE = 'doc';
 
-        private array $defaults = [ 'root'       => self::ROOT_NODE,
+        private array $defaults = ['root'       => self::ROOT_NODE,
                               'version'    => '1.0',
                               'encoding'   => 'UTF-8',
-                              'stylesheet' => null ];
+                              'stylesheet' => null];
 
         private readonly \FluidXml\FluidDocument $document;
         private readonly \FluidXml\FluidInsertionHandler $handler;
@@ -32,7 +32,7 @@ 
                 $document = \file_get_contents($file);
 
                 // file_get_contents() returns false in case of error.
-                if (! $document) {
+                if (!$document) {
                         throw new \Exception("File '$file' not accessible.");
                 }
 
@@ -96,7 +96,7 @@ 
 
         private function initStylesheet(&$options): static
         {
-                if (! empty($options['stylesheet'])) {
+                if (!empty($options['stylesheet'])) {
                         $attrs = 'type="text/xsl" '
                                . "encoding=\"{$options['encoding']}\" "
                                . 'indent="yes" '
@@ -116,7 +116,7 @@ 
 
         private function initRoot(&$options): static
         {
-                if (! empty($options['root'])) {
+                if (!empty($options['root'])) {
                         $this->appendSibling($options['root']);
                 }
 
@@ -144,7 +144,7 @@ 
                         $el = $this->document->dom;
                 }
 
-                return [ $el ];
+                return [$el];
         }
 
         public function __toString(): string
@@ -187,7 +187,7 @@ 
                 $namespaces = [];
 
                 if (\is_string($arguments[0])) {
-                        $args = [ $arguments[0], $arguments[1] ];
+                        $args = [$arguments[0], $arguments[1]];
 
                         if (isset($arguments[2])) {
                                 $args[] = $arguments[2];
@@ -206,19 +206,19 @@ 
                 return $this;
         }
 
-        public function query(...$query)                   { return $this->context()->query(...$query); }
+        public function query(...$query) { return $this->context()->query(...$query); }
         public function times($times, callable $fn = null) { return $this->context()->times($times, $fn); }
-        public function each(callable $fn)                 { return $this->context()->each($fn); }
-        public function map(callable $fn)                  { return $this->context()->map($fn); }
-        public function filter(callable $fn)               { return $this->context()->filter($fn); }
+        public function each(callable $fn) { return $this->context()->each($fn); }
+        public function map(callable $fn) { return $this->context()->map($fn); }
+        public function filter(callable $fn) { return $this->context()->filter($fn); }
         public function setAttribute($name, $value = null) { $this->context()->setAttribute($name, $value); return $this; }
-        public function setText($text)                     { $this->context()->setText($text);    return $this; }
-        public function addText($text)                     { $this->context()->addText($text);    return $this; }
-        public function setCdata($text)                    { $this->context()->setCdata($text);   return $this; }
-        public function addCdata($text)                    { $this->context()->addCdata($text);   return $this; }
-        public function setComment($text)                  { $this->context()->setComment($text); return $this; }
-        public function addComment($text)                  { $this->context()->addComment($text); return $this; }
-        public function remove(...$query)                  { $this->context()->remove(...$query); return $this; }
+        public function setText($text) { $this->context()->setText($text); return $this; }
+        public function addText($text) { $this->context()->addText($text); return $this; }
+        public function setCdata($text) { $this->context()->setCdata($text); return $this; }
+        public function addCdata($text) { $this->context()->addCdata($text); return $this; }
+        public function setComment($text) { $this->context()->setComment($text); return $this; }
+        public function addComment($text) { $this->context()->addComment($text); return $this; }
+        public function remove(...$query) { $this->context()->remove(...$query); return $this; }
 
         public function addChild($child, ...$optionals)
         {

source/FluidXml/FluidInsertionHandler.php

Spacing +12 added lines, -12 removed lines

@@ -10,7 +10,7 @@ 
         public function __construct(private $document)
         {
                 $this->dom        = $document->dom;
-                $this->namespaces =& $document->namespaces;
+                $this->namespaces = & $document->namespaces;
         }
 
         /**
@@ -35,7 +35,7 @@ 
                 // offers to the user and is the same of:
                 // 1. appending a child switching the context
                 // 2. setting the attributes over the new context.
-                if (! empty($attributes)) {
+                if (!empty($attributes)) {
                         $new_context->setAttribute($attributes);
                 }
 
@@ -52,8 +52,8 @@ 
 
         protected function handleOptionals($element, &$optionals): array
         {
-                if (! \is_array($element)) {
-                        $element = [ $element ];
+                if (!\is_array($element)) {
+                        $element = [$element];
                 }
 
                 $switch_context = false;
@@ -75,7 +75,7 @@ 
                         }
                 }
 
-                return [ $element, $attributes, $switch_context ];
+                return [$element, $attributes, $switch_context];
         }
 
 
@@ -105,7 +105,7 @@ 
 
         protected function recognizeStringMixed($k, $v)
         {
-                if (! \is_string($k)) {
+                if (!\is_string($k)) {
                         return;
                 }
 
@@ -117,7 +117,7 @@ 
                 }
 
                 if (\is_string($v) || $v === null) {
-                        if (! FluidHelper::isAnXmlString($v)) {
+                        if (!FluidHelper::isAnXmlString($v)) {
                                 return 'insertStringSimple';
                         }
                 } else {
@@ -219,8 +219,8 @@ 
 
         protected function attachNodes($parent, $nodes, $fn): array
         {
-                if (! \is_array($nodes) && ! $nodes instanceof \Traversable) {
-                        $nodes = [ $nodes ];
+                if (!\is_array($nodes) && !$nodes instanceof \Traversable) {
+                        $nodes = [$nodes];
                 }
 
                 $context = [];
@@ -272,7 +272,7 @@ 
                 $el = $this->createElement($k, $v);
                 $el = $fn($parent, $el);
 
-                return [ $el ];
+                return [$el];
         }
 
         /**
@@ -292,7 +292,7 @@ 
                 // they are supplied, so 'addChild' is the perfect operation.
                 $this->newContext($el)->addChild($v, ...$optionals);
 
-                return [ $el ];
+                return [$el];
         }
 
         /**
@@ -325,7 +325,7 @@ 
                 $el = $this->createElement($v);
                 $el = $fn($parent, $el);
 
-                return [ $el ];
+                return [$el];
         }
 
         protected function insertIntegerXml($parent, $k, $v, $fn): array

source/FluidXml/FluidNamespace.php

Indentation +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
         final public const MODE_EXPLICIT = 1;
 
         private array $config = [ self::ID   => '',
-                            self::URI  => '',
-                            self::MODE => self::MODE_EXPLICIT ];
+                                self::URI  => '',
+                                self::MODE => self::MODE_EXPLICIT ];
 
         public function __construct($id, $uri, $mode = 1)
         {

Spacing +6 added lines, -6 removed lines

@@ -4,16 +4,16 @@ 
 
 class FluidNamespace
 {
-        final public const ID   = 'id'  ;
-        final public const URI  = 'uri' ;
+        final public const ID   = 'id';
+        final public const URI  = 'uri';
         final public const MODE = 'mode';
 
         final public const MODE_IMPLICIT = 0;
         final public const MODE_EXPLICIT = 1;
 
-        private array $config = [ self::ID   => '',
+        private array $config = [self::ID   => '',
                             self::URI  => '',
-                            self::MODE => self::MODE_EXPLICIT ];
+                            self::MODE => self::MODE_EXPLICIT];
 
         public function __construct($id, $uri, $mode = 1)
         {
@@ -41,7 +41,7 @@ 
         {
                 $id = $this->id();
 
-                if (! empty($id)) {
+                if (!empty($id)) {
                         $id .= ':';
                 }
 
@@ -52,7 +52,7 @@ 
                 $nodes = \explode('/', (string) $xpath);
 
                 foreach ($nodes as $node) {
-                        if (! empty($node)) {
+                        if (!empty($node)) {
                                 // An XPath query can have multiple slashes.
                                 // Example: //target
                                 $new_xpath .= "{$id}{$node}";