nipicks

weirdan · Apr 23, 2021 · e46df26 · e46df26
1 parent 934a2a9
commit e46df26
Show file tree

Hide file tree

Showing 17 changed files with 9 additions and 107 deletions.
diff --git a/src/ArrayToXml.php b/src/ArrayToXml.php
@@ -78,11 +78,9 @@ public static function convert(
 
     public function toXml(): string
     {
-        if ($this->addXmlDeclaration === false) {
-            return $this->document->saveXml($this->document->documentElement);
-        }
-
-        return $this->document->saveXML();
+        return $this->addXmlDeclaration
+            ? $this->document->saveXML()
+            : $this->document->saveXml($this->document->documentElement);
     }
 
     public function toDom(): DOMDocument
@@ -94,7 +92,7 @@ protected function ensureValidDomProperties(array $domProperties): void
     {
         foreach ($domProperties as $key => $value) {
             if (! property_exists($this->document, $key)) {
-                throw new Exception($key.' is not a valid property of DOMDocument');
+                throw new Exception("{$key} is not a valid property of DOMDocument");
             }
         }
     }
@@ -125,10 +123,7 @@ public function dropXmlDeclaration(): self
         return $this;
     }
 
-    /**
-     * @param mixed[]|mixed $value
-     */
-    private function convertElement(DOMElement $element, $value): void
+    protected function convertElement(DOMElement $element, mixed $value): void
     {
         $sequential = $this->isArrayAllKeySequential($value);
 
@@ -213,10 +208,7 @@ protected function addSequentialNode(DOMElement $element, $value): void
         $element->parentNode->appendChild($child);
     }
 
-    /**
-     * @return bool|mixed[]
-     */
-    protected function isArrayAllKeySequential(array | string $value): mixed
+    protected function isArrayAllKeySequential(array | string $value): bool
     {
         if (! is_array($value)) {
             return false;

diff --git a/tests/ArrayToXmlTest.php b/tests/ArrayToXmlTest.php
@@ -8,8 +8,7 @@ class ArrayToXmlTest extends TestCase
 {
     use MatchesSnapshots;
 
-    /** @test array */
-    protected $testArray = [];
+    protected array $testArray = [];
 
     public function setUp(): void
     {
@@ -274,7 +273,7 @@ public function it_can_handle_values_set_as_cdata()
     }
 
     /** @test */
-    public function and_cdata_values_can_also_be_set_in_simplexmlelement_style()
+    public function and_cdata_values_can_also_be_set_in_simplexml_element_style()
     {
         $this->assertMatchesSnapshot(ArrayToXml::convert([
             'movie' => [
@@ -341,7 +340,7 @@ public function it_can_handle_values_set_as_mixed()
     }
 
     /** @test */
-    public function and_mixed_values_can_also_be_set_in_simplexmlelement_style()
+    public function and_mixed_values_can_also_be_set_in_simplexml_element_style()
     {
         $this->assertMatchesSnapshot(ArrayToXml::convert([
             'movie' => [

diff --git a/...o_be_set_in_simplexmlelement_style__1.txt → ..._be_set_in_simplexml_element_style__1.txt b/...o_be_set_in_simplexmlelement_style__1.txt → ..._be_set_in_simplexml_element_style__1.txt
diff --git a/...shots__/ArrayToXmlTest__and_cdata_values_can_also_be_set_in_simplexmlelement_style__1.php b/...shots__/ArrayToXmlTest__and_cdata_values_can_also_be_set_in_simplexmlelement_style__1.php
diff --git a/...o_be_set_in_simplexmlelement_style__1.txt → ..._be_set_in_simplexml_element_style__1.txt b/...o_be_set_in_simplexmlelement_style__1.txt → ..._be_set_in_simplexml_element_style__1.txt
diff --git a/...shots__/ArrayToXmlTest__and_mixed_values_can_also_be_set_in_simplexmlelement_style__1.php b/...shots__/ArrayToXmlTest__and_mixed_values_can_also_be_set_in_simplexmlelement_style__1.php
diff --git a/tests/__snapshots__/ArrayToXmlTest__it_accepts_an_xml_standalone_value__1.php b/tests/__snapshots__/ArrayToXmlTest__it_accepts_an_xml_standalone_value__1.php
diff --git a/tests/__snapshots__/ArrayToXmlTest__it_accepts_an_xml_version__1.php b/tests/__snapshots__/ArrayToXmlTest__it_accepts_an_xml_version__1.php
diff --git a/tests/__snapshots__/ArrayToXmlTest__it_can_drop_xml_declaration__1.php b/tests/__snapshots__/ArrayToXmlTest__it_can_drop_xml_declaration__1.php
diff --git a/tests/__snapshots__/ArrayToXmlTest__it_can_handle_custom_keys__1.php b/tests/__snapshots__/ArrayToXmlTest__it_can_handle_custom_keys__1.php
diff --git a/...__snapshots__/ArrayToXmlTest__it_can_handle_custom_keys_containing_colon_character__1.php b/...__snapshots__/ArrayToXmlTest__it_can_handle_custom_keys_containing_colon_character__1.php
diff --git a/tests/__snapshots__/ArrayToXmlTest__it_can_handle_numeric_keys__1.php b/tests/__snapshots__/ArrayToXmlTest__it_can_handle_numeric_keys__1.php
diff --git a/tests/__snapshots__/ArrayToXmlTest__it_can_handle_numeric_keys__1.xml b/tests/__snapshots__/ArrayToXmlTest__it_can_handle_numeric_keys__1.xml
diff --git a/tests/__snapshots__/ArrayToXmlTest__it_can_handle_numeric_keys__1__1.php b/tests/__snapshots__/ArrayToXmlTest__it_can_handle_numeric_keys__1__1.php
diff --git a/tests/__snapshots__/ArrayToXmlTest__it_can_handle_values_set_as_cdata__1.php b/tests/__snapshots__/ArrayToXmlTest__it_can_handle_values_set_as_cdata__1.php
diff --git a/tests/__snapshots__/ArrayToXmlTest__it_can_handle_values_set_as_mixed__1.php b/tests/__snapshots__/ArrayToXmlTest__it_can_handle_values_set_as_mixed__1.php
diff --git a/...__/ArrayToXmlTest__it_doesnt_pollute_attributes_in_collection_and_sequential_nodes__1.php b/...__/ArrayToXmlTest__it_doesnt_pollute_attributes_in_collection_and_sequential_nodes__1.php