Applied CS changes from sabre/cs

Author: evert

.travis.yml

@@ -17,6 +17,6 @@ cache: vendor
 
 script:
   - ./bin/phpunit --configuration tests/phpunit.xml.dist
-  - ./bin/sabre-cs-fixer fix lib/ --dry-run --diff
+  - ./bin/sabre-cs-fixer fix . --dry-run --diff
 
 before_script: composer install

lib/Element.php

@@ -2,8 +2,6 @@
 
 namespace Sabre\Xml;
 
-use XMLReader;
-
 /**
  * This is the XML element interface.
  *

lib/Element/Base.php

@@ -89,4 +89,3 @@ static function xmlDeserialize(Xml\Reader $reader) {
     }
 
 }
-

lib/Element/Cdata.php

@@ -2,9 +2,7 @@
 
 namespace Sabre\Xml\Element;
 
-use
-    Sabre\Xml,
-    LogicException;
+use Sabre\Xml;
 
 /**
  * CDATA element.

lib/Element/Elements.php

@@ -72,7 +72,7 @@ function __construct(array $value = []) {
      */
     function xmlSerialize(Xml\Writer $writer) {
 
-        foreach($this->value as $val) {
+        foreach ($this->value as $val) {
             $writer->writeElement($val);
         }
 
@@ -116,12 +116,11 @@ static function xmlDeserialize(Xml\Reader $reader) {
                 $values[] = $reader->getClark();
             }
 
-        } while($reader->depth >= $currentDepth && $reader->next());
+        } while ($reader->depth >= $currentDepth && $reader->next());
 
         $reader->next();
         return $values;
 
     }
 
 }
-

lib/Element/KeyValue.php

@@ -10,7 +10,7 @@
  *
  * Attributes will be removed, and duplicate child elements are discarded.
  * Complex values within the elements will be parsed by the 'standard' parser.
-
+ *
  * For example, KeyValue will parse:
  *
  * <?xml version="1.0"?>
@@ -129,4 +129,3 @@ static function xmlDeserialize(Xml\Reader $reader) {
     }
 
 }
-

lib/Element/Uri.php

@@ -3,7 +3,6 @@
 namespace Sabre\Xml\Element;
 
 use Sabre\Xml;
-use LogicException;
 
 /**
  * Uri element.

lib/Element/XmlFragment.php

@@ -70,22 +70,22 @@ function xmlSerialize(Writer $writer) {
 
         $elementNamespace = null;
 
-        while($reader->read()) {
+        while ($reader->read()) {
 
             if ($reader->depth < 1) {
                 // Skipping the root node.
                 continue;
             }
 
-            switch($reader->nodeType) {
+            switch ($reader->nodeType) {
 
                 case Reader::ELEMENT :
                     $writer->startElement(
                         $reader->getClark()
                     );
                     $empty = $reader->isEmptyElement;
                     while ($reader->moveToNextAttribute()) {
-                        switch($reader->namespaceURI) {
+                        switch ($reader->namespaceURI) {
                             case '' :
                                 $writer->writeAttribute($reader->localName, $reader->value);
                                 break;

lib/Reader.php

@@ -62,7 +62,7 @@ function parse() {
         // choice. See:
         //
         // https://bugs.php.net/bug.php?id=64230
-        while($this->nodeType !== self::ELEMENT && @$this->read()) {
+        while ($this->nodeType !== self::ELEMENT && @$this->read()) {
             // noop
         }
         $result = $this->parseCurrentElement();
@@ -119,9 +119,9 @@ function parseInnerTree(array $elementMap = null) {
         // https://bugs.php.net/bug.php?id=64230
         if (!@$this->read()) return false;
 
-        while(true) {
+        while (true) {
 
-            switch($this->nodeType) {
+            switch ($this->nodeType) {
                 case self::ELEMENT :
                     $elements[] = $this->parseCurrentElement();
                     break;
@@ -147,7 +147,7 @@ function parseInnerTree(array $elementMap = null) {
         if (!is_null($elementMap)) {
             $this->popContext();
         }
-        return ($elements?$elements:$text);
+        return ($elements ? $elements : $text);
 
     }
 
@@ -161,9 +161,9 @@ function readText() {
         $result = '';
         $previousDepth = $this->depth;
 
-        while($this->read() && $this->depth != $previousDepth) {
+        while ($this->read() && $this->depth != $previousDepth) {
             if (in_array($this->nodeType, [XMLReader::TEXT, XMLReader::CDATA, XMLReader::WHITESPACE])) {
-                $result.=$this->value;
+                $result .= $this->value;
             }
         }
         return $result;
@@ -193,25 +193,25 @@ function parseCurrentElement() {
         if (array_key_exists($name, $this->elementMap)) {
             $deserializer = $this->elementMap[$name];
             if (is_subclass_of($deserializer, 'Sabre\\Xml\\XmlDeserializable')) {
-                $value = call_user_func( [ $deserializer, 'xmlDeserialize' ], $this);
+                $value = call_user_func([ $deserializer, 'xmlDeserialize' ], $this);
             } elseif (is_callable($deserializer)) {
                 $value = call_user_func($deserializer, $this);
             } else {
                 $type = gettype($deserializer);
-                if ($type==='string') {
-                    $type.=' (' . $deserializer . ')';
-                } elseif ($type==='object') {
-                    $type.=' (' . get_class($deserializer) . ')';
+                if ($type === 'string') {
+                    $type .= ' (' . $deserializer . ')';
+                } elseif ($type === 'object') {
+                    $type .= ' (' . get_class($deserializer) . ')';
                 }
-                throw new \LogicException('Could not use this type as a deserializer: ' . $type );
+                throw new \LogicException('Could not use this type as a deserializer: ' . $type);
             }
         } else {
             $value = Element\Base::xmlDeserialize($this);
         }
 
         return [
-            'name' => $name,
-            'value' => $value,
+            'name'       => $name,
+            'value'      => $value,
             'attributes' => $attributes,
         ];
     }
@@ -230,7 +230,7 @@ function parseAttributes() {
 
         $attributes = [];
 
-        while($this->moveToNextAttribute()) {
+        while ($this->moveToNextAttribute()) {
             if ($this->namespaceURI) {
 
                 // Ignoring 'xmlns', it doesn't make any sense.

lib/Service.php

@@ -76,7 +76,7 @@ function getWriter() {
      *
      * The $rootElementName is specified by reference and will be populated
      * with the root element name of the document.
-
+     *
      * @param string|resource $input
      * @param string|null $contextUri
      * @param string|null $rootElementName
@@ -178,7 +178,7 @@ function write($rootElementName, $value, $contextUri = null) {
      */
     static function parseClarkNotation($str) {
 
-        if (!preg_match('/^{([^}]*)}(.*)$/',$str,$matches)) {
+        if (!preg_match('/^{([^}]*)}(.*)$/', $str, $matches)) {
             throw new \InvalidArgumentException('\'' . $str . '\' is not a valid clark-notation formatted string');
         }