servo-php / fluidxml

source/FluidXml/FluidInsertionHandler.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
         private $dom;
         private $namespaces;
 
+        /**
+         * @param FluidDocument $document
+         */
         public function __construct($document)
         {
                 $this->document   = $document;

Spacing +12 added lines, -12 removed lines

@@ -12,7 +12,7 @@ 
         {
                 $this->document   = $document;
                 $this->dom        = $document->dom;
-                $this->namespaces =& $document->namespaces;
+                $this->namespaces = & $document->namespaces;
         }
 
         public function insertElement(&$nodes, $element, &$optionals, $fn, $orig_context)
@@ -34,7 +34,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);
                 }
 
@@ -48,8 +48,8 @@ 
 
         protected function handleOptionals($element, &$optionals)
         {
-                if (! \is_array($element)) {
-                        $element = [ $element ];
+                if (!\is_array($element)) {
+                        $element = [$element];
                 }
 
                 $switch_context = false;
@@ -71,7 +71,7 @@ 
                         }
                 }
 
-                return [ $element, $attributes, $switch_context ];
+                return [$element, $attributes, $switch_context];
         }
 
 
@@ -98,7 +98,7 @@ 
 
         protected function recognizeStringMixed($k, $v)
         {
-                if (! \is_string($k)) {
+                if (!\is_string($k)) {
                         return;
                 }
 
@@ -110,7 +110,7 @@ 
                 }
 
                 if (\is_string($v) || $v === null) {
-                        if (! FluidHelper::isAnXmlString($v)) {
+                        if (!FluidHelper::isAnXmlString($v)) {
                                 return 'insertStringSimple';
                         }
                 } else {
@@ -209,8 +209,8 @@ 
 
         protected function attachNodes($parent, $nodes, $fn)
         {
-                if (! \is_array($nodes) && ! $nodes instanceof \Traversable) {
-                        $nodes = [ $nodes ];
+                if (!\is_array($nodes) && !$nodes instanceof \Traversable) {
+                        $nodes = [$nodes];
                 }
 
                 $context = [];
@@ -259,7 +259,7 @@ 
                 $el = $this->createElement($k, $v);
                 $el = $fn($parent, $el);
 
-                return [ $el ];
+                return [$el];
         }
 
         protected function insertStringMixed($parent, $k, $v, $fn, &$optionals)
@@ -276,7 +276,7 @@ 
                 // they are supplied, so 'addChild' is the perfect operation.
                 $this->newContext($el)->addChild($v, ...$optionals);
 
-                return [ $el ];
+                return [$el];
         }
 
         protected function insertIntegerArray($parent, $k, $v, $fn, &$optionals)
@@ -303,7 +303,7 @@ 
                 $el = $this->createElement($v);
                 $el = $fn($parent, $el);
 
-                return [ $el ];
+                return [$el];
         }
 
         protected function insertIntegerXml($parent, $k, $v, $fn)

source/FluidXml/FluidHelper.php

Indentation +16 added lines, -16 removed lines

@@ -76,22 +76,22 @@
                 }
 
                 $voids = ['area',
-                          'base',
-                          'br',
-                          'col',
-                          'colgroup',
-                          'command',
-                          'embed',
-                          'hr',
-                          'img',
-                          'input',
-                          'keygen',
-                          'link',
-                          'meta',
-                          'param',
-                          'source',
-                          'track',
-                          'wbr'];
+                                'base',
+                                'br',
+                                'col',
+                                'colgroup',
+                                'command',
+                                'embed',
+                                'hr',
+                                'img',
+                                'input',
+                                'keygen',
+                                'link',
+                                'meta',
+                                'param',
+                                'source',
+                                'track',
+                                'wbr'];
 
                 // Every empty node. There is no reason to match nodes with content inside.
                 $query = '//*[not(node())]';

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
                 $xml = '';
 
                 foreach ($nodes as $n) {
-                        $xml .= static::exportNode($dom, $n, $html) . PHP_EOL;
+                        $xml .= static::exportNode($dom, $n, $html).PHP_EOL;
                 }
 
                 return \rtrim($xml);
@@ -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'));

source/FluidXml/FluidNamespace.php

Indentation +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
         const MODE_EXPLICIT = 1;
 
         private $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
 {
-        const ID   = 'id'  ;
-        const URI  = 'uri' ;
+        const ID   = 'id';
+        const URI  = 'uri';
         const MODE = 'mode';
 
         const MODE_IMPLICIT = 0;
         const MODE_EXPLICIT = 1;
 
-        private $config = [ self::ID   => '',
+        private $config = [self::ID   => '',
                             self::URI  => '',
-                            self::MODE => self::MODE_EXPLICIT ];
+                            self::MODE => self::MODE_EXPLICIT];
 
         public function __construct($id, $uri, $mode = 1)
         {
@@ -51,7 +51,7 @@ 
         {
                 $id = $this->id();
 
-                if (! empty($id)) {
+                if (!empty($id)) {
                         $id .= ':';
                 }
 
@@ -62,7 +62,7 @@ 
                 $nodes = \explode('/', $xpath);
 
                 foreach ($nodes as $node) {
-                        if (! empty($node)) {
+                        if (!empty($node)) {
                                 // An XPath query can have multiple slashes.
                                 // Example: //target
                                 $new_xpath .= "{$id}{$node}";

source/FluidXml/FluidSaveTrait.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
         {
                 $status = \file_put_contents($file, $this->xml($strip));
 
-                if (! $status) {
+                if (!$status) {
                         throw new \Exception("The file '$file' is not writable.");
                 }
 

source/FluidXml.php

Upper-Lower-Casing +15 added lines, -15 removed lines

@@ -38,22 +38,22 @@
 $ds = \DIRECTORY_SEPARATOR;
 
 // First of all.
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidInterface.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidAliasesTrait.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidSaveTrait.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}NewableTrait.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}ReservedCallStaticTrait.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}ReservedCallTrait.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}FluidInterface.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}FluidAliasesTrait.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}FluidSaveTrait.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}NewableTrait.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}ReservedCallStaticTrait.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}ReservedCallTrait.php";
 
 // All.
-require_once __DIR__ . "{$ds}FluidXml{$ds}CssTranslator.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidContext.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidDocument.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidHelper.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidInsertionHandler.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidNamespace.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidRepeater.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidXml.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}CssTranslator.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}FluidContext.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}FluidDocument.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}FluidHelper.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}FluidInsertionHandler.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}FluidNamespace.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}FluidRepeater.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}FluidXml.php";
 
 // After of all.
-require_once __DIR__ . "{$ds}FluidXml{$ds}fluid.php";
+require_once __DIR__ . "{$ds}fluidxml{$ds}fluid.php";

Spacing +15 added lines, -15 removed lines

@@ -38,22 +38,22 @@
 $ds = \DIRECTORY_SEPARATOR;
 
 // First of all.
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidInterface.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidAliasesTrait.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidSaveTrait.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}NewableTrait.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}ReservedCallStaticTrait.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}ReservedCallTrait.php";
+require_once __DIR__."{$ds}FluidXml{$ds}FluidInterface.php";
+require_once __DIR__."{$ds}FluidXml{$ds}FluidAliasesTrait.php";
+require_once __DIR__."{$ds}FluidXml{$ds}FluidSaveTrait.php";
+require_once __DIR__."{$ds}FluidXml{$ds}NewableTrait.php";
+require_once __DIR__."{$ds}FluidXml{$ds}ReservedCallStaticTrait.php";
+require_once __DIR__."{$ds}FluidXml{$ds}ReservedCallTrait.php";
 
 // All.
-require_once __DIR__ . "{$ds}FluidXml{$ds}CssTranslator.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidContext.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidDocument.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidHelper.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidInsertionHandler.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidNamespace.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidRepeater.php";
-require_once __DIR__ . "{$ds}FluidXml{$ds}FluidXml.php";
+require_once __DIR__."{$ds}FluidXml{$ds}CssTranslator.php";
+require_once __DIR__."{$ds}FluidXml{$ds}FluidContext.php";
+require_once __DIR__."{$ds}FluidXml{$ds}FluidDocument.php";
+require_once __DIR__."{$ds}FluidXml{$ds}FluidHelper.php";
+require_once __DIR__."{$ds}FluidXml{$ds}FluidInsertionHandler.php";
+require_once __DIR__."{$ds}FluidXml{$ds}FluidNamespace.php";
+require_once __DIR__."{$ds}FluidXml{$ds}FluidRepeater.php";
+require_once __DIR__."{$ds}FluidXml{$ds}FluidXml.php";
 
 // After of all.
-require_once __DIR__ . "{$ds}FluidXml{$ds}fluid.php";
+require_once __DIR__."{$ds}FluidXml{$ds}fluid.php";

source/FluidXml/FluidAliasesTrait.php

Spacing +8 added lines, -8 removed lines

@@ -4,15 +4,15 @@
 
 trait FluidAliasesTrait
 {
-        public function size()                           { return $this->length(); }
-        public function __invoke(...$query)              { return $this->query(...$query); }
-        public function add($child, ...$optionals)       { return $this->addChild($child, ...$optionals); }
+        public function size() { return $this->length(); }
+        public function __invoke(...$query) { return $this->query(...$query); }
+        public function add($child, ...$optionals) { return $this->addChild($child, ...$optionals); }
         public function prepend($sibling, ...$optionals) { return $this->prependSibling($sibling, ...$optionals); }
-        public function append($sibling, ...$optionals)  { return $this->appendSibling($sibling, ...$optionals); }
-        public function attr($name, $value = null)       { return $this->setAttribute($name, $value); }
-        public function text($text)                      { return $this->setText($text); }
-        public function cdata($text)                     { return $this->setCdata($text); }
-        public function comment($text)                   { return $this->setComment($text); }
+        public function append($sibling, ...$optionals) { return $this->appendSibling($sibling, ...$optionals); }
+        public function attr($name, $value = null) { return $this->setAttribute($name, $value); }
+        public function text($text) { return $this->setText($text); }
+        public function cdata($text) { return $this->setCdata($text); }
+        public function comment($text) { return $this->setComment($text); }
         abstract public function length();
         abstract public function query(...$query);
         abstract public function addChild($child, ...$optionals);

Braces +27 added lines, -9 removed lines

@@ -4,15 +4,33 @@
 
 trait FluidAliasesTrait
 {
-        public function size()                           { return $this->length(); }
-        public function __invoke(...$query)              { return $this->query(...$query); }
-        public function add($child, ...$optionals)       { return $this->addChild($child, ...$optionals); }
-        public function prepend($sibling, ...$optionals) { return $this->prependSibling($sibling, ...$optionals); }
-        public function append($sibling, ...$optionals)  { return $this->appendSibling($sibling, ...$optionals); }
-        public function attr($name, $value = null)       { return $this->setAttribute($name, $value); }
-        public function text($text)                      { return $this->setText($text); }
-        public function cdata($text)                     { return $this->setCdata($text); }
-        public function comment($text)                   { return $this->setComment($text); }
+        public function size()
+        {
+return $this->length(); }
+        public function __invoke(...$query)
+        {
+return $this->query(...$query); }
+        public function add($child, ...$optionals)
+        {
+return $this->addChild($child, ...$optionals); }
+        public function prepend($sibling, ...$optionals)
+        {
+return $this->prependSibling($sibling, ...$optionals); }
+        public function append($sibling, ...$optionals)
+        {
+return $this->appendSibling($sibling, ...$optionals); }
+        public function attr($name, $value = null)
+        {
+return $this->setAttribute($name, $value); }
+        public function text($text)
+        {
+return $this->setText($text); }
+        public function cdata($text)
+        {
+return $this->setCdata($text); }
+        public function comment($text)
+        {
+return $this->setComment($text); }
         abstract public function length();
         abstract public function query(...$query);
         abstract public function addChild($child, ...$optionals);

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;    // For compatibility with PHP 5.6.
+                FluidSaveTrait,
+                NewableTrait,
+                ReservedCallTrait,          // For compatibility with PHP 5.6.
+                ReservedCallStaticTrait;    // For compatibility with PHP 5.6.
 
         private $document;
         private $handler;

Spacing +13 added lines, -13 removed lines

@@ -10,8 +10,8 @@ 
         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.
 
         private $document;
         private $handler;
@@ -23,14 +23,14 @@ 
                 $this->document = $document;
                 $this->handler  = $handler;
 
-                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.');
                         }
 
@@ -199,14 +199,14 @@ 
         // addChild($child, $value?, $attributes? = [], $switchContext? = false)
         public function addChild($child, ...$optionals)
         {
-                return $this->handler->insertElement($this->nodes, $child, $optionals, function ($parent, $element) {
+                return $this->handler->insertElement($this->nodes, $child, $optionals, function($parent, $element) {
                         return $parent->appendChild($element);
                 }, $this);
         }
 
         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
@@ -221,7 +221,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
@@ -242,7 +242,7 @@ 
                 if (\is_array($name)) {
                         $attrs = $name;
                 } else {
-                        $attrs = [ $name => $value ];
+                        $attrs = [$name => $value];
                 }
 
                 foreach ($this->nodes as $n) {
@@ -394,10 +394,10 @@ 
 
         protected function resolveQuery($query)
         {
-                if ( $query === '.'
+                if ($query === '.'
                      || $query[0] === '/'
-                     || ( $query[0] === '.' && $query[1] === '/' )
-                     || ( $query[0] === '.' && $query[1] === '.' ) ) {
+                     || ($query[0] === '.' && $query[1] === '/')
+                     || ($query[0] === '.' && $query[1] === '.')) {
                         return $query;
                 }
 
@@ -415,7 +415,7 @@ 
                                 $found = ($r === $u) || $found;
                         }
 
-                        if (! $found) {
+                        if (!$found) {
                                 $set[] = $r;
                         }
                 }

source/FluidXml/FluidXml.php

Indentation +11 added lines, -11 removed lines

@@ -8,17 +8,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.
 
         const ROOT_NODE = 'doc';
 
         private $defaults = [ 'root'       => self::ROOT_NODE,
-                              'version'    => '1.0',
-                              'encoding'   => 'UTF-8',
-                              'stylesheet' => null ];
+                                'version'    => '1.0',
+                                'encoding'   => 'UTF-8',
+                                'stylesheet' => null ];
 
         private $document;
         private $handler;
@@ -62,7 +62,7 @@ 
 
                 // Now, we can further populate the DOM with any stylesheet or child.
                 $this->initStylesheet($options)
-                     ->initRoot($options);
+                        ->initRoot($options);
         }
 
         protected function mergeOptions(&$arguments)
@@ -97,9 +97,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.
 
         const ROOT_NODE = 'doc';
 
-        private $defaults = [ 'root'       => self::ROOT_NODE,
+        private $defaults = ['root'       => self::ROOT_NODE,
                               'version'    => '1.0',
                               'encoding'   => 'UTF-8',
-                              'stylesheet' => null ];
+                              'stylesheet' => null];
 
         private $document;
         private $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)
         {
-                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)
         {
-                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()
@@ -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)
         {

Braces +39 added lines, -13 removed lines

@@ -206,19 +206,45 @@
                 return $this;
         }
 
-        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 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 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 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 addChild($child, ...$optionals)
         {

source/FluidXml/CssTranslator.php

Indentation +48 added lines, -48 removed lines

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

Spacing +33 added lines, -33 removed lines

@@ -7,32 +7,32 @@ 
         const TOKEN = '/{([[:alpha:]]+)(\d+)}/i';
         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($xpath);
                 $xpath = ".//$xpath";
-                $xpath = \str_replace('|', '|.//',   $xpath);
+                $xpath = \str_replace('|', '|.//', $xpath);
                 $xpath = \str_replace('.///', '/', $xpath);
 
                 return $xpath;