servo-php / fluidxml

source/FluidXml/FluidContext.php

Spacing +14 added lines, -14 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.');
                         }
 
@@ -212,14 +212,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
@@ -234,7 +234,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
@@ -255,7 +255,7 @@ 
                 if (\is_array($name)) {
                         $attrs = $name;
                 } else {
-                        $attrs = [ $name => $value ];
+                        $attrs = [$name => $value];
                 }
 
                 foreach ($this->nodes as $n) {
@@ -288,7 +288,7 @@ 
 
         public function getText($glue = PHP_EOL)
         {
-                return implode($glue, $this->map(function ($i, $n) { return $n->textContent; }));
+                return implode($glue, $this->map(function($i, $n) { return $n->textContent; }));
         }
 
         public function setText($text)
@@ -412,10 +412,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;
                 }
 
@@ -433,7 +433,7 @@ 
                                 $found = ($r === $u) || $found;
                         }
 
-                        if (! $found) {
+                        if (!$found) {
                                 $set[] = $r;
                         }
                 }

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 = null)               { return $text ? $this->setText($text) : $this->getText(); }
-        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 = null) { return $text ? $this->setText($text) : $this->getText(); }
+        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 = null)               { return $text ? $this->setText($text) : $this->getText(); }
-        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 = null)
+        {
+return $text ? $this->setText($text) : $this->getText(); }
+        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/FluidXml.php

Spacing +21 added lines, -21 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,20 +206,20 @@ 
                 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 getText($glue = PHP_EOL)           { return $this->context()->getText($glue); }
-        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 getText($glue = PHP_EOL) { return $this->context()->getText($glue); }
+        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 +42 added lines, -14 removed lines

@@ -206,20 +206,48 @@
                 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 getText($glue = PHP_EOL)           { return $this->context()->getText($glue); }
-        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 getText($glue = PHP_EOL)
+        {
+return $this->context()->getText($glue); }
+        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)
         {