From dd3cc5bf47463e1807aab18f87e1b725b6beba28 Mon Sep 17 00:00:00 2001
From: Adrien Loison <aloison@box.com>
Date: Tue, 1 Sep 2015 11:04:15 -0700
Subject: [PATCH] Remove XML indentation

---
 .../Writer/ODS/Helper/FileSystemHelper.php    | 17 +---
 src/Spout/Writer/ODS/Helper/StyleHelper.php   | 80 +++++++++---------
 src/Spout/Writer/ODS/Internal/Worksheet.php   | 30 +++----
 .../Writer/XLSX/Helper/FileSystemHelper.php   |  9 +--
 .../XLSX/Helper/SharedStringsHelper.php       |  4 +-
 src/Spout/Writer/XLSX/Helper/StyleHelper.php  | 81 +++++++++----------
 src/Spout/Writer/XLSX/Internal/Worksheet.php  | 22 ++---
 7 files changed, 110 insertions(+), 133 deletions(-)

diff --git a/src/Spout/Writer/ODS/Helper/FileSystemHelper.php b/src/Spout/Writer/ODS/Helper/FileSystemHelper.php
index 1bb1674..09f068b 100644
--- a/src/Spout/Writer/ODS/Helper/FileSystemHelper.php
+++ b/src/Spout/Writer/ODS/Helper/FileSystemHelper.php
@@ -183,17 +183,12 @@ EOD;
         $contentXmlFileContents = <<<EOD
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <office:document-content office:version="1.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:msoxl="http://schemas.microsoft.com/office/excel/formula" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink">
-
 EOD;
 
         $contentXmlFileContents .= $styleHelper->getContentXmlFontFaceSectionContent();
         $contentXmlFileContents .= $styleHelper->getContentXmlAutomaticStylesSectionContent(count($worksheets));
 
-        $contentXmlFileContents .= <<<EOD
-    <office:body>
-        <office:spreadsheet>
-
-EOD;
+        $contentXmlFileContents .= '<office:body><office:spreadsheet>';
 
         $this->createFileWithContents($this->rootFolder, self::CONTENT_XML_FILE_NAME, $contentXmlFileContents);
 
@@ -203,19 +198,15 @@ EOD;
 
         foreach ($worksheets as $worksheet) {
             // write the "<table:table>" node, with the final sheet's name
-            fwrite($contentXmlHandle, $worksheet->getTableElementStartAsString() . PHP_EOL);
+            fwrite($contentXmlHandle, $worksheet->getTableElementStartAsString());
 
             $worksheetFilePath = $worksheet->getWorksheetFilePath();
             $this->copyFileContentsToTarget($worksheetFilePath, $contentXmlHandle);
 
-            fwrite($contentXmlHandle, '</table:table>' . PHP_EOL);
+            fwrite($contentXmlHandle, '</table:table>');
         }
 
-        $contentXmlFileContents = <<<EOD
-        </office:spreadsheet>
-    </office:body>
-</office:document-content>
-EOD;
+        $contentXmlFileContents = '</office:spreadsheet></office:body></office:document-content>';
 
         fwrite($contentXmlHandle, $contentXmlFileContents);
         fclose($contentXmlHandle);
diff --git a/src/Spout/Writer/ODS/Helper/StyleHelper.php b/src/Spout/Writer/ODS/Helper/StyleHelper.php
index f5f9de8..f8b0c4d 100644
--- a/src/Spout/Writer/ODS/Helper/StyleHelper.php
+++ b/src/Spout/Writer/ODS/Helper/StyleHelper.php
@@ -47,7 +47,6 @@ class StyleHelper extends AbstractStyleHelper
         $content = <<<EOD
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <office:document-styles office:version="1.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:msoxl="http://schemas.microsoft.com/office/excel/formula" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink">
-
 EOD;
 
         $content .= $this->getFontFaceSectionContent();
@@ -69,11 +68,11 @@ EOD;
      */
     protected function getFontFaceSectionContent()
     {
-        $content = '<office:font-face-decls>' . PHP_EOL;
+        $content = '<office:font-face-decls>';
         foreach ($this->getUsedFonts() as $fontName) {
-            $content .= '    <style:font-face style:name="' . $fontName . '" svg:font-family="' . $fontName . '"/>' . PHP_EOL;
+            $content .= '<style:font-face style:name="' . $fontName . '" svg:font-family="' . $fontName . '"/>';
         }
-        $content .= '</office:font-face-decls>' . PHP_EOL;
+        $content .= '</office:font-face-decls>';
 
         return $content;
     }
@@ -99,7 +98,6 @@ EOD;
                                style:font-name="{$defaultStyle->getFontName()}" style:font-name-asian="{$defaultStyle->getFontName()}" style:font-name-complex="{$defaultStyle->getFontName()}"/>
     </style:style>
 </office:styles>
-
 EOD;
     }
 
@@ -111,20 +109,19 @@ EOD;
      */
     protected function getAutomaticStylesSectionContent($numWorksheets)
     {
-        $content = '<office:automatic-styles>' . PHP_EOL;
+        $content = '<office:automatic-styles>';
 
         for ($i = 1; $i <= $numWorksheets; $i++) {
             $content .= <<<EOD
-    <style:page-layout style:name="pm$i">
-        <style:page-layout-properties style:first-page-number="continue" style:print="objects charts drawings" style:table-centering="none"/>
-        <style:header-style/>
-        <style:footer-style/>
-    </style:page-layout>
-
+<style:page-layout style:name="pm$i">
+    <style:page-layout-properties style:first-page-number="continue" style:print="objects charts drawings" style:table-centering="none"/>
+    <style:header-style/>
+    <style:footer-style/>
+</style:page-layout>
 EOD;
         }
 
-        $content .= '</office:automatic-styles>' . PHP_EOL;
+        $content .= '</office:automatic-styles>';
 
         return $content;
     }
@@ -137,21 +134,20 @@ EOD;
      */
     protected function getMasterStylesSectionContent($numWorksheets)
     {
-        $content = '<office:master-styles>' . PHP_EOL;
+        $content = '<office:master-styles>';
 
         for ($i = 1; $i <= $numWorksheets; $i++) {
             $content .= <<<EOD
-    <style:master-page style:name="mp$i" style:page-layout-name="pm$i">
-        <style:header/>
-        <style:header-left style:display="false"/>
-        <style:footer/>
-        <style:footer-left style:display="false"/>
-    </style:master-page>
-
+<style:master-page style:name="mp$i" style:page-layout-name="pm$i">
+    <style:header/>
+    <style:header-left style:display="false"/>
+    <style:footer/>
+    <style:footer-left style:display="false"/>
+</style:master-page>
 EOD;
         }
 
-        $content .= '</office:master-styles>' . PHP_EOL;
+        $content .= '</office:master-styles>';
 
         return $content;
     }
@@ -164,11 +160,11 @@ EOD;
      */
     public function getContentXmlFontFaceSectionContent()
     {
-        $content = '<office:font-face-decls>' . PHP_EOL;
+        $content = '<office:font-face-decls>';
         foreach ($this->getUsedFonts() as $fontName) {
-            $content .= '    <style:font-face style:name="' . $fontName . '" svg:font-family="' . $fontName . '"/>' . PHP_EOL;
+            $content .= '<style:font-face style:name="' . $fontName . '" svg:font-family="' . $fontName . '"/>';
         }
-        $content .= '</office:font-face-decls>' . PHP_EOL;
+        $content .= '</office:font-face-decls>';
 
         return $content;
     }
@@ -181,32 +177,30 @@ EOD;
      */
     public function getContentXmlAutomaticStylesSectionContent($numWorksheets)
     {
-        $content = '<office:automatic-styles>' . PHP_EOL;
+        $content = '<office:automatic-styles>';
 
         foreach ($this->getRegisteredStyles() as $style) {
             $content .= $this->getStyleSectionContent($style);
         }
 
         $content .= <<<EOD
-    <style:style style:family="table-column" style:name="co1">
-        <style:table-column-properties fo:break-before="auto"/>
-    </style:style>
-    <style:style style:family="table-row" style:name="ro1">
-        <style:table-row-properties fo:break-before="auto" style:row-height="15pt" style:use-optimal-row-height="true"/>
-    </style:style>
-
+<style:style style:family="table-column" style:name="co1">
+    <style:table-column-properties fo:break-before="auto"/>
+</style:style>
+<style:style style:family="table-row" style:name="ro1">
+    <style:table-row-properties fo:break-before="auto" style:row-height="15pt" style:use-optimal-row-height="true"/>
+</style:style>
 EOD;
 
         for ($i = 1; $i <= $numWorksheets; $i++) {
             $content .= <<<EOD
-    <style:style style:family="table" style:master-page-name="mp$i" style:name="ta$i">
-        <style:table-properties style:writing-mode="lr-tb" table:display="true"/>
-    </style:style>
-
+<style:style style:family="table" style:master-page-name="mp$i" style:name="ta$i">
+    <style:table-properties style:writing-mode="lr-tb" table:display="true"/>
+</style:style>
 EOD;
         }
 
-        $content .= '</office:automatic-styles>' . PHP_EOL;
+        $content .= '</office:automatic-styles>';
 
         return $content;
     }
@@ -222,10 +216,10 @@ EOD;
         $defaultStyle = $this->getDefaultStyle();
         $styleIndex = $style->getId() + 1; // 1-based
 
-        $content = '    <style:style style:data-style-name="N0" style:family="table-cell" style:name="ce' . $styleIndex . '" style:parent-style-name="Default">' . PHP_EOL;
+        $content = '<style:style style:data-style-name="N0" style:family="table-cell" style:name="ce' . $styleIndex . '" style:parent-style-name="Default">';
 
         if ($style->shouldApplyFont()) {
-            $content .= '        <style:text-properties';
+            $content .= '<style:text-properties';
 
             $fontColor = $style->getFontColor();
             if ($fontColor !== $defaultStyle->getFontColor()) {
@@ -255,14 +249,14 @@ EOD;
                 $content .= ' style:text-line-through-style="solid"';
             }
 
-            $content .= '/>' . PHP_EOL;
+            $content .= '/>';
         }
 
         if ($style->shouldWrapText()) {
-            $content .= '        <style:table-cell-properties fo:wrap-option="wrap" style:vertical-align="automatic"/>' . PHP_EOL;
+            $content .= '<style:table-cell-properties fo:wrap-option="wrap" style:vertical-align="automatic"/>';
         }
 
-        $content .= '    </style:style>' . PHP_EOL;
+        $content .= '</style:style>';
 
         return $content;
     }
diff --git a/src/Spout/Writer/ODS/Internal/Worksheet.php b/src/Spout/Writer/ODS/Internal/Worksheet.php
index 9390030..a3d5d76 100644
--- a/src/Spout/Writer/ODS/Internal/Worksheet.php
+++ b/src/Spout/Writer/ODS/Internal/Worksheet.php
@@ -100,8 +100,8 @@ class Worksheet implements WorksheetInterface
         $escapedSheetName = $this->stringsEscaper->escape($this->externalSheet->getName());
         $tableStyleName = 'ta' . ($this->externalSheet->getIndex() + 1);
 
-        $tableElement  = '<table:table table:style-name="' . $tableStyleName . '" table:name="' . $escapedSheetName . '">' . PHP_EOL;
-        $tableElement .= '    <table:table-column table:default-cell-style-name="ce1" table:style-name="co1" table:number-columns-repeated="' . $this->maxNumColumns . '"/>';
+        $tableElement  = '<table:table table:style-name="' . $tableStyleName . '" table:name="' . $escapedSheetName . '">';
+        $tableElement .= '<table:table-column table:default-cell-style-name="ce1" table:style-name="co1" table:number-columns-repeated="' . $this->maxNumColumns . '"/>';
 
         return $tableElement;
     }
@@ -138,7 +138,7 @@ class Worksheet implements WorksheetInterface
         $cellsCount = count($dataRow);
         $this->maxNumColumns = max($this->maxNumColumns, $cellsCount);
 
-        $data = '    <table:table-row table:style-name="ro1">' . PHP_EOL;
+        $data = '<table:table-row table:style-name="ro1">';
 
         $currentCellIndex = 0;
         $nextCellIndex = 1;
@@ -156,7 +156,7 @@ class Worksheet implements WorksheetInterface
             $nextCellIndex++;
         }
 
-        $data .= '    </table:table-row>' . PHP_EOL;
+        $data .= '</table:table-row>';
 
         $wasWriteSuccessful = fwrite($this->sheetFilePointer, $data);
         if ($wasWriteSuccessful === false) {
@@ -178,31 +178,31 @@ class Worksheet implements WorksheetInterface
      */
     protected function getCellContent($cellValue, $styleIndex, $numTimesValueRepeated)
     {
-        $data = '        <table:table-cell table:style-name="ce' . $styleIndex . '"';
+        $data = '<table:table-cell table:style-name="ce' . $styleIndex . '"';
 
         if ($numTimesValueRepeated !== 1) {
             $data .= ' table:number-columns-repeated="' . $numTimesValueRepeated . '"';
         }
 
         if (CellHelper::isNonEmptyString($cellValue)) {
-            $data .= ' office:value-type="string" calcext:value-type="string">' . PHP_EOL;
+            $data .= ' office:value-type="string" calcext:value-type="string">';
 
             $cellValueLines = explode("\n", $cellValue);
             foreach ($cellValueLines as $cellValueLine) {
-                $data .= '            <text:p>' . $this->stringsEscaper->escape($cellValueLine) . '</text:p>' . PHP_EOL;
+                $data .= '<text:p>' . $this->stringsEscaper->escape($cellValueLine) . '</text:p>';
             }
 
-            $data .= '        </table:table-cell>' . PHP_EOL;
+            $data .= '</table:table-cell>';
         } else if (CellHelper::isBoolean($cellValue)) {
-            $data .= ' office:value-type="boolean" calcext:value-type="boolean" office:value="' . $cellValue . '">' . PHP_EOL;
-            $data .= '            <text:p>' . $cellValue . '</text:p>' . PHP_EOL;
-            $data .= '        </table:table-cell>' . PHP_EOL;
+            $data .= ' office:value-type="boolean" calcext:value-type="boolean" office:value="' . $cellValue . '">';
+            $data .= '<text:p>' . $cellValue . '</text:p>';
+            $data .= '</table:table-cell>';
         } else if (CellHelper::isNumeric($cellValue)) {
-            $data .= ' office:value-type="float" calcext:value-type="float" office:value="' . $cellValue . '">' . PHP_EOL;
-            $data .= '            <text:p>' . $cellValue . '</text:p>' . PHP_EOL;
-            $data .= '        </table:table-cell>' . PHP_EOL;
+            $data .= ' office:value-type="float" calcext:value-type="float" office:value="' . $cellValue . '">';
+            $data .= '<text:p>' . $cellValue . '</text:p>';
+            $data .= '</table:table-cell>';
         } else if (empty($cellValue)) {
-            $data .= '/>' . PHP_EOL;
+            $data .= '/>';
         } else {
             throw new InvalidArgumentException('Trying to add a value with an unsupported type: ' . gettype($cellValue));
         }
diff --git a/src/Spout/Writer/XLSX/Helper/FileSystemHelper.php b/src/Spout/Writer/XLSX/Helper/FileSystemHelper.php
index e84b68e..bf9e350 100644
--- a/src/Spout/Writer/XLSX/Helper/FileSystemHelper.php
+++ b/src/Spout/Writer/XLSX/Helper/FileSystemHelper.php
@@ -249,12 +249,11 @@ EOD;
     <Default ContentType="application/xml" Extension="xml"/>
     <Default ContentType="application/vnd.openxmlformats-package.relationships+xml" Extension="rels"/>
     <Override ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml" PartName="/xl/workbook.xml"/>
-
 EOD;
 
     /** @var Worksheet $worksheet */
     foreach ($worksheets as $worksheet) {
-        $contentTypesXmlFileContents .= '    <Override ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml" PartName="/xl/worksheets/sheet' . $worksheet->getId() . '.xml"/>' . PHP_EOL;
+        $contentTypesXmlFileContents .= '<Override ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml" PartName="/xl/worksheets/sheet' . $worksheet->getId() . '.xml"/>';
     }
 
     $contentTypesXmlFileContents .= <<<EOD
@@ -282,7 +281,6 @@ EOD;
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
     <sheets>
-
 EOD;
 
         /** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
@@ -292,7 +290,7 @@ EOD;
         foreach ($worksheets as $worksheet) {
             $worksheetName = $worksheet->getExternalSheet()->getName();
             $worksheetId = $worksheet->getId();
-            $workbookXmlFileContents .= '        <sheet name="' . $escaper->escape($worksheetName) . '" sheetId="' . $worksheetId . '" r:id="rIdSheet' . $worksheetId . '"/>' . PHP_EOL;
+            $workbookXmlFileContents .= '<sheet name="' . $escaper->escape($worksheetName) . '" sheetId="' . $worksheetId . '" r:id="rIdSheet' . $worksheetId . '"/>';
         }
 
         $workbookXmlFileContents .= <<<EOD
@@ -318,13 +316,12 @@ EOD;
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
     <Relationship Id="rIdStyles" Target="styles.xml" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"/>
     <Relationship Id="rIdSharedStrings" Target="sharedStrings.xml" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings"/>
-
 EOD;
 
         /** @var Worksheet $worksheet */
         foreach ($worksheets as $worksheet) {
             $worksheetId = $worksheet->getId();
-            $workbookRelsXmlFileContents .= '    <Relationship Id="rIdSheet' . $worksheetId . '" Target="worksheets/sheet' . $worksheetId . '.xml" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet"/>' . PHP_EOL;
+            $workbookRelsXmlFileContents .= '<Relationship Id="rIdSheet' . $worksheetId . '" Target="worksheets/sheet' . $worksheetId . '.xml" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet"/>';
         }
 
         $workbookRelsXmlFileContents .= '</Relationships>';
diff --git a/src/Spout/Writer/XLSX/Helper/SharedStringsHelper.php b/src/Spout/Writer/XLSX/Helper/SharedStringsHelper.php
index cc9573f..a17493a 100644
--- a/src/Spout/Writer/XLSX/Helper/SharedStringsHelper.php
+++ b/src/Spout/Writer/XLSX/Helper/SharedStringsHelper.php
@@ -45,7 +45,7 @@ EOD;
         $this->throwIfSharedStringsFilePointerIsNotAvailable();
 
         // the headers is split into different parts so that we can fseek and put in the correct count and uniqueCount later
-        $header = self::SHARED_STRINGS_XML_FILE_FIRST_PART_HEADER . ' ' . self::DEFAULT_STRINGS_COUNT_PART . '>' . PHP_EOL;
+        $header = self::SHARED_STRINGS_XML_FILE_FIRST_PART_HEADER . ' ' . self::DEFAULT_STRINGS_COUNT_PART . '>';
         fwrite($this->sharedStringsFilePointer, $header);
 
         /** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
@@ -74,7 +74,7 @@ EOD;
      */
     public function writeString($string)
     {
-        fwrite($this->sharedStringsFilePointer, '    <si><t xml:space="preserve">' . $this->stringsEscaper->escape($string) . '</t></si>' . PHP_EOL);
+        fwrite($this->sharedStringsFilePointer, '<si><t xml:space="preserve">' . $this->stringsEscaper->escape($string) . '</t></si>');
         $this->numSharedStrings++;
 
         // Shared string ID is zero-based
diff --git a/src/Spout/Writer/XLSX/Helper/StyleHelper.php b/src/Spout/Writer/XLSX/Helper/StyleHelper.php
index 06bbfc3..f3da2b5 100644
--- a/src/Spout/Writer/XLSX/Helper/StyleHelper.php
+++ b/src/Spout/Writer/XLSX/Helper/StyleHelper.php
@@ -23,7 +23,6 @@ class StyleHelper extends AbstractStyleHelper
         $content = <<<EOD
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
-
 EOD;
 
         $content .= $this->getFontsSectionContent();
@@ -47,33 +46,33 @@ EOD;
      */
     protected function getFontsSectionContent()
     {
-        $content = '    <fonts count="' . count($this->styleIdToStyleMappingTable) . '">' . PHP_EOL;
+        $content = '<fonts count="' . count($this->styleIdToStyleMappingTable) . '">';
 
         /** @var \Box\Spout\Writer\Style\Style $style */
         foreach ($this->getRegisteredStyles() as $style) {
-            $content .= '        <font>' . PHP_EOL;
+            $content .= '<font>';
 
-            $content .= '            <sz val="' . $style->getFontSize() . '"/>' . PHP_EOL;
-            $content .= '            <color rgb="' . Color::toARGB($style->getFontColor()) . '"/>' . PHP_EOL;
-            $content .= '            <name val="' . $style->getFontName() . '"/>' . PHP_EOL;
+            $content .= '<sz val="' . $style->getFontSize() . '"/>';
+            $content .= '<color rgb="' . Color::toARGB($style->getFontColor()) . '"/>';
+            $content .= '<name val="' . $style->getFontName() . '"/>';
 
             if ($style->isFontBold()) {
-                $content .= '            <b/>' . PHP_EOL;
+                $content .= '<b/>';
             }
             if ($style->isFontItalic()) {
-                $content .= '            <i/>' . PHP_EOL;
+                $content .= '<i/>';
             }
             if ($style->isFontUnderline()) {
-                $content .= '            <u/>' . PHP_EOL;
+                $content .= '<u/>';
             }
             if ($style->isFontStrikethrough()) {
-                $content .= '            <strike/>' . PHP_EOL;
+                $content .= '<strike/>';
             }
 
-            $content .= '        </font>' . PHP_EOL;
+            $content .= '</font>';
         }
 
-        $content .= '    </fonts>' . PHP_EOL;
+        $content .= '</fonts>';
 
         return $content;
     }
@@ -86,12 +85,11 @@ EOD;
     protected function getFillsSectionContent()
     {
         return <<<EOD
-    <fills count="1">
-        <fill>
-            <patternFill patternType="none"/>
-        </fill>
-    </fills>
-
+<fills count="1">
+    <fill>
+        <patternFill patternType="none"/>
+    </fill>
+</fills>
 EOD;
     }
 
@@ -103,16 +101,15 @@ EOD;
     protected function getBordersSectionContent()
     {
         return <<<EOD
-    <borders count="1">
-        <border>
-            <left/>
-            <right/>
-            <top/>
-            <bottom/>
-            <diagonal/>
-        </border>
-    </borders>
-
+<borders count="1">
+    <border>
+        <left/>
+        <right/>
+        <top/>
+        <bottom/>
+        <diagonal/>
+    </border>
+</borders>
 EOD;
     }
 
@@ -124,10 +121,9 @@ EOD;
     protected function getCellStyleXfsSectionContent()
     {
         return <<<EOD
-    <cellStyleXfs count="1">
-        <xf borderId="0" fillId="0" fontId="0" numFmtId="0"/>
-    </cellStyleXfs>
-
+<cellStyleXfs count="1">
+    <xf borderId="0" fillId="0" fontId="0" numFmtId="0"/>
+</cellStyleXfs>
 EOD;
     }
 
@@ -140,25 +136,25 @@ EOD;
     {
         $registeredStyles = $this->getRegisteredStyles();
 
-        $content = '    <cellXfs count="' . count($registeredStyles) . '">' . PHP_EOL;
+        $content = '<cellXfs count="' . count($registeredStyles) . '">';
 
         foreach ($registeredStyles as $style) {
-            $content .= '        <xf numFmtId="0" fontId="' . $style->getId() . '" fillId="0" borderId="0" xfId="0"';
+            $content .= '<xf numFmtId="0" fontId="' . $style->getId() . '" fillId="0" borderId="0" xfId="0"';
 
             if ($style->shouldApplyFont()) {
                 $content .= ' applyFont="1"';
             }
 
             if ($style->shouldWrapText()) {
-                $content .= ' applyAlignment="1">' . PHP_EOL;
-                $content .= '            <alignment wrapText="1"/>' . PHP_EOL;
-                $content .= '        </xf>' . PHP_EOL;
+                $content .= ' applyAlignment="1">';
+                $content .= '<alignment wrapText="1"/>';
+                $content .= '</xf>';
             } else {
-                $content .= '/>' . PHP_EOL;
+                $content .= '/>';
             }
         }
 
-        $content .= '    </cellXfs>' . PHP_EOL;
+        $content .= '</cellXfs>';
 
         return $content;
     }
@@ -171,10 +167,9 @@ EOD;
     protected function getCellStylesSectionContent()
     {
         return <<<EOD
-    <cellStyles count="1">
-        <cellStyle builtinId="0" name="Normal" xfId="0"/>
-    </cellStyles>
-
+<cellStyles count="1">
+    <cellStyle builtinId="0" name="Normal" xfId="0"/>
+</cellStyles>
 EOD;
     }
 }
diff --git a/src/Spout/Writer/XLSX/Internal/Worksheet.php b/src/Spout/Writer/XLSX/Internal/Worksheet.php
index d9346c1..be67e19 100644
--- a/src/Spout/Writer/XLSX/Internal/Worksheet.php
+++ b/src/Spout/Writer/XLSX/Internal/Worksheet.php
@@ -73,8 +73,8 @@ EOD;
         $this->sheetFilePointer = fopen($this->worksheetFilePath, 'w');
         $this->throwIfSheetFilePointerIsNotAvailable();
 
-        fwrite($this->sheetFilePointer, self::SHEET_XML_FILE_HEADER . PHP_EOL);
-        fwrite($this->sheetFilePointer, '    <sheetData>' . PHP_EOL);
+        fwrite($this->sheetFilePointer, self::SHEET_XML_FILE_HEADER);
+        fwrite($this->sheetFilePointer, '<sheetData>');
     }
 
     /**
@@ -131,26 +131,26 @@ EOD;
         $rowIndex = $this->lastWrittenRowIndex + 1;
         $numCells = count($dataRow);
 
-        $data = '        <row r="' . $rowIndex . '" spans="1:' . $numCells . '">' . PHP_EOL;
+        $data = '<row r="' . $rowIndex . '" spans="1:' . $numCells . '">';
 
         foreach($dataRow as $cellValue) {
             $columnIndex = CellHelper::getCellIndexFromColumnIndex($cellNumber);
-            $data .= '            <c r="' . $columnIndex . $rowIndex . '"';
+            $data .= '<c r="' . $columnIndex . $rowIndex . '"';
             $data .= ' s="' . $style->getId() . '"';
 
             if (CellHelper::isNonEmptyString($cellValue)) {
                 if ($this->shouldUseInlineStrings) {
-                    $data .= ' t="inlineStr"><is><t>' . $this->stringsEscaper->escape($cellValue) . '</t></is></c>' . PHP_EOL;
+                    $data .= ' t="inlineStr"><is><t>' . $this->stringsEscaper->escape($cellValue) . '</t></is></c>';
                 } else {
                     $sharedStringId = $this->sharedStringsHelper->writeString($cellValue);
-                    $data .= ' t="s"><v>' . $sharedStringId . '</v></c>' . PHP_EOL;
+                    $data .= ' t="s"><v>' . $sharedStringId . '</v></c>';
                 }
             } else if (CellHelper::isBoolean($cellValue)) {
-                $data .= ' t="b"><v>' . $cellValue . '</v></c>' . PHP_EOL;
+                $data .= ' t="b"><v>' . $cellValue . '</v></c>';
             } else if (CellHelper::isNumeric($cellValue)) {
-                $data .= '><v>' . $cellValue . '</v></c>' . PHP_EOL;
+                $data .= '><v>' . $cellValue . '</v></c>';
             } else if (empty($cellValue)) {
-                $data .= '/>' . PHP_EOL;
+                $data .= '/>';
             } else {
                 throw new InvalidArgumentException('Trying to add a value with an unsupported type: ' . gettype($cellValue));
             }
@@ -158,7 +158,7 @@ EOD;
             $cellNumber++;
         }
 
-        $data .= '        </row>' . PHP_EOL;
+        $data .= '</row>';
 
         $wasWriteSuccessful = fwrite($this->sheetFilePointer, $data);
         if ($wasWriteSuccessful === false) {
@@ -176,7 +176,7 @@ EOD;
      */
     public function close()
     {
-        fwrite($this->sheetFilePointer, '    </sheetData>' . PHP_EOL);
+        fwrite($this->sheetFilePointer, '</sheetData>');
         fwrite($this->sheetFilePointer, '</worksheet>');
         fclose($this->sheetFilePointer);
     }